mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alex 2016-11-01 22:32:02 +03:00
commit f01c586926
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
limereport/lrbanddesignintf.cpp
View File

@ -748,7 +748,10 @@ void BandDesignIntf::childBandDeleted(QObject *band)
QColor BandDesignIntf::alternateBackgroundColor() const
{
return m_alternateBackgroundColor;
if (metaObject()->indexOfProperty("alternateBackgroundColor")!=-1)
return m_alternateBackgroundColor;
else
return backgroundColor();
}
void BandDesignIntf::setAlternateBackgroundColor(const QColor &alternateBackgroundColor)

2
limereport/lrbasedesignintf.cpp
View File

@ -117,7 +117,7 @@ void BaseDesignIntf::setParentReportItem(const QString &value)
}
}
QString BaseDesignIntf::parentReportItemName()
QString BaseDesignIntf::parentReportItemName() const
{
BaseDesignIntf *parent = dynamic_cast<BaseDesignIntf *>(parentItem());
if (parent) return parent->objectName();

8
limereport/lrbasedesignintf.h
View File

@ -124,18 +124,18 @@ public:
virtual ~BaseDesignIntf();
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);
QColor backgroundColor(){return m_backgroundBrushcolor;}
QColor backgroundColor() const {return m_backgroundBrushcolor;}
void setBackgroundColor(QColor value);
QPen pen() const;
void setPen(QPen& pen);
QFont font() const;
void setFont(QFont& font);
QColor fontColor(){return m_fontColor;}
QColor fontColor() const {return m_fontColor;}
void setFontColor(QColor value){m_fontColor=value;}
virtual BGMode backgroundMode() const;