python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-01-12 04:41:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

version has been changed

Browse Source
This commit is contained in:
Arin Alexander 2019-10-12 23:10:57 +03:00
parent 544dbbf94e
commit d36defd3dc
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5 LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 13 LIMEREPORT_VERSION_RELEASE = 14
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}\\\"

8
limereport/lrbanddesignintf.cpp
View File

@ -590,16 +590,12 @@ void BandDesignIntf::preparePopUpMenu(QMenu &menu)
currAction = menu.addAction(tr("Keep top space")); currAction = menu.addAction(tr("Keep top space"));
currAction->setCheckable(true); currAction->setCheckable(true);
currAction->setChecked(keepBottomSpaceOption()); currAction->setChecked(keepTopSpace());
currAction = menu.addAction(tr("Keep bottom space")); currAction = menu.addAction(tr("Keep bottom space"));
currAction->setCheckable(true); currAction->setCheckable(true);
currAction->setChecked(keepBottomSpace()); currAction->setChecked(keepBottomSpace());
currAction = menu.addAction(tr("Keep top space"));
currAction->setCheckable(true);
currAction->setChecked(keepTopSpace());
currAction = menu.addAction(tr("Print if empty")); currAction = menu.addAction(tr("Print if empty"));
currAction->setCheckable(true); currAction->setCheckable(true);
currAction->setChecked(printIfEmpty()); currAction->setChecked(printIfEmpty());
@ -1138,7 +1134,7 @@ void BandDesignIntf::updateItemSize(DataSourceManager* dataManager, RenderPass p
arrangeSubItems(pass, dataManager); arrangeSubItems(pass, dataManager);
if (autoHeight()){ if (autoHeight()){
if (!keepTopSpace()) { if (!keepTopSpace()) {
qreal minTop = findMinTop() + m_shiftItems - spaceBorder; qreal minTop = findMinTop() + m_shiftItems;
foreach (BaseDesignIntf* item, childBaseItems()) { foreach (BaseDesignIntf* item, childBaseItems()) {
item->setY(item->y() - minTop); item->setY(item->y() - minTop);
} }