mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00
Code Activity

Finish 1.4.70

Browse Source 
# Conflicts:
#	limereport/lrbasedesignintf.h
This commit is contained in:
Arin Alex
2018-03-22 17:56:39 +03:00
parent 288aef75b2 25b4ace815
commit 57ab5c6fb0
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
limereport/items/lrtextitem.cpp
View File

@@ -555,6 +555,12 @@ void TextItem::setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirec
}
}
void TextItem::setWatermark(bool watermark)
{
setBackgroundMode(TransparentMode);
BaseDesignIntf::setWatermark(watermark);
}
QString TextItem::followTo() const
{

2
limereport/items/lrtextitem.h
View File

@@ -165,6 +165,8 @@ public:
void setTextIndent(const qreal &textIndent);
Qt::LayoutDirection textLayoutDirection() const;
void setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirection);
void setWatermark(bool watermark);
protected:
void updateLayout();

5
limereport/lrbasedesignintf.h
View File

@@ -279,6 +279,8 @@ public:
virtual QMap<QString, QString> getStringForTranslation();
bool fillInSecondPass() const;
void setFillInSecondPass(bool fillInSecondPass);
bool isWatermark() const;
virtual void setWatermark(bool watermark);
Q_INVOKABLE QString setItemWidth(qreal width);
Q_INVOKABLE QString setItemHeight(qreal height);
@@ -289,9 +291,6 @@ public:
Q_INVOKABLE QString setItemPosX(qreal xValue);
Q_INVOKABLE QString setItemPosY(qreal yValue);
bool isWatermark() const;
void setWatermark(bool watermark);
protected:
//ICollectionContainer