python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-09-23 08:39:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/TOC-Refactoring

Browse Source
This commit is contained in:
Arin Alexander
2019-01-29 17:18:08 +03:00
parent 6a1a8de8ae 91a1798bf0
commit 32c8ddd922
9 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
limereport/lrglobal.h
View File

@@ -157,6 +157,7 @@ namespace Const{
static inline QJSValue getJSValue(QJSEngine &e, T *p)
{
QJSValue res = e.newQObject(p);
QQmlEngine::setObjectOwnership(p, QQmlEngine::CppOwnership);
return res;
}
#else

4
limereport/lrpreviewreportwidget.cpp
View File

@@ -203,7 +203,11 @@ void PreviewReportWidget::print()
printer.setPrinterName(pi.defaultPrinter().printerName());
#endif
#ifdef HAVE_QT5
#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
printer.setPrinterName(pi.defaultPrinterName());
#else
printer.setPrinterName(pi.defaultPrinter().printerName());
#endif
#endif
QPrintDialog dialog(&printer,QApplication::activeWindow());
if (dialog.exec()==QDialog::Accepted){

14
limereport/lrreportengine.cpp
View File

@@ -404,7 +404,11 @@ bool ReportEnginePrivate::printReport(QPrinter* printer)
m_printer.data()->setPrinterName(pi.defaultPrinter().printerName());
#endif
#ifdef HAVE_QT5
#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
m_printer.data()->setPrinterName(pi.defaultPrinterName());
#else
m_printer.data()->setPrinterName(pi.defaultPrinter().printerName());
#endif
#endif
QPrintDialog dialog(m_printer.data(),QApplication::activeWindow());
m_printerSelected = dialog.exec()!=QDialog::Rejected;
@@ -437,7 +441,11 @@ bool ReportEnginePrivate::printPages(ReportPages pages, QPrinter *printer)
m_printer.data()->setPrinterName(pi.defaultPrinter().printerName());
#endif
#ifdef HAVE_QT5
#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
m_printer.data()->setPrinterName(pi.defaultPrinterName());
#else
m_printer.data()->setPrinterName(pi.defaultPrinter().printerName());
#endif
#endif
QPrintDialog dialog(m_printer.data(),QApplication::activeWindow());
m_printerSelected = dialog.exec()!=QDialog::Rejected;
@@ -1219,9 +1227,9 @@ ReportPages ReportEnginePrivate::renderToPages()
emit renderFinished();
m_reportRender.clear();
foreach(PageItemDesignIntf* page, m_renderingPages){
delete page;
}
//foreach(PageItemDesignIntf* page, m_renderingPages){
// delete page;
//}
m_renderingPages.clear();
}
m_reportRendering = false;

1
limereport/objectinspector/lrobjectitemmodel.cpp
View File

@@ -154,6 +154,7 @@ void QObjectPropertyModel::translatePropertyName()
tr("replaceCRwithBR");
tr("hideIfEmpty");
tr("hideEmptyItems");
tr("useExternalPainter");
}
void QObjectPropertyModel::clearObjectsList()