mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 17:14:40 +03:00
Finish 1.4.98
This commit is contained in:
commit
a95d3ab09f
@ -112,7 +112,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
|||||||
|
|
||||||
LIMEREPORT_VERSION_MAJOR = 1
|
LIMEREPORT_VERSION_MAJOR = 1
|
||||||
LIMEREPORT_VERSION_MINOR = 4
|
LIMEREPORT_VERSION_MINOR = 4
|
||||||
LIMEREPORT_VERSION_RELEASE = 97
|
LIMEREPORT_VERSION_RELEASE = 98
|
||||||
|
|
||||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||||
|
@ -54,6 +54,7 @@ PageFooter::PageFooter(QObject *owner, QGraphicsItem *parent)
|
|||||||
{
|
{
|
||||||
setBandTypeText( tr("Page Footer") );
|
setBandTypeText( tr("Page Footer") );
|
||||||
setMarkerColor(bandColor());
|
setMarkerColor(bandColor());
|
||||||
|
setAutoHeight(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
BaseDesignIntf *PageFooter::createSameTypeItem(QObject *owner, QGraphicsItem *parent)
|
BaseDesignIntf *PageFooter::createSameTypeItem(QObject *owner, QGraphicsItem *parent)
|
||||||
|
@ -1255,7 +1255,7 @@ void ReportRender::startNewPage(bool isFirst)
|
|||||||
|
|
||||||
renderPageHeader(m_patternPageItem);
|
renderPageHeader(m_patternPageItem);
|
||||||
|
|
||||||
m_pageFooterHeight = calcPageFooterHeight(m_patternPageItem);
|
m_pageFooterHeight = calcPageFooterHeight(m_patternPageItem)+2;
|
||||||
m_maxHeightByColumn[m_currentColumn] -= m_pageFooterHeight;
|
m_maxHeightByColumn[m_currentColumn] -= m_pageFooterHeight;
|
||||||
m_currentIndex=10;
|
m_currentIndex=10;
|
||||||
m_dataAreaSize = m_maxHeightByColumn[m_currentColumn];
|
m_dataAreaSize = m_maxHeightByColumn[m_currentColumn];
|
||||||
|
Loading…
Reference in New Issue
Block a user