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

Finish 1.4.86

# Conflicts:
#	include/lrpreviewreportwidget.h
#	include/lrreportengine.h
#	limereport/lrpreviewreportwidget.cpp
#	limereport/lrpreviewreportwidget.h
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine.h
#	limereport/lrreportengine_p.h
This commit is contained in:
Arin Alexander
2018-07-11 03:05:55 +03:00
12 changed files with 159 additions and 5 deletions

View File

@@ -193,6 +193,9 @@ public:
QList<QLocale::Language> designerLanguages();
QLocale::Language currentDesignerLanguage();
void setCurrentDesignerLanguage(QLocale::Language language);
ScaleType previewScaleType();
int previewScalePercent();
void setPreviewScaleType(const ScaleType &previewScaleType, int percent = 0);
signals:
void pagesLoadFinished();
void datasourceCollectionLoadFinished(const QString& collectionName);
@@ -271,6 +274,8 @@ private:
QString m_styleSheet;
QLocale::Language m_currentDesignerLanguage;
QMap<QString, ReportExporterInterface*> exporters;
ScaleType m_previewScaleType;
int m_previewScalePercent;
};
}