Merge branch 'master' into 1.4

This commit is contained in:
Arin Alexander
2016-10-18 13:58:49 +03:00
5 changed files with 23 additions and 0 deletions

View File

@@ -168,6 +168,7 @@ BandDesignIntf::BandDesignIntf(BandsType bandType, const QString &xmlTypeName, Q
m_bandNameLabel = new BandNameLabel(this);
m_bandNameLabel->setVisible(false);
if (scene()) scene()->addItem(m_bandNameLabel);
m_alternateBackgroundColor = backgroundColor();
}
BandDesignIntf::~BandDesignIntf()
@@ -745,6 +746,16 @@ void BandDesignIntf::childBandDeleted(QObject *band)
m_childBands.removeAt(m_childBands.indexOf(reinterpret_cast<BandDesignIntf*>(band)));
}
QColor BandDesignIntf::alternateBackgroundColor() const
{
return m_alternateBackgroundColor;
}
void BandDesignIntf::setAlternateBackgroundColor(const QColor &alternateBackgroundColor)
{
m_alternateBackgroundColor = alternateBackgroundColor;
}
bool BandDesignIntf::repeatOnEachRow() const
{
return m_repeatOnEachRow;