diff --git a/common.pri b/common.pri index 4feb9cb..0202559 100644 --- a/common.pri +++ b/common.pri @@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 69 +LIMEREPORT_VERSION_RELEASE = 70 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp index 8c01e87..c0ed243 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -543,6 +543,12 @@ void TextItem::setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirec } } +void TextItem::setWatermark(bool watermark) +{ + setBackgroundMode(TransparentMode); + BaseDesignIntf::setWatermark(watermark); +} + QString TextItem::followTo() const { diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index ff02e06..5bc82fb 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -164,6 +164,8 @@ public: void setTextIndent(const qreal &textIndent); Qt::LayoutDirection textLayoutDirection() const; void setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirection); + + void setWatermark(bool watermark); protected: void updateLayout(); diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index 7c72a21..904b64e 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -272,6 +272,8 @@ public: void setZValueProperty(qreal value); QString patternName() const; void setPatternName(const QString &patternName); + bool isWatermark() const; + virtual void setWatermark(bool watermark); Q_INVOKABLE QString setItemWidth(qreal width); Q_INVOKABLE QString setItemHeight(qreal height); @@ -282,9 +284,6 @@ public: Q_INVOKABLE QString setItemPosX(qreal xValue); Q_INVOKABLE QString setItemPosY(qreal yValue); - bool isWatermark() const; - void setWatermark(bool watermark); - protected: //ICollectionContainer