Merge branch 'master' into 1.4

This commit is contained in:
Arin Alexander
2016-07-21 00:15:04 +03:00
8 changed files with 50 additions and 12 deletions

View File

@@ -143,7 +143,8 @@ BandDesignIntf::BandDesignIntf(BandsType bandType, const QString &xmlTypeName, Q
m_columnsFillDirection(Horizontal),
m_reprintOnEachPage(false),
m_startNewPage(false),
m_startFromNewPage(false)
m_startFromNewPage(false),
m_printAlways(false)
{
setPosibleResizeDirectionFlags(ResizeBottom);
setPosibleMoveFlags(TopBotom);
@@ -716,6 +717,16 @@ void BandDesignIntf::childBandDeleted(QObject *band)
m_childBands.removeAt(m_childBands.indexOf(reinterpret_cast<BandDesignIntf*>(band)));
}
bool BandDesignIntf::printAlways() const
{
return m_printAlways;
}
void BandDesignIntf::setPrintAlways(bool printAlways)
{
m_printAlways = printAlways;
}
bool BandDesignIntf::startFromNewPage() const
{
return m_startFromNewPage;