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

Merge tag '1.6.0' into develop

Browse Source 
Finish 1.6.0
This commit is contained in:
fralx
2021-12-24 15:49:36 +03:00
parent 10060fa07f 8dab5f6870
commit 94a613f963
47 changed files with 823 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
limereport/lrpreviewreportwindow.cpp
View File

@@ -41,7 +41,7 @@
#include <QPrintDialog>
#include <QFileDialog>
#include <QScrollBar>
#if QT_VERSION < 0x060000
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#include <QDesktopWidget>
#else
#include <QScreen>
@@ -119,7 +119,11 @@ PreviewReportWindow::PreviewReportWindow(ReportEngine *report, QWidget *parent,
connect(ui->actionShowMessages, SIGNAL(triggered()), this, SLOT(slotShowErrors()));
connect(m_previewReportWidget, SIGNAL(scalePercentChanged(int)), this, SLOT(slotScalePercentChanged(int)));
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
connect(m_scalePercent, SIGNAL(currentTextChanged(QString)), this, SLOT(scaleComboboxChanged(QString)));
#else
connect(m_scalePercent, SIGNAL(currentIndexChanged(QString)), this, SLOT(scaleComboboxChanged(QString)));
#endif
connect(m_previewReportWidget, SIGNAL(pageChanged(int)), this, SLOT(slotCurrentPageChanged(int)));
connect(m_previewReportWidget, SIGNAL(itemInserted(LimeReport::PageDesignIntf*, QPointF, QString)),
this, SLOT(slotItemInserted(LimeReport::PageDesignIntf*, QPointF, QString)));
@@ -143,7 +147,7 @@ void PreviewReportWindow::restoreSetting()
if (v.isValid()){
restoreGeometry(v.toByteArray());
} else {
#if QT_VERSION < 0x060000
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QDesktopWidget *desktop = QApplication::desktop();
int screenWidth = desktop->screenGeometry().width();