mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-24 12:34:39 +03:00
Merge branch 'master' into 1.4
This commit is contained in:
commit
f01c586926
@ -748,7 +748,10 @@ void BandDesignIntf::childBandDeleted(QObject *band)
|
|||||||
|
|
||||||
QColor BandDesignIntf::alternateBackgroundColor() const
|
QColor BandDesignIntf::alternateBackgroundColor() const
|
||||||
{
|
{
|
||||||
|
if (metaObject()->indexOfProperty("alternateBackgroundColor")!=-1)
|
||||||
return m_alternateBackgroundColor;
|
return m_alternateBackgroundColor;
|
||||||
|
else
|
||||||
|
return backgroundColor();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BandDesignIntf::setAlternateBackgroundColor(const QColor &alternateBackgroundColor)
|
void BandDesignIntf::setAlternateBackgroundColor(const QColor &alternateBackgroundColor)
|
||||||
|
@ -117,7 +117,7 @@ void BaseDesignIntf::setParentReportItem(const QString &value)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QString BaseDesignIntf::parentReportItemName()
|
QString BaseDesignIntf::parentReportItemName() const
|
||||||
{
|
{
|
||||||
BaseDesignIntf *parent = dynamic_cast<BaseDesignIntf *>(parentItem());
|
BaseDesignIntf *parent = dynamic_cast<BaseDesignIntf *>(parentItem());
|
||||||
if (parent) return parent->objectName();
|
if (parent) return parent->objectName();
|
||||||
|
@ -124,18 +124,18 @@ public:
|
|||||||
virtual ~BaseDesignIntf();
|
virtual ~BaseDesignIntf();
|
||||||
|
|
||||||
void setParentReportItem(const QString& value);
|
void setParentReportItem(const QString& value);
|
||||||
QString parentReportItemName();
|
QString parentReportItemName() const;
|
||||||
|
|
||||||
BrushMode backgroundBrushMode(){return m_backgroundBrush;}
|
BrushMode backgroundBrushMode() const {return m_backgroundBrush;}
|
||||||
void setBackgroundBrushMode(BrushMode value);
|
void setBackgroundBrushMode(BrushMode value);
|
||||||
QColor backgroundColor(){return m_backgroundBrushcolor;}
|
QColor backgroundColor() const {return m_backgroundBrushcolor;}
|
||||||
void setBackgroundColor(QColor value);
|
void setBackgroundColor(QColor value);
|
||||||
|
|
||||||
QPen pen() const;
|
QPen pen() const;
|
||||||
void setPen(QPen& pen);
|
void setPen(QPen& pen);
|
||||||
QFont font() const;
|
QFont font() const;
|
||||||
void setFont(QFont& font);
|
void setFont(QFont& font);
|
||||||
QColor fontColor(){return m_fontColor;}
|
QColor fontColor() const {return m_fontColor;}
|
||||||
void setFontColor(QColor value){m_fontColor=value;}
|
void setFontColor(QColor value){m_fontColor=value;}
|
||||||
|
|
||||||
virtual BGMode backgroundMode() const;
|
virtual BGMode backgroundMode() const;
|
||||||
|
Loading…
Reference in New Issue
Block a user