0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00

Finish 1.4.83

# Conflicts:
#	limereport/bands/lrdataband.cpp
#	limereport/lrbanddesignintf.cpp
This commit is contained in:
Arin Alexander
2018-06-20 19:07:17 +03:00
3 changed files with 58 additions and 25 deletions

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){