diff --git a/common.pri b/common.pri index 736dbf1..eca1757 100644 --- a/common.pri +++ b/common.pri @@ -96,7 +96,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 4c0df76..772f084 100644 --- a/limereport/items/lrtextitem.cpp +++ b/limereport/items/lrtextitem.cpp @@ -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 { diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index 68f98c0..778bfb7 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -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(); diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index c8a3d00..af80022 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -279,6 +279,8 @@ public: virtual QMap 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