python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-08 21:53:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alex
2016-08-02 22:33:43 +03:00
parent 30c1a954f3 7ce974090e
commit 7a1a3ac34a
8 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
limereport/lrreportengine.cpp
View File

@@ -355,7 +355,7 @@ bool ReportEnginePrivate::printToPDF(const QString &fileName)
return false;
}
void ReportEnginePrivate::previewReport()
void ReportEnginePrivate::previewReport(PreviewHints hints)
{
QTime start = QTime::currentTime();
try{
@@ -375,6 +375,11 @@ void ReportEnginePrivate::previewReport()
if (!dataManager()->errorsList().isEmpty()){
w->setErrorMessages(dataManager()->errorsList());
}
w->setMenuVisible(!hints.testFlag(HidePreviewMenuBar));
w->setStatusBarVisible(!hints.testFlag(HidePreviewStatusBar));
w->setToolBarVisible(!hints.testFlag(HidePreviewToolBar));
m_activePreview = w;
connect(w,SIGNAL(destroyed(QObject*)), this, SLOT(slotPreviewWindowDestroed(QObject*)));
qDebug()<<"render time ="<<start.msecsTo(QTime::currentTime());
@@ -720,12 +725,12 @@ bool ReportEngine::printToPDF(const QString &fileName)
return d->printToPDF(fileName);
}
void ReportEngine::previewReport()
void ReportEngine::previewReport(PreviewHints hints)
{
Q_D(ReportEngine);
if (m_settings)
d->setSettings(m_settings);
d->previewReport();
d->previewReport(hints);
}
void ReportEngine::designReport()