mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Finish 1.4.70

Browse Source
This commit is contained in:
Arin Alex 2018-03-22 17:54:26 +03:00
commit 43a43a5f1e
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 69 LIMEREPORT_VERSION_RELEASE = 70
LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"

6
limereport/items/lrtextitem.cpp
View File

@ -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 QString TextItem::followTo() const
{ {

2
limereport/items/lrtextitem.h
View File

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

5
limereport/lrbasedesignintf.h
View File

@ -272,6 +272,8 @@ public:
void setZValueProperty(qreal value); void setZValueProperty(qreal value);
QString patternName() const; QString patternName() const;
void setPatternName(const QString &patternName); void setPatternName(const QString &patternName);
bool isWatermark() const;
virtual void setWatermark(bool watermark);
Q_INVOKABLE QString setItemWidth(qreal width); Q_INVOKABLE QString setItemWidth(qreal width);
Q_INVOKABLE QString setItemHeight(qreal height); Q_INVOKABLE QString setItemHeight(qreal height);
@ -282,9 +284,6 @@ public:
Q_INVOKABLE QString setItemPosX(qreal xValue); Q_INVOKABLE QString setItemPosX(qreal xValue);
Q_INVOKABLE QString setItemPosY(qreal yValue); Q_INVOKABLE QString setItemPosY(qreal yValue);
bool isWatermark() const;
void setWatermark(bool watermark);
protected: protected:
//ICollectionContainer //ICollectionContainer