mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 08:34:38 +03:00
Code

Finish 1.4.83

Browse Source 
# Conflicts:
#	limereport/bands/lrdataband.cpp
#	limereport/lrbanddesignintf.cpp
This commit is contained in:
Arin Alexander 2018-06-20 19:07:17 +03:00
commit ea1b6e006f
3 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -105,7 +105,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 80
LIMEREPORT_VERSION_RELEASE = 83
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

20
limereport/bands/lrdataband.cpp
View File

@ -104,6 +104,16 @@ void DataBand::preparePopUpMenu(QMenu &menu)
currAction->setCheckable(true);
currAction->setChecked(sliceLastRow());
currAction = menu.addAction(tr("Start from new page"));
currAction->setCheckable(true);
currAction->setChecked(startFromNewPage());
currAction = menu.addAction(tr("Start new page"));
currAction->setCheckable(true);
currAction->setChecked(startNewPage());
}
void DataBand::processPopUpAction(QAction *action)
@ -125,6 +135,14 @@ void DataBand::processPopUpAction(QAction *action)
setProperty("useAlternateBackgroundColor",action->isChecked());
}
if (action->text().compare(tr("Start new page")) == 0){
setProperty("startNewPage",action->isChecked());
}
if (action->text().compare(tr("Start from new page")) == 0){
setProperty("startFromNewPage",action->isChecked());
}
}
BaseDesignIntf *DataBand::createSameTypeItem(QObject *owner, QGraphicsItem *parent)
@ -159,7 +177,7 @@ void DataHeaderBand::processPopUpAction(QAction *action)
{
BandDesignIntf::processPopUpAction(action);
if (action->text().compare(tr("Reprint on each page")) == 0){
setProperty("repeatOnEachPage",action->isChecked());
setProperty("reprintOnEachPage",action->isChecked());
}
if (action->text().compare(tr("Repeat on each row")) == 0){

61
limereport/lrbanddesignintf.cpp
View File

@ -437,7 +437,11 @@ bool BandDesignIntf::isNeedRender() const
void BandDesignIntf::setTryToKeepTogether(bool value)
{
m_tryToKeepTogether=value;
if (m_tryToKeepTogether != value){
m_tryToKeepTogether = value;
if (!isLoading())
notify("keepSubdetailTogether", !value, value);
}
}
bool BandDesignIntf::tryToKeepTogether()
@ -506,6 +510,7 @@ void BandDesignIntf::preparePopUpMenu(QMenu &menu)
currAction->setChecked(autoHeight());
currAction = menu.addAction(tr("Splittable"));
currAction->setEnabled(metaObject()->indexOfProperty("splittable") != -1);
currAction->setCheckable(true);
currAction->setChecked(isSplittable());
@ -513,17 +518,10 @@ void BandDesignIntf::preparePopUpMenu(QMenu &menu)
currAction->setCheckable(true);
currAction->setChecked(keepBottomSpaceOption());
currAction = menu.addAction(tr("Keep top space"));
currAction = menu.addAction(tr("Print if empty"));
currAction->setCheckable(true);
currAction->setChecked(keepTopSpace());
currAction->setChecked(printIfEmpty());
currAction = menu.addAction(tr("Start from new page"));
currAction->setCheckable(true);
currAction->setChecked(startFromNewPage());
currAction = menu.addAction(tr("Start new page"));
currAction->setCheckable(true);
currAction->setChecked(startNewPage());
}
void BandDesignIntf::processPopUpAction(QAction *action)
@ -537,15 +535,11 @@ void BandDesignIntf::processPopUpAction(QAction *action)
if (action->text().compare(tr("Keep bottom space")) == 0){
setProperty("keepBottomSpace",action->isChecked());
}
if (action->text().compare(tr("Keep top space")) == 0){
setProperty("keepTopSpace",action->isChecked());
}
if (action->text().compare(tr("Start new page")) == 0){
setProperty("startNewPage",action->isChecked());
}
if (action->text().compare(tr("Start from new page")) == 0){
setProperty("startFromNewPage",action->isChecked());
if (action->text().compare(tr("Print if empty")) == 0){
setProperty("printIfEmpty",action->isChecked());
}
}
void BandDesignIntf::recalcItems(DataSourceManager* dataManager)
@ -867,7 +861,11 @@ bool BandDesignIntf::repeatOnEachRow() const
void BandDesignIntf::setRepeatOnEachRow(bool repeatOnEachRow)
{
m_repeatOnEachRow = repeatOnEachRow;
if (m_repeatOnEachRow != repeatOnEachRow){
m_repeatOnEachRow = repeatOnEachRow;
if (!isLoading())
notify("repeatOnEachRow", !m_repeatOnEachRow, m_repeatOnEachRow);
}
}
bool BandDesignIntf::printAlways() const
@ -877,7 +875,11 @@ bool BandDesignIntf::printAlways() const
void BandDesignIntf::setPrintAlways(bool printAlways)
{
m_printAlways = printAlways;
if (m_printAlways != printAlways){
m_printAlways = printAlways;
if (!isLoading())
notify("printAlways", !m_printAlways, m_printAlways);
}
}
bool BandDesignIntf::startFromNewPage() const
@ -923,7 +925,11 @@ bool BandDesignIntf::reprintOnEachPage() const
void BandDesignIntf::setReprintOnEachPage(bool reprintOnEachPage)
{
m_reprintOnEachPage = reprintOnEachPage;
if (m_reprintOnEachPage != reprintOnEachPage){
m_reprintOnEachPage = reprintOnEachPage;
if (!isLoading())
notify("reprintOnEachPage", !m_reprintOnEachPage, m_reprintOnEachPage);
}
}
int BandDesignIntf::columnIndex() const
@ -943,7 +949,12 @@ bool BandDesignIntf::printIfEmpty() const
void BandDesignIntf::setPrintIfEmpty(bool printIfEmpty)
{
m_printIfEmpty = printIfEmpty;
if (m_printIfEmpty != printIfEmpty){
m_printIfEmpty = printIfEmpty;
if (!isLoading())
notify("printIfEmpty", !m_printIfEmpty, m_printIfEmpty);
}
}
BandDesignIntf *BandDesignIntf::bandHeader()
@ -972,7 +983,11 @@ bool BandDesignIntf::sliceLastRow() const
void BandDesignIntf::setSliceLastRow(bool sliceLastRow)
{
m_sliceLastRow = sliceLastRow;
if (m_sliceLastRow != sliceLastRow){
m_sliceLastRow = sliceLastRow;
if (!isLoading())
notify("sliceLastRow", !sliceLastRow, sliceLastRow);
}
}
int BandDesignIntf::maxScalePercent() const