Merge branch 'develop' into feature/TOC-Refactoring

common.pri

@@ -32,13 +32,12 @@ contains(CONFIG, easy_profiler){
 
 !contains(CONFIG, qtscriptengine){
 greaterThan(QT_MAJOR_VERSION, 4){
+greaterThan(QT_MINOR_VERSION, 5){
     CONFIG *= qjsengine
-#greaterThan(QT_MINOR_VERSION, 5){
+}
-#    CONFIG *= qjsengine
+lessThan(QT_MINOR_VERSION, 6){
-#}
+    CONFIG *= qtscriptengine
-#lessThan(QT_MINOR_VERSION, 6){
+}
-#    CONFIG *= qtscriptengine
-#}
 }
 lessThan(QT_MAJOR_VERSION, 5){
     CONFIG *= qtscriptengine

designer/main.cpp

@@ -10,17 +10,24 @@ int main(int argc, char *argv[])
     DesignerSettingManager manager;
 
     QTranslator limeReportTranslator;
-    QTranslator qtTranslator;
+    QTranslator qtBaseTranslator;
+	QTranslator qtDesignerTranslator;
+	QTranslator qtLinguistTranslator;
+	
     QString translationPath = QApplication::applicationDirPath();
-    translationPath.append("/languages");
+    translationPath.append("/translations");
     Qt::LayoutDirection layoutDirection = QLocale::system().textDirection();
 
     QString designerTranslation = QLocale(manager.getCurrentDefaultLanguage()).name();
 
     if (limeReportTranslator.load("limereport_"+designerTranslation, translationPath)){
-        qtTranslator.load("qt_" + designerTranslation, translationPath);
+        qtBaseTranslator.load("qtbase_" + designerTranslation, translationPath);
-        a.installTranslator(&qtTranslator);
+		qtDesignerTranslator.load("designer_"+designerTranslation,translationPath);        
+		
+        a.installTranslator(&qtBaseTranslator);
+		a.installTranslator(&qtDesignerTranslator);		
         a.installTranslator(&limeReportTranslator);
+		
         Qt::LayoutDirection layoutDirection = QLocale(manager.getCurrentDefaultLanguage()).textDirection();
         a.setLayoutDirection(layoutDirection);
     }

include/lrglobal.h

@@ -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

limereport/lrglobal.h

@@ -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

limereport/lrpreviewreportwidget.cpp

@@ -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){

limereport/lrreportengine.cpp

@@ -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){
+            //foreach(PageItemDesignIntf* page, m_renderingPages){
-                delete page;
+            //    delete page;
-            }
+            //}
             m_renderingPages.clear();
         }
         m_reportRendering = false;

limereport/objectinspector/lrobjectitemmodel.cpp

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

translations/limereport_ru.ts

@@ -384,6 +384,14 @@ p, li { white-space: pre-wrap; }
         <source>Print if empty</source>
         <translation>Печатать, если пустое</translation>
     </message>
+    <message>
+        <source>Cut</source>
+        <translation>Вырезать</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Копировать</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::BaseDesignIntf</name>
@@ -1086,6 +1094,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>LimeReport::ImageItem</name>
+    <message>
+        <source>Ext.</source>
+        <translation>Внешний</translation>
+    </message>
     <message>
         <source>Image</source>
         <translation>Изображение</translation>
@@ -1864,6 +1876,10 @@ p, li { white-space: pre-wrap; }
         <source>hideEmptyItems</source>
         <translation>Скрывать пустые элементы</translation>
     </message>
+    <message>
+        <source>useExternalPainter</source>
+        <translation>Использовать внешний отрисовщик</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::RectMMPropItem</name>