mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 00:18:06 +03:00
Code Activity

Merge branch 'master' into 1.4

Browse Source 
Conflicts:
	limereport/lrpreviewreportwindow.cpp
	limereport/lrpreviewreportwindow.h
	limereport/report.qrc
This commit is contained in:
Arin Alex
2016-08-08 15:53:39 +03:00
parent 7a1a3ac34a 1320c6f8ee
commit 4370182106
15 changed files with 84 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/lrpreviewreportwindow.h
View File

@@ -73,6 +73,7 @@ protected:
void resizeEvent(QResizeEvent *e);
void moveEvent(QMoveEvent *e);
void showEvent(QShowEvent *);
void selectStateIcon();
public slots:
void slotPrint();
void slotPriorPage();
@@ -95,6 +96,7 @@ private slots:
void scaleComboboxChanged(QString text);
void slotScalePercentChanged(int percent);
void on_actionShowMessages_toggled(bool value);
void on_actionShow_Toolbar_triggered();
private:
ItemsReaderIntf* reader();