0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-24 16:18:04 +03:00

Merge branch 'master' into develop

# Conflicts:
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine_p.h
This commit is contained in:
Arin Alexander
2019-04-15 14:20:44 +03:00
6 changed files with 120 additions and 2 deletions

View File

@@ -216,6 +216,12 @@ public:
bool isBusy();
bool resultIsEditable() const;
void setResultEditable(bool value);
bool saveToFileIsVisible() const;
void setSaveToFileVisible(bool value);
bool printToPdfIsVisible() const;
void setPrintToPdfVisible(bool value);
bool printIsVisible() const;
void setPrintVisible(bool value);
void setPassPhrase(const QString &passPhrase);
bool addTranslationLanguage(QLocale::Language language);
@@ -325,6 +331,9 @@ private:
QColor m_previewPageBackgroundColor;
QVector<WatermarkSetting> m_watermarks;
BaseDesignIntf *createWatermark(PageDesignIntf *page, WatermarkSetting watermarkSetting);
bool m_saveToFileVisible;
bool m_printToPdfVisible;
bool m_printVisible;
};
}