mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-20 06:30:03 +03:00
Code Activity

mixWitPriorPage property has been added to PageItem

Browse Source
This commit is contained in:
Arin Alexander
2021-02-17 21:53:55 +03:00
parent 088a6eadce
commit 38e698fc21
7 changed files with 72 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
limereport/lrpageitemdesignintf.cpp
View File

@@ -53,7 +53,7 @@ PageItemDesignIntf::PageItemDesignIntf(QObject *owner, QGraphicsItem *parent) :
m_isExtendedInDesignMode(false), m_extendedHeight(1000), m_isTOC(false),
m_setPageSizeToPrinter(false), m_endlessHeight(false), m_printable(true),
m_pageFooter(0), m_printBehavior(Split), m_dropPrinterMargins(false),
m_notPrintIfEmpty(false)
m_notPrintIfEmpty(false), m_mixWithPriorPage(false)
{
setFixedPos(true);
setPossibleResizeDirectionFlags(Fixed);
@@ -69,7 +69,7 @@ PageItemDesignIntf::PageItemDesignIntf(const PageSize pageSize, const QRectF &re
m_isExtendedInDesignMode(false), m_extendedHeight(1000), m_isTOC(false),
m_setPageSizeToPrinter(false), m_endlessHeight(false), m_printable(true),
m_pageFooter(0), m_printBehavior(Split), m_dropPrinterMargins(false),
m_notPrintIfEmpty(false)
m_notPrintIfEmpty(false), m_mixWithPriorPage(false)
{
setFixedPos(true);
setPossibleResizeDirectionFlags(Fixed);
@@ -755,6 +755,10 @@ void PageItemDesignIntf::preparePopUpMenu(QMenu &menu)
action->setCheckable(true);
action->setChecked(getSetPageSizeToPrinter());
action = menu.addAction(tr("Mix with prior page"));
action->setCheckable(true);
action->setChecked(mixWithPriorPage());
// action = menu.addAction(tr("Transparent"));
// action->setCheckable(true);
// action->setChecked(backgroundMode() == TransparentMode);
@@ -776,6 +780,10 @@ void PageItemDesignIntf::processPopUpAction(QAction *action)
page()->setPropertyToSelectedItems("setPageSizeToPrinter",action->isChecked());
}
if (action->text().compare(tr("Mix with prior page")) == 0){
page()->setPropertyToSelectedItems("mixWithPriorPage",action->isChecked());
}
}
void PageItemDesignIntf::initPageSize(const PageItemDesignIntf::PageSize &size)
{
@@ -1058,4 +1066,21 @@ PageItemDesignIntf::Ptr PageItemDesignIntf::create(QObject *owner)
return PageItemDesignIntf::Ptr(new PageItemDesignIntf(owner));
}
bool PageItemDesignIntf::mixWithPriorPage() const
{
return m_mixWithPriorPage;
}
void PageItemDesignIntf::setMixWithPriorPage(bool value)
{
if (m_mixWithPriorPage != value){
m_mixWithPriorPage = value;
if (!isLoading()){
update();
notify("mixWithPriorPage", !value, value);
}
}
}
}