0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 00:18:06 +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

@@ -71,6 +71,9 @@ public:
void setMenuVisible(bool value);
void setHideResultEditButton(bool value);
QSettings* settings();
ScaleType previewScaleType() const;
void setPreviewScaleType(const ScaleType &previewScaleType, int percent = 0);
protected:
void writeSetting();
void restoreSetting();
@@ -118,6 +121,9 @@ private:
int m_priorScrolValue;
PreviewReportWidget* m_previewReportWidget;
QComboBox* m_scalePercent;
ScaleType m_previewScaleType;
int m_previewScalePercent;
};
} //namespace LimeReport
#endif // LRPREVIEWREPORTWINDOW_H