From 9673e7ed20e9b6bf9007e45361d8062ab4bf9bf5 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Fri, 2 Mar 2018 22:22:33 +0300
Subject: [PATCH 01/20] Disable the context menu for non-editable items

---
 limereport/lrbasedesignintf.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp
index bab44fa..e5591ed 100644
--- a/limereport/lrbasedesignintf.cpp
+++ b/limereport/lrbasedesignintf.cpp
@@ -1153,6 +1153,7 @@ void BaseDesignIntf::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 
 void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 {
+    if (!(flags() & QGraphicsItem::ItemIsSelectable)) return;
     PageDesignIntf* page = dynamic_cast<PageDesignIntf*>(scene());
     if (!page->selectedItems().contains(this)){
         page->clearSelection();

From 215af87910f8a9eb3b5cdcb9a1b621356eee2e1d Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Wed, 7 Mar 2018 20:04:30 +0300
Subject: [PATCH 02/20] memory leak fixed

---
 limereport/lrdatadesignintf.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/limereport/lrdatadesignintf.cpp b/limereport/lrdatadesignintf.cpp
index 6cb5678..18e0d49 100644
--- a/limereport/lrdatadesignintf.cpp
+++ b/limereport/lrdatadesignintf.cpp
@@ -70,7 +70,7 @@ bool QueryHolder::runQuery(IDataSource::DatasourceMode mode)
     m_mode = mode;
 
     QSqlDatabase db = QSqlDatabase::database(m_connectionName);
-    QSqlQuery* query = new QSqlQuery(db);
+    QSqlQuery query(db);
 
     if (!db.isValid()) {
         setLastError(QObject::tr("Invalid connection! %1").arg(m_connectionName));
@@ -82,13 +82,12 @@ bool QueryHolder::runQuery(IDataSource::DatasourceMode mode)
         if (!m_prepared) return false;
     }
 
-    query->prepare(m_preparedSQL);
-
-    fillParams(query);
-    query->exec();
+    query.prepare(m_preparedSQL);
+    fillParams(&query);
+    query.exec();
 
     QSqlQueryModel *model = new QSqlQueryModel;
-    model->setQuery(*query);
+    model->setQuery(query);
 
     while (model->canFetchMore())
         model->fetchMore();

From da9099cecb3abd0538812489fa25f10f43cb8da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?arne=20kr=C3=BCger?= <ak@crystal-photonics.com>
Date: Fri, 9 Mar 2018 18:33:59 +0100
Subject: [PATCH 03/20] -target names for debug built dlls have now a "d"
 suffix

---
 3rdparty/zint-2.4.4/backend_qt4/Zint.pro | 11 ++++++++-
 demo_r1/demo_r1.pro                      | 30 ++++++++++++++++++++----
 demo_r2/demo_r2.pro                      | 28 ++++++++++++++++++----
 designer/designer.pro                    | 28 ++++++++++++++++++----
 limereport/limereport.pro                | 20 ++++++++++++++--
 translations/limereport_ar.ts            | 10 ++++++++
 translations/limereport_es_ES.ts         | 10 ++++++++
 translations/limereport_ru.ts            | 10 ++++++++
 8 files changed, 132 insertions(+), 15 deletions(-)

diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
index b579cde..7b54d67 100644
--- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
+++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
@@ -19,7 +19,16 @@ unix{
 INCLUDEPATH += $$PWD/../backend
 DEFINES +=  _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\"
 DEFINES += QZINT_LIBRARY
-TARGET = QtZint
+#TARGET = QtZint
+
+CONFIG(debug, debug|release) {
+    TARGET = QtZintd
+} else {
+    TARGET = QtZint
+}
+
+
+
 
 !contains(DEFINES, NO_PNG) {
     SOURCES += $$PWD/../backend/png.c
diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro
index 26f70cd..ecd57df 100644
--- a/demo_r1/demo_r1.pro
+++ b/demo_r1/demo_r1.pro
@@ -26,9 +26,21 @@ macx{
 }
 
 unix:{
-    LIBS += -L$${DEST_LIBS} -llimereport
+    LIBS += -L$${DEST_LIBS}
+    CONFIG(debug, debug|release) {
+        LIBS += -llimereportd
+    } else {
+        LIBS += -llimereport
+    }
+
     contains(CONFIG,zint){
-        LIBS += -L$${DEST_LIBS} -lQtZint
+        LIBS += -L$${DEST_LIBS}
+
+        CONFIG(debug, debug|release) {
+            LIBS += -lQtZintd
+        } else {
+            LIBS += -lQtZint
+        }
     }
     DESTDIR = $$DEST_DIR
 #    QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
@@ -54,9 +66,19 @@ win32 {
 
     QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
     contains(CONFIG,zint){
-        LIBS += -L$${DEST_LIBS} -lQtZint
+        LIBS += -L$${DEST_LIBS}
+        CONFIG(debug, debug|release) {
+            LIBS += -lQtZintd
+        } else {
+            LIBS += -lQtZint
+        }
     }
-    LIBS += -L$${DEST_LIBS} -llimereport
+    LIBS += -L$${DEST_LIBS}
+        CONFIG(debug, debug|release) {
+            LIBS += -llimereportd
+        } else {
+            LIBS += -llimereport
+        }
 }
 
 
diff --git a/demo_r2/demo_r2.pro b/demo_r2/demo_r2.pro
index cec1043..7a2ab07 100644
--- a/demo_r2/demo_r2.pro
+++ b/demo_r2/demo_r2.pro
@@ -26,9 +26,19 @@ macx{
 }
 
 unix:{
-    LIBS += -L$${DEST_LIBS} -llimereport
+    LIBS += -L$${DEST_LIBS}
+    CONFIG(debug, debug|release) {
+        LIBS += -llimereportd
+    } else {
+        LIBS += -llimereport
+    }
     contains(CONFIG,zint){
-        LIBS += -L$${DEST_LIBS} -lQtZint
+        LIBS += -L$${DEST_LIBS}
+        CONFIG(debug, debug|release) {
+            LIBS += -lQtZintd
+        } else {
+            LIBS += -lQtZint
+        }
     }
     DESTDIR = $$DEST_DIR
     QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
@@ -52,9 +62,19 @@ win32 {
     RC_FILE += mainicon.rc
 
     contains(CONFIG,zint){
-        LIBS += -L$${DEST_LIBS} -lQtZint
+        LIBS += -L$${DEST_LIBS}
+        CONFIG(debug, debug|release) {
+            LIBS += -lQtZintd
+        } else {
+            LIBS += -lQtZint
+        }
+    }
+    LIBS += -L$${DEST_LIBS}
+    CONFIG(debug, debug|release) {
+        LIBS += -llimereportd
+    } else {
+        LIBS += -llimereport
     }
-    LIBS += -L$${DEST_LIBS} -llimereport
 
     QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t)
 }
diff --git a/designer/designer.pro b/designer/designer.pro
index e483859..1f0b8ee 100644
--- a/designer/designer.pro
+++ b/designer/designer.pro
@@ -17,9 +17,19 @@ macx{
 }
 
 unix:{
-    LIBS += -L$${DEST_LIBS} -llimereport
+    LIBS += -L$${DEST_LIBS}
+    CONFIG(debug, debug|release) {
+        LIBS += -llimereportd
+    } else {
+        LIBS += -llimereport
+    }
     contains(CONFIG,zint){
-        LIBS += -L$${DEST_LIBS} -lQtZint
+        LIBS += -L$${DEST_LIBS}
+        CONFIG(debug, debug|release) {
+            LIBS += -lQtZintd
+        } else {
+            LIBS += -lQtZint
+        }
     }
     DESTDIR = $$DEST_DIR
 linux{
@@ -42,8 +52,18 @@ win32 {
     RC_FILE += mainicon.rc
 
     contains(CONFIG,zint){
-        LIBS += -L$${DEST_LIBS} -lQtZint
+        LIBS += -L$${DEST_LIBS}
+        CONFIG(debug, debug|release) {
+            LIBS += -lQtZintd
+        } else {
+            LIBS += -lQtZint
+        }
+    }
+    LIBS += -L$${DEST_LIBS}
+    CONFIG(debug, debug|release) {
+        LIBS += -llimereportd
+    } else {
+        LIBS += -llimereport
     }
-    LIBS += -L$${DEST_LIBS} -llimereport
 }
 
diff --git a/limereport/limereport.pro b/limereport/limereport.pro
index 6397a71..45f42c1 100644
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -1,4 +1,13 @@
-TARGET = limereport
+#TARGET = limereport
+
+
+CONFIG(debug, debug|release) {
+    TARGET = limereportd
+} else {
+    TARGET = limereport
+}
+
+
 TEMPLATE = lib
 
 CONFIG += lib
@@ -60,7 +69,14 @@ contains(CONFIG,zint){
     message(zint)
     INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4
     DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4
-    LIBS += -L$${DEST_LIBS} -lQtZint
+    LIBS += -L$${DEST_LIBS}
+
+    CONFIG(debug, debug|release) {
+        LIBS += -lQtZintd
+    } else {
+        LIBS += -lQtZint
+    }
+
 }
 
 #######
diff --git a/translations/limereport_ar.ts b/translations/limereport_ar.ts
index 007f13d..a9354e5 100644
--- a/translations/limereport_ar.ts
+++ b/translations/limereport_ar.ts
@@ -1563,6 +1563,16 @@ p, li { white-space: pre-wrap; }
         <source>Preview</source>
         <translation type="unfinished">معاينة</translation>
     </message>
+    <message>
+        <source>Report File Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The report file &quot;%1&quot; has changed names or been deleted.
+
+This preview is no longer valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ReportFooter</name>
diff --git a/translations/limereport_es_ES.ts b/translations/limereport_es_ES.ts
index 5d39e3f..bc96385 100644
--- a/translations/limereport_es_ES.ts
+++ b/translations/limereport_es_ES.ts
@@ -1388,6 +1388,16 @@ p, li { white-space: pre-wrap; }
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report File Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The report file &quot;%1&quot; has changed names or been deleted.
+
+This preview is no longer valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ReportFooter</name>
diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts
index 3a76892..4adca96 100644
--- a/translations/limereport_ru.ts
+++ b/translations/limereport_ru.ts
@@ -1504,6 +1504,16 @@ p, li { white-space: pre-wrap; }
         <source>Preview</source>
         <translation>Предосмотр</translation>
     </message>
+    <message>
+        <source>Report File Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The report file &quot;%1&quot; has changed names or been deleted.
+
+This preview is no longer valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ReportFooter</name>

From e95dea21463d4a9fc09e128cfd4100f86a16b99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?arne=20kr=C3=BCger?= <ak@crystal-photonics.com>
Date: Fri, 9 Mar 2018 19:12:39 +0100
Subject: [PATCH 04/20] -translations

---
 translations/limereport_ar.ts    |  20 ++-
 translations/limereport_es_ES.qm | Bin 6410 -> 5938 bytes
 translations/limereport_es_ES.ts |  24 ++--
 translations/limereport_fr.ts    | 228 +++++++++++++++++--------------
 translations/limereport_ru.qm    | Bin 105708 -> 105473 bytes
 translations/limereport_ru.ts    |  20 ++-
 6 files changed, 176 insertions(+), 116 deletions(-)

diff --git a/translations/limereport_ar.ts b/translations/limereport_ar.ts
index 10ebbf1..add2edf 100644
--- a/translations/limereport_ar.ts
+++ b/translations/limereport_ar.ts
@@ -587,6 +587,10 @@ p, li { white-space: pre-wrap; }
         <source> already exists! </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ContentItemDesignIntf</name>
@@ -1891,11 +1895,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Hide left panel</source>
-        <translation>إخفاء المقطع الأيسر</translation>
+        <translation type="vanished">إخفاء المقطع الأيسر</translation>
     </message>
     <message>
         <source>Hide right panel</source>
-        <translation>إخفاء المقطع الأيمن</translation>
+        <translation type="vanished">إخفاء المقطع الأيمن</translation>
     </message>
     <message>
         <source>Report Tools</source>
@@ -2065,6 +2069,14 @@ p, li { white-space: pre-wrap; }
         <source>Report has been modified! Do you want save the report?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Hide left panel | Alt+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide right panel | Alt+R</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ReportEnginePrivate</name>
@@ -2347,6 +2359,10 @@ This preview is no longer valid.</source>
         <source>GENERAL</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::SettingDialog</name>
diff --git a/translations/limereport_es_ES.qm b/translations/limereport_es_ES.qm
index eb316e359f0890f04ad494279092808922d14daa..a7fe947df82040544d5ffe086859a3b04bc5a672 100644
GIT binary patch
delta 546
zcmeA&+N4)+vm-^~)cZM8&nn97PguD3t`h?T;|~S~)@TL>uI&sAhI|YRY>y!{_fH0f
z=ma3&pMhn?LIwuzLl9c9078p6L+SSntlC$AW*lN*^)O{%V6cPGLM>4G4+HCgRG@e<
z1FIZ}Ap}%-@(|F#dItAtM;I8Gp|qgd#JS@2jSLZgzW{CJVu)$p3e>d(LJK=Ebg`E*
zFz~EqxNLF(C_jNQV8v7h299{fQ|mi{wih$`#sOW<|D0*pqOS}Ld^Jozj~-=UV6kSl
zS6B)ZcVLN9%LAHsgQaJE6425^EHga!Ffg#^L1@7r5V~IYAIqF5pzB!mSyo2_EfQ&9
z*~tUsb9u4s;{pZ`hX{lgvSHoX0dx@W4%YjnPk<KHu`_;o2XvqY$MPOi1_sXW9IGA!
z#kpQ_e1GT6z#!nunaRNfbjWnhlV=2gzBlJmV+M-zDMM(1lU%NDstgGXd@s3HJyHZ3
z5X5!#1<*jC5n!6P7(xqf<dOUc3~%9Po@rkKfd)76{NBO{bih{LjLmUCA8qA(`3o4V
z?Be{#r?mndD9-;_c_+}}hcg)%L?tKx;Mdt4$FzfOay_5u<~mMqj?I-q4y=>&B<27B
Dcj=T`

delta 894
zcmZWmT}YEr7=E^W-}deQ&#eU!XU2pmOd}=8Tx8h~MOGl8Ax`&EleG``QyW3M5c?6K
zVmKlcG7_aO1gD@;R?-T^=+BF8q-b4K7lvR&Nk8xUO2RJAdEWD$_kEt{yl1GmV`H*n
z)bE=5)ZO*Oz3N_L@7>w$fYJr<^?+Unl$rodxr~N=Kz$>iJ^*f@7ce+vv_)ieRLkh>
z2fuEHI3~dFE(1_0qy5|;{0aWPNcjl()%n1l1wT1Kf-kTu{SZ(kWwfom+_NG%gCpM;
zNL7cUZ6nlmL&kzCbZBDa;s;)CdPet`6g2}~fH0((8oWU25#|1d9ANpVynX#MV0x<j
zn#}^-7L}LvQNBtQUz`UVvs_(Kh<IOdVw^yo<2nbM$ixJ9WzQWTsd*p=wnZ5o3a-13
z-0~Z^TlFOD+{}#`=&bAE#&t9<;h2neFCSMQB!M=5>^vDY>G{{OcVys<MzJtQ#!n0V
zon_RwSGbv@ynd_jWv&Xa)@TEQk_=wePEK2pguX*pq@oMcNg1uvx}DV?z+9ob`PL0+
z`*hj&L`YP>(fCM4+puBfJpDt#Swnh(j9A+Zi^B>sFk(EOX&|G5@!I%B;z^l4e50{z
zTFj5r?SQexoLe(Syv_i<PVqd|ZeE|MRF0}kNWz8$d|(g}M}U4X3Q@>Qt7%!7FBlem
z{sa@_fk-sMQmuxPj7oc0NY>&IwfGRk3BpjmjYwJ%BN7o|S`j)oL83TJbzwR&s?JL_
zQ#M2udBJ?dPzVo7Y4<Kk7w?c*LW(hx4+azLlrI!zQHlA*pcoZdp~X{L$eN{4NNkP<
zq!9C_S}pEOt#un;=KB9Zq~L~oiQBgPS#Edgjnh-^A}<ov{xgbYop$Dz#0U#X(Z3Us
JTT^Lg_b-e5+`|9>

diff --git a/translations/limereport_es_ES.ts b/translations/limereport_es_ES.ts
index d5b0def..7aeadaf 100644
--- a/translations/limereport_es_ES.ts
+++ b/translations/limereport_es_ES.ts
@@ -454,6 +454,10 @@ p, li { white-space: pre-wrap; }
         <source> already exists! </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ContentItemDesignIntf</name>
@@ -1710,14 +1714,6 @@ p, li { white-space: pre-wrap; }
         <source>Horizontal layout</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Hide left panel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide right panel</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Report Tools</source>
         <translation type="unfinished"></translation>
@@ -1866,6 +1862,14 @@ p, li { white-space: pre-wrap; }
         <source>Report has been modified! Do you want save the report?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Hide left panel | Alt+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide right panel | Alt+R</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ReportEnginePrivate</name>
@@ -2132,6 +2136,10 @@ This preview is no longer valid.</source>
         <source>GENERAL</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::SettingDialog</name>
diff --git a/translations/limereport_fr.ts b/translations/limereport_fr.ts
index f893b30..63df088 100644
--- a/translations/limereport_fr.ts
+++ b/translations/limereport_fr.ts
@@ -254,112 +254,112 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::BandDesignIntf</name>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="224"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="229"/>
         <source>DataBand</source>
         <translation>bande de données</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="225"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="230"/>
         <source>DataHeaderBand</source>
         <translation>En-tête de données</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="226"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="231"/>
         <source>DataFooterBand</source>
         <translation>Bande de pied de données</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="227"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="232"/>
         <source>ReportHeader</source>
         <translation>En-tête du rapport</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="228"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="233"/>
         <source>ReportFooter</source>
         <translation>Pied du rapport</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="229"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="234"/>
         <source>PageHeader</source>
         <translation>En-tête de page</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="230"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="235"/>
         <source>PageFooter</source>
         <translation>Pied de page</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="231"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="236"/>
         <source>SubDetailBand</source>
         <translation>Bande de sous-détails</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="232"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="237"/>
         <source>SubDetailHeaderBand</source>
         <translation>En-tête de sous-détails</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="233"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="238"/>
         <source>SubDetailFooterBand</source>
         <translation>Pied de sous-détails</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="234"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="239"/>
         <source>GroupBandHeader</source>
         <translation>Bande de groupe d&apos;en-tête</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="235"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="240"/>
         <source>GroupBandFooter</source>
         <translation>Bande de groupe de pieds</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="236"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="241"/>
         <source>TearOffBand</source>
         <translation>Bande détachable</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="247"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="252"/>
         <source> connected to </source>
         <translation> Connecté à </translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="471"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="476"/>
         <source>Bring to top</source>
         <translation>Placer au premier-plan</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="472"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="477"/>
         <source>Send to back</source>
         <translation>Placer en arrière-plan</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="477"/>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="500"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="482"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="505"/>
         <source>Auto height</source>
         <translation>Hauteur automatique</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="481"/>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="503"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="486"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="508"/>
         <source>Splittable</source>
         <translation>Divisible</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="485"/>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="506"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="490"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="511"/>
         <source>Keep bottom space</source>
         <translation>Garder l&apos;espace inférieur</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="489"/>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="512"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="494"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="517"/>
         <source>Start from new page</source>
         <translation>Démarrer depuis une nouvelle page</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="493"/>
-        <location filename="../limereport/lrbanddesignintf.cpp" line="509"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="498"/>
+        <location filename="../limereport/lrbanddesignintf.cpp" line="514"/>
         <source>Start new page</source>
         <translation>Démarrer une nouvelle page</translation>
     </message>
@@ -367,37 +367,37 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::BaseDesignIntf</name>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1162"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1163"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1164"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1165"/>
         <source>Cut</source>
         <translation>Couper</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1166"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1167"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1175"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1176"/>
         <source>Bring to top</source>
         <translation>Placer au premier-plan</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1176"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1177"/>
         <source>Send to back</source>
         <translation>Placer en arrière-plan</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1178"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1179"/>
         <source>No borders</source>
         <translation>Aucune bordure</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1179"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1180"/>
         <source>All borders</source>
         <translation>Toutes les bordures</translation>
     </message>
@@ -405,8 +405,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ConnectionDesc</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="378"/>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="383"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="377"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="382"/>
         <source>defaultConnection</source>
         <translation>Connexion par défaut</translation>
     </message>
@@ -430,57 +430,62 @@ p, li { white-space: pre-wrap; }
         <translation>Utiliser la connexion par défaut de l&apos;application</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="51"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="53"/>
         <source>Driver</source>
         <translation>Pilote</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="61"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="60"/>
         <source>Server </source>
         <translation>Serveur </translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="75"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="67"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="74"/>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="89"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="81"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="106"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="88"/>
         <source>Database</source>
         <translation>Base de données</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="125"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="141"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="136"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="154"/>
         <source>Auto connect</source>
         <translation>Connexion automatique</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="143"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="161"/>
         <source>Dont keep credentals in lrxml</source>
         <translation>Ne pas enregistrer les informations personnelles</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="165"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="183"/>
         <source>Check connection</source>
         <translation>Vérifier la connexion</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="188"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="206"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="198"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.ui" line="216"/>
         <source>Ok</source>
         <translation></translation>
     </message>
@@ -511,7 +516,7 @@ p, li { white-space: pre-wrap; }
         <translation> existe déja! </translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrconnectiondialog.cpp" line="153"/>
+        <location filename="../limereport/databrowser/lrconnectiondialog.cpp" line="156"/>
         <source>defaultConnection</source>
         <translation></translation>
     </message>
@@ -679,7 +684,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../limereport/lrdatasourcemanager.cpp" line="599"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="964"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="966"/>
         <source>Datasource &quot;%1&quot; not found!</source>
         <translation>Source de donnée &quot;%1&quot; introuvable!</translation>
     </message>
@@ -697,12 +702,12 @@ p, li { white-space: pre-wrap; }
         <translation>La source de donnée avec le nom &quot;%1&quot; existe déja!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="761"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="763"/>
         <source>Database &quot;%1&quot; not found</source>
         <translation>Base de données &quot;%1 introuvable</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="937"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="939"/>
         <source>invalid connection</source>
         <translation>Connexion invalide</translation>
     </message>
@@ -1196,12 +1201,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::MasterDetailProxyModel</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="614"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="623"/>
         <source>Field: &quot;%1&quot; not found in &quot;%2&quot; child datasource</source>
         <translation>Le champ: &quot;%1&quot;est introuvable dans la source de donnée enfant &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="627"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="636"/>
         <source>Field: &quot;%1&quot; not found in &quot;%2&quot; master datasource</source>
         <translation>Le champ: &quot;%1&quot;est introuvable dans la source de donnée principale &quot;%2&quot;</translation>
     </message>
@@ -1209,7 +1214,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ModelToDataSource</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="339"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="338"/>
         <source>model is destroyed</source>
         <translation>Le modèle a été supprimé</translation>
     </message>
@@ -1416,7 +1421,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ProxyHolder</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="553"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="562"/>
         <source>Datasource has been invalidated</source>
         <translation>La source de donnée n&apos;a pas été validée</translation>
     </message>
@@ -2087,14 +2092,22 @@ p, li { white-space: pre-wrap; }
         <translation>A propos</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportdesignwindow.cpp" line="220"/>
         <source>Hide left panel</source>
-        <translation>Masquer le panneau de gauche</translation>
+        <translation type="vanished">Masquer le panneau de gauche</translation>
+    </message>
+    <message>
+        <source>Hide right panel</source>
+        <translation type="vanished">Masquer le panneau de droite</translation>
+    </message>
+    <message>
+        <location filename="../limereport/lrreportdesignwindow.cpp" line="220"/>
+        <source>Hide left panel | Alt+L</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../limereport/lrreportdesignwindow.cpp" line="226"/>
-        <source>Hide right panel</source>
-        <translation>Masquer le panneau de droite</translation>
+        <source>Hide right panel | Alt+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../limereport/lrreportdesignwindow.cpp" line="235"/>
@@ -2281,17 +2294,17 @@ p, li { white-space: pre-wrap; }
         <translation>Aperçu avant impression</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportengine.cpp" line="162"/>
+        <location filename="../limereport/lrreportengine.cpp" line="163"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportengine.cpp" line="474"/>
+        <location filename="../limereport/lrreportengine.cpp" line="475"/>
         <source>Report File Change</source>
         <translation>Nom du fichier changé</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportengine.cpp" line="475"/>
+        <location filename="../limereport/lrreportengine.cpp" line="476"/>
         <source>The report file &quot;%1&quot; has changed names or been deleted.
 
 This preview is no longer valid.</source>
@@ -2541,7 +2554,7 @@ Cet aperçu n&apos;est plus valide.</translation>
 <context>
     <name>LimeReport::ScriptEngineContext</name>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="799"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="829"/>
         <source>Dialog with name: %1 can`t be created</source>
         <translation>Le dialogue avec le nom &quot;%1&quot; ne peut pas être crée</translation>
     </message>
@@ -2549,89 +2562,96 @@ Cet aperçu n&apos;est plus valide.</translation>
 <context>
     <name>LimeReport::ScriptEngineManager</name>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="434"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="463"/>
         <source>GROUP FUNCTIONS</source>
         <translation>Fonctions de groupe</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="434"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="620"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="623"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="624"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="625"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="629"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="630"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="632"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="463"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="649"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="653"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="654"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="655"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="659"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="660"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="662"/>
         <source>Value</source>
         <translation>Valeur</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="434"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="619"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="463"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="648"/>
         <source>BandName</source>
         <translation>Nom de la bande</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="478"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="507"/>
         <source>Variable %1 not found</source>
         <translation>Variable &quot;%1&quot; introuvable</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="619"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="648"/>
         <source>SYSTEM</source>
         <translation>Système</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="620"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="629"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="630"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="649"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="659"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="660"/>
         <source>NUMBER</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="620"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="623"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="624"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="625"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="649"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="652"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="653"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="654"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="655"/>
         <source>Format</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="621"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="650"/>
         <source>Precision</source>
         <translation>Précision</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="622"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="629"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="651"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="659"/>
         <source>Locale</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="623"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="624"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="625"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="626"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="627"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="652"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="653"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="654"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="655"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="656"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="657"/>
         <source>DATE&amp;TIME</source>
         <translation>DATE&amp;HEURE</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="630"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="652"/>
+        <source>Seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="660"/>
         <source>CurrencySymbol</source>
         <translation>Symbolde de la monnaie</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="632"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="633"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="634"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="662"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="663"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="664"/>
         <source>GENERAL</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="632"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="633"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="634"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="662"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="663"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="664"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
@@ -2995,32 +3015,32 @@ Cet aperçu n&apos;est plus valide.</translation>
     </message>
     <message>
         <location filename="../limereport/lrdatadesignintf.cpp" line="76"/>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="121"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="120"/>
         <source>Invalid connection! %1</source>
         <translation>Connexion invalidé %1</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="416"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="425"/>
         <source>Master datasource &quot;%1&quot; not found!</source>
         <translation>Source de donnée principale &quot;%1&quot; introuvable!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="524"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="533"/>
         <source>Master datasouce &quot;%1&quot; not found!</source>
         <translation>Source de donnée principale &quot;%1&quot; introuvable!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="525"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="534"/>
         <source>Child</source>
         <translation>Enfant</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="525"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="534"/>
         <source> and child </source>
         <translation> est enfant </translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="526"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="535"/>
         <source>datasouce &quot;%1&quot; not found!</source>
         <translation>Source de donnée &quot;%1&quot; introuvable!</translation>
     </message>
@@ -3136,7 +3156,7 @@ Cet aperçu n&apos;est plus valide.</translation>
         <translation>L&apos;objet avec le nom &quot;%1&quot; existe déja!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="330"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="359"/>
         <source>Function %1 not found or have wrong arguments</source>
         <translation>La fonction %1 est introuvable ou contient des paramètres incorrects</translation>
     </message>
diff --git a/translations/limereport_ru.qm b/translations/limereport_ru.qm
index 6db79385a6986602dab7e2a95527253a8e70b790..57a32c9c45a26e881d8dd02a3cbd68184d7d326c 100644
GIT binary patch
delta 2366
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

delta 2593
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

diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts
index d706b5f..7fbb600 100644
--- a/translations/limereport_ru.ts
+++ b/translations/limereport_ru.ts
@@ -456,6 +456,10 @@ p, li { white-space: pre-wrap; }
         <source> already exists! </source>
         <translation> уже существует! </translation>
     </message>
+    <message>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ContentItemDesignIntf</name>
@@ -1769,11 +1773,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Hide left panel</source>
-        <translation>Спрятать левую панель</translation>
+        <translation type="vanished">Спрятать левую панель</translation>
     </message>
     <message>
         <source>Hide right panel</source>
-        <translation>Спрятать правую панель</translation>
+        <translation type="vanished">Спрятать правую панель</translation>
     </message>
     <message>
         <source>Report Tools</source>
@@ -1951,6 +1955,14 @@ p, li { white-space: pre-wrap; }
         <source>Report has been modified! Do you want save the report?</source>
         <translation>Отчет был изменен! Хотите его сохранить?</translation>
     </message>
+    <message>
+        <source>Hide left panel | Alt+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide right panel | Alt+R</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ReportEnginePrivate</name>
@@ -2225,6 +2237,10 @@ This preview is no longer valid.</source>
         <source>GENERAL</source>
         <translation>ОБЩИЕ</translation>
     </message>
+    <message>
+        <source>Seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::SettingDialog</name>

From 996d3ff16ac6a9904cdcf1608270d71f951d9465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?arne=20kr=C3=BCger?= <ak@crystal-photonics.com>
Date: Mon, 12 Mar 2018 19:21:34 +0100
Subject: [PATCH 05/20] -zint dll is now created

---
 3rdparty/zint-2.4.4/backend_qt4/Zint.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
index 2497f83..f9747a2 100644
--- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
+++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
@@ -7,8 +7,9 @@ contains(CONFIG, static_build){
 }
 
 !contains(CONFIG, staticlib){
-CONFIG += dll
+    CONFIG += dll
     DEFINES += QZINT_LIBRARY
+
 }
 
 include(../../../common.pri)

From 860be394a657ebd3cb990ea95b45ec1d32bd3aab Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Thu, 15 Mar 2018 10:59:44 +0300
Subject: [PATCH 06/20] Subgroup band fixed

---
 limereport/lrreportrender.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp
index 5eb81e6..6475f15 100644
--- a/limereport/lrreportrender.cpp
+++ b/limereport/lrreportrender.cpp
@@ -705,8 +705,8 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da
                 foreach (BandDesignIntf* subBand, band->childrenByType(BandDesignIntf::GroupHeader)) {
                     foreach(BandDesignIntf* footer, subBand->childrenByType(BandDesignIntf::GroupFooter)){
                         renderBand(footer, 0);
-                        closeDataGroup(subBand);
                     }
+                    closeDataGroup(subBand);
                 }
 
                 foreach (BandDesignIntf* footer, band->childrenByType(BandDesignIntf::GroupFooter)) {

From 9d11ba719d6b8aedeb55433b73057366f18a19e9 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Thu, 15 Mar 2018 11:01:09 +0300
Subject: [PATCH 07/20] Version changed

---
 common.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.pri b/common.pri
index a99ca12..485bc51 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 63
+LIMEREPORT_VERSION_RELEASE = 68
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"

From 24c9fa1827d61df9295c8b7ecc29b8ace9e6792e Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Thu, 22 Mar 2018 17:17:04 +0300
Subject: [PATCH 08/20] Watermark property has been added to TextItem and
 ImageItem

---
 limereport/items/lrimageitem.h  |  1 +
 limereport/items/lrtextitem.h   |  1 +
 limereport/lrbasedesignintf.cpp | 16 +++++++++++++++-
 limereport/lrbasedesignintf.h   |  4 ++++
 limereport/lrreportrender.cpp   |  5 ++++-
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/limereport/items/lrimageitem.h b/limereport/items/lrimageitem.h
index 18b236f..77ea8db 100644
--- a/limereport/items/lrimageitem.h
+++ b/limereport/items/lrimageitem.h
@@ -47,6 +47,7 @@ class ImageItem : public LimeReport::ItemDesignIntf
     Q_PROPERTY(bool keepAspectRatio READ keepAspectRatio WRITE setKeepAspectRatio)
     Q_PROPERTY(bool center READ center WRITE setCenter)
     Q_PROPERTY(QString resourcePath READ resourcePath WRITE setResourcePath)
+    Q_PROPERTY(bool watermark READ isWatermark WRITE setWatermark)
 public:
     enum Format {
         Binary  = 0,
diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h
index f743d3d..ff02e06 100644
--- a/limereport/items/lrtextitem.h
+++ b/limereport/items/lrtextitem.h
@@ -71,6 +71,7 @@ class TextItem : public LimeReport::ContentItemDesignIntf, IPageInit {
     Q_PROPERTY(BrushStyle backgroundBrushStyle READ backgroundBrushStyle WRITE setBackgroundBrushStyle)
     Q_PROPERTY(qreal textIndent READ textIndent WRITE setTextIndent)
     Q_PROPERTY(Qt::LayoutDirection textLayoutDirection READ textLayoutDirection WRITE setTextLayoutDirection)
+    Q_PROPERTY(bool watermark READ isWatermark WRITE setWatermark)
 public:
 
     enum AutoWidth{NoneAutoWidth,MaxWordLength,MaxStringLength};
diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp
index e5591ed..83d9c7a 100644
--- a/limereport/lrbasedesignintf.cpp
+++ b/limereport/lrbasedesignintf.cpp
@@ -78,7 +78,8 @@ BaseDesignIntf::BaseDesignIntf(const QString &storageTypeName, QObject *owner, Q
     m_changingItemAlign(false),
     m_borderColor(Qt::black),
     m_reportSettings(0),
-    m_patternName("")
+    m_patternName(""),
+    m_watermark(false)
 {
     setGeometry(QRectF(0, 0, m_width, m_height));
     if (BaseDesignIntf *item = dynamic_cast<BaseDesignIntf *>(parent)) {
@@ -701,6 +702,19 @@ void BaseDesignIntf::turnOnSelectionMarker(bool value)
     }
 }
 
+bool BaseDesignIntf::isWatermark() const
+{
+    return m_watermark;
+}
+
+void BaseDesignIntf::setWatermark(bool watermark)
+{
+    if (m_watermark != watermark){
+        m_watermark = watermark;
+        notify("watermark",!watermark,watermark);
+    }
+}
+
 QString BaseDesignIntf::patternName() const
 {
     return (m_patternName.isEmpty()) ? objectName() : m_patternName;
diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h
index ecced96..7c72a21 100644
--- a/limereport/lrbasedesignintf.h
+++ b/limereport/lrbasedesignintf.h
@@ -282,6 +282,9 @@ public:
     Q_INVOKABLE QString setItemPosX(qreal xValue);
     Q_INVOKABLE QString setItemPosY(qreal yValue);
 
+    bool isWatermark() const;
+    void setWatermark(bool watermark);
+
 protected:
 
     //ICollectionContainer
@@ -396,6 +399,7 @@ private:
     QColor  m_borderColor;
     ReportSettings* m_reportSettings;
     QString m_patternName;
+    bool m_watermark;
 signals:
     void geometryChanged(QObject* object, QRectF newGeometry, QRectF oldGeometry);
     void posChanged(QObject* object, QPointF newPos, QPointF oldPos);
diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp
index 6475f15..ed72282 100644
--- a/limereport/lrreportrender.cpp
+++ b/limereport/lrreportrender.cpp
@@ -640,7 +640,10 @@ void ReportRender::renderPageItems(PageItemDesignIntf* patternPage)
     m_renderPageItem->restoreLinks();
     m_renderPageItem->updateSubItemsSize(FirstPass,m_datasources);
     foreach(BaseDesignIntf* item, pageItems){
-        item->setZValue(item->zValue()-100000);
+        if (!item->isWatermark())
+            item->setZValue(item->zValue()-100000);
+        else
+            item->setZValue(item->zValue()+100000);
     }
 }
 

From 87f5451cda24f40b2d86ba769017e46756999737 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Thu, 22 Mar 2018 17:21:02 +0300
Subject: [PATCH 09/20] Version changed to 1.4.69

---
 common.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.pri b/common.pri
index 485bc51..4feb9cb 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 68
+LIMEREPORT_VERSION_RELEASE = 69
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"

From 25b4ace815fdcafa7d761d5f6d6fea57d53bd7d3 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Thu, 22 Mar 2018 17:54:18 +0300
Subject: [PATCH 10/20] Watermark fixed

---
 common.pri                      | 2 +-
 limereport/items/lrtextitem.cpp | 6 ++++++
 limereport/items/lrtextitem.h   | 2 ++
 limereport/lrbasedesignintf.h   | 5 ++---
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/common.pri b/common.pri
index 4feb9cb..0202559 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 69
+LIMEREPORT_VERSION_RELEASE = 70
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp
index 8c01e87..c0ed243 100644
--- a/limereport/items/lrtextitem.cpp
+++ b/limereport/items/lrtextitem.cpp
@@ -543,6 +543,12 @@ void TextItem::setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirec
     }
 }
 
+void TextItem::setWatermark(bool watermark)
+{
+    setBackgroundMode(TransparentMode);
+    BaseDesignIntf::setWatermark(watermark);
+}
+
 
 QString TextItem::followTo() const
 {
diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h
index ff02e06..5bc82fb 100644
--- a/limereport/items/lrtextitem.h
+++ b/limereport/items/lrtextitem.h
@@ -164,6 +164,8 @@ public:
     void setTextIndent(const qreal &textIndent);
     Qt::LayoutDirection textLayoutDirection() const;
     void setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirection);
+
+    void setWatermark(bool watermark);
     
 protected:
     void updateLayout();
diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h
index 7c72a21..904b64e 100644
--- a/limereport/lrbasedesignintf.h
+++ b/limereport/lrbasedesignintf.h
@@ -272,6 +272,8 @@ public:
     void setZValueProperty(qreal value);
     QString patternName() const;
     void setPatternName(const QString &patternName);
+    bool isWatermark() const;
+    virtual void setWatermark(bool watermark);
 
     Q_INVOKABLE QString setItemWidth(qreal width);
     Q_INVOKABLE QString setItemHeight(qreal height);
@@ -282,9 +284,6 @@ public:
     Q_INVOKABLE QString setItemPosX(qreal xValue);
     Q_INVOKABLE QString setItemPosY(qreal yValue);
 
-    bool isWatermark() const;
-    void setWatermark(bool watermark);
-
 protected:
 
     //ICollectionContainer

From ae0deb183f28c9f0d6565948bed46a646df3d960 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Thu, 22 Mar 2018 20:36:14 +0300
Subject: [PATCH 11/20] watermark property translated

---
 common.pri                                       | 2 +-
 limereport/objectinspector/lrobjectitemmodel.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common.pri b/common.pri
index 0202559..fb9bdaf 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 70
+LIMEREPORT_VERSION_RELEASE = 71
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
diff --git a/limereport/objectinspector/lrobjectitemmodel.cpp b/limereport/objectinspector/lrobjectitemmodel.cpp
index 080a7a2..71b3adb 100644
--- a/limereport/objectinspector/lrobjectitemmodel.cpp
+++ b/limereport/objectinspector/lrobjectitemmodel.cpp
@@ -134,6 +134,7 @@ void QObjectPropertyModel::translatePropertyName()
     tr("condition");
     tr("groupFieldName");
     tr("keepGroupTogether");
+    tr("watermark");
 }
 
 void QObjectPropertyModel::clearObjectsList()

From af30f3582e4014399cd31e17770d6515355d7347 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Mon, 26 Mar 2018 23:32:25 +0300
Subject: [PATCH 12/20] bool propertyitem fixed

---
 common.pri                                    |  2 +-
 .../propertyItems/lrboolpropitem.cpp          | 29 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/common.pri b/common.pri
index fb9bdaf..50e1bb1 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 71
+LIMEREPORT_VERSION_RELEASE = 72
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
diff --git a/limereport/objectinspector/propertyItems/lrboolpropitem.cpp b/limereport/objectinspector/propertyItems/lrboolpropitem.cpp
index c6c9f37..9ed1eea 100644
--- a/limereport/objectinspector/propertyItems/lrboolpropitem.cpp
+++ b/limereport/objectinspector/propertyItems/lrboolpropitem.cpp
@@ -69,20 +69,29 @@ void BoolPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *mod
 
 bool BoolPropItem::paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index)
 {
-    if (index.column()==1){
-        QStyleOptionButton so;
-        int border = (option.rect.height() - QApplication::style()->pixelMetric(QStyle::PM_IndicatorWidth))/2;
-        so.rect = option.rect.adjusted(border,border,0,-border);
-        so.rect.setWidth(QApplication::style()->pixelMetric(QStyle::PM_IndicatorWidth));
 
-        if (!isValueReadonly())
-            so.state = QStyle::State_Enabled;
-        else
-            so.state &= ~QStyle::State_Enabled;
+    QStyle* style = option.widget ? option.widget->style() : QApplication::style();
+    int offset = 0;
+
+#ifdef Q_OS_MAC
+    offset = 2;
+#endif
+
+    if (index.column()==1){
+        StyleOptionViewItem so(option);
+        int border = (option.rect.height() - style->pixelMetric(QStyle::PM_IndicatorWidth))/2;
+        so.rect = option.rect.adjusted(border,border,0,-border);
+        so.rect.setWidth(style->pixelMetric(QStyle::PM_IndicatorWidth)+offset);
+        so.rect.setHeight(style->pixelMetric(QStyle::PM_IndicatorHeight)+offset);
+
+//        if (!isValueReadonly())
+//            so.state = QStyle::State_Enabled;
+//        else
+//            so.state &= ~QStyle::State_Enabled;
 
         so.state |= propertyValue().toBool() ? QStyle::State_On : QStyle::State_Off;
 
-        option.widget->style()->drawPrimitive(QStyle::PE_IndicatorCheckBox,&so,painter);
+        style->drawPrimitive(QStyle::PE_IndicatorItemViewItemCheck,&so,painter);
 
         return true;
     } else return false;

From fdab56b1d88797e3dcd81c4aaf8337e502a583f8 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Tue, 27 Mar 2018 00:39:59 +0300
Subject: [PATCH 13/20] Bool property item fixed

---
 common.pri                                    |  2 +-
 .../propertyItems/lrboolpropitem.cpp          | 19 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/common.pri b/common.pri
index 50e1bb1..d46e57d 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 72
+LIMEREPORT_VERSION_RELEASE = 73
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
diff --git a/limereport/objectinspector/propertyItems/lrboolpropitem.cpp b/limereport/objectinspector/propertyItems/lrboolpropitem.cpp
index 9ed1eea..7e3cc5f 100644
--- a/limereport/objectinspector/propertyItems/lrboolpropitem.cpp
+++ b/limereport/objectinspector/propertyItems/lrboolpropitem.cpp
@@ -71,28 +71,15 @@ bool BoolPropItem::paint(QPainter *painter, const StyleOptionViewItem &option, c
 {
 
     QStyle* style = option.widget ? option.widget->style() : QApplication::style();
-    int offset = 0;
-
-#ifdef Q_OS_MAC
-    offset = 2;
-#endif
 
     if (index.column()==1){
-        StyleOptionViewItem so(option);
+        QStyleOptionButton so;
         int border = (option.rect.height() - style->pixelMetric(QStyle::PM_IndicatorWidth))/2;
         so.rect = option.rect.adjusted(border,border,0,-border);
-        so.rect.setWidth(style->pixelMetric(QStyle::PM_IndicatorWidth)+offset);
-        so.rect.setHeight(style->pixelMetric(QStyle::PM_IndicatorHeight)+offset);
-
-//        if (!isValueReadonly())
-//            so.state = QStyle::State_Enabled;
-//        else
-//            so.state &= ~QStyle::State_Enabled;
-
+        so.rect.setWidth(style->pixelMetric(QStyle::PM_IndicatorWidth));
+        so.rect.setHeight(style->pixelMetric(QStyle::PM_IndicatorHeight));
         so.state |= propertyValue().toBool() ? QStyle::State_On : QStyle::State_Off;
-
         style->drawPrimitive(QStyle::PE_IndicatorItemViewItemCheck,&so,painter);
-
         return true;
     } else return false;
 }

From ddf05fb956ed149ed2c5491a3dc3699a0a497b36 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Tue, 27 Mar 2018 01:10:24 +0300
Subject: [PATCH 14/20] Bool propertyitem modified

---
 common.pri                                    |  2 +-
 .../propertyItems/lrboolpropitem.cpp          | 32 +++++++++++++++----
 .../propertyItems/lrboolpropitem.h            |  2 ++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/common.pri b/common.pri
index d46e57d..60d33f4 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 73
+LIMEREPORT_VERSION_RELEASE = 74
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
diff --git a/limereport/objectinspector/propertyItems/lrboolpropitem.cpp b/limereport/objectinspector/propertyItems/lrboolpropitem.cpp
index 7e3cc5f..6e462a2 100644
--- a/limereport/objectinspector/propertyItems/lrboolpropitem.cpp
+++ b/limereport/objectinspector/propertyItems/lrboolpropitem.cpp
@@ -67,19 +67,39 @@ void BoolPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *mod
     setValueToObject(propertyName(),propertyValue());
 }
 
+QPixmap BoolPropItem::getIndicatorImage(const StyleOptionViewItem &option){
+    QStyleOptionButton so;
+    so.state = option.state;
+    if (!isValueReadonly())
+        so.state = QStyle::State_Enabled;
+    else
+        so.state &= ~QStyle::State_Enabled;
+    so.state |= propertyValue().toBool() ? QStyle::State_On : QStyle::State_Off;
+    so.rect = QRect(0,0,
+                    QApplication::style()->pixelMetric(QStyle::PM_IndicatorWidth),
+                    QApplication::style()->pixelMetric(QStyle::PM_IndicatorHeight));
+
+    QPixmap pixmap(so.rect.width(),so.rect.height());
+    pixmap.fill(Qt::transparent);
+    QPainter p(&pixmap);
+    option.widget->style()->drawPrimitive(QStyle::PE_IndicatorItemViewItemCheck,&so, &p);
+    return pixmap;
+}
+
 bool BoolPropItem::paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index)
 {
 
     QStyle* style = option.widget ? option.widget->style() : QApplication::style();
 
     if (index.column()==1){
-        QStyleOptionButton so;
         int border = (option.rect.height() - style->pixelMetric(QStyle::PM_IndicatorWidth))/2;
-        so.rect = option.rect.adjusted(border,border,0,-border);
-        so.rect.setWidth(style->pixelMetric(QStyle::PM_IndicatorWidth));
-        so.rect.setHeight(style->pixelMetric(QStyle::PM_IndicatorHeight));
-        so.state |= propertyValue().toBool() ? QStyle::State_On : QStyle::State_Off;
-        style->drawPrimitive(QStyle::PE_IndicatorItemViewItemCheck,&so,painter);
+//        QStyleOptionButton so;
+//        so.rect = option.rect.adjusted(border,border,0,-border);
+//        so.rect.setWidth(style->pixelMetric(QStyle::PM_IndicatorWidth));
+//        so.rect.setHeight(style->pixelMetric(QStyle::PM_IndicatorHeight));
+//        so.state |= propertyValue().toBool() ? QStyle::State_On : QStyle::State_Off;
+//        style->drawPrimitive(QStyle::PE_IndicatorItemViewItemCheck,&so,painter);
+        painter->drawPixmap(option.rect.x()+border,option.rect.y()+border, getIndicatorImage(option));
         return true;
     } else return false;
 }
diff --git a/limereport/objectinspector/propertyItems/lrboolpropitem.h b/limereport/objectinspector/propertyItems/lrboolpropitem.h
index 3407925..9331c3d 100644
--- a/limereport/objectinspector/propertyItems/lrboolpropitem.h
+++ b/limereport/objectinspector/propertyItems/lrboolpropitem.h
@@ -45,6 +45,8 @@ public:
     virtual void setPropertyEditorData(QWidget * propertyEditor, const QModelIndex &) const;
     virtual void setModelData(QWidget * propertyEditor, QAbstractItemModel * model, const QModelIndex & index);
     bool paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index);
+protected:
+    QPixmap getIndicatorImage(const StyleOptionViewItem &option);
 };
 } // namespace LimeReport
 

From bae89854deb62aed9e326bcc0c574d4fedf3e841 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Wed, 28 Mar 2018 19:24:06 +0300
Subject: [PATCH 15/20] Background fixed

---
 common.pri                      | 2 +-
 limereport/items/lrtextitem.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common.pri b/common.pri
index 60d33f4..9335ddf 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 74
+LIMEREPORT_VERSION_RELEASE = 75
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp
index c0ed243..15e5809 100644
--- a/limereport/items/lrtextitem.cpp
+++ b/limereport/items/lrtextitem.cpp
@@ -545,7 +545,9 @@ void TextItem::setTextLayoutDirection(const Qt::LayoutDirection &textLayoutDirec
 
 void TextItem::setWatermark(bool watermark)
 {
-    setBackgroundMode(TransparentMode);
+    if (watermark){
+        setBackgroundMode(TransparentMode);
+    }
     BaseDesignIntf::setWatermark(watermark);
 }
 

From 0dd864085955a5ee49871fcc76d1e597c7469788 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Fri, 30 Mar 2018 21:30:47 +0300
Subject: [PATCH 16/20] Band slicing has been fixed

---
 common.pri                      | 2 +-
 limereport/lrbanddesignintf.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common.pri b/common.pri
index 9335ddf..b2cb30a 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 75
+LIMEREPORT_VERSION_RELEASE = 76
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp
index 6ca39be..927081b 100644
--- a/limereport/lrbanddesignintf.cpp
+++ b/limereport/lrbanddesignintf.cpp
@@ -585,7 +585,7 @@ BaseDesignIntf *BandDesignIntf::cloneBottomPart(int height, QObject *owner, QGra
                 BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(),bottomPart,bottomPart);
                 tmpItem->setPos(tmpItem->pos().x(), (tmpItem->pos().y()-height)+borderLineSize());
             }
-            else if ((item->geometry().top()<height) && (item->geometry().bottom()>height)){
+            else if ((item->geometry().top()<=height) && (item->geometry().bottom()>height)){
                 int sliceHeight = height-item->geometry().top();
                 if (item->isSplittable() && item->canBeSplitted(sliceHeight)) {
                     BaseDesignIntf* tmpItem=item->cloneBottomPart(sliceHeight,bottomPart,bottomPart);
@@ -597,7 +597,7 @@ BaseDesignIntf *BandDesignIntf::cloneBottomPart(int height, QObject *owner, QGra
                         moveItemsDown(item->pos().y()+item->height(), sizeOffset + bottomOffset);
                     }
                 } else {
-                    if ((item->geometry().bottom()-height)>height){
+                    if ((item->geometry().bottom()-height)>=height){
                         BaseDesignIntf* tmpItem = item->cloneItem(item->itemMode(),bottomPart,bottomPart);
                         tmpItem->setPos(tmpItem->pos().x(),borderLineSize());
                         tmpItem->setHeight((this->height()-height));

From e5555900087e26914384d9573350f9367357b226 Mon Sep 17 00:00:00 2001
From: Arin  Alex <arin_a@bk.ru>
Date: Thu, 19 Apr 2018 22:39:17 +0300
Subject: [PATCH 17/20] backgroundMode property added to the band items

---
 limereport/lrbanddesignintf.cpp | 25 +++++++++++++++++++------
 limereport/lrbanddesignintf.h   |  4 ++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp
index 927081b..4e3b5fc 100644
--- a/limereport/lrbanddesignintf.cpp
+++ b/limereport/lrbanddesignintf.cpp
@@ -182,14 +182,27 @@ QString BandDesignIntf::translateBandName(const BaseDesignIntf* item) const{
     }
 }
 
+void BandDesignIntf::setBackgroundModeProperty(BaseDesignIntf::BGMode value)
+{
+    if (value!=backgroundMode()){
+        BaseDesignIntf::BGMode oldValue = backgroundMode();
+        setBackgroundMode(value);
+        notify("backgroundMode",oldValue,value);
+    }
+}
+
+void BandDesignIntf::setBackgroundOpacity(int value)
+{
+    if (opacity()!=value){
+        int oldValue = opacity();
+        setOpacity(value);
+        notify("backgroundOpacity",oldValue,value);
+    }
+}
+
 void BandDesignIntf::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-
-    if ( !(backgroundColor() == Qt::white && backgroundBrushStyle() == SolidPattern) ) {
-        QBrush brush(backgroundColor(), static_cast<Qt::BrushStyle>(backgroundBrushStyle()));
-        brush.setTransform(painter->worldTransform().inverted());
-        painter->fillRect(rect(), brush);
-    }
+    prepareRect(painter, option, widget);
 
     if (itemMode() & DesignMode){
         painter->save();
diff --git a/limereport/lrbanddesignintf.h b/limereport/lrbanddesignintf.h
index 5f56beb..7bf8401 100644
--- a/limereport/lrbanddesignintf.h
+++ b/limereport/lrbanddesignintf.h
@@ -105,6 +105,8 @@ class BandDesignIntf : public ItemsContainerDesignInft
     Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor)
     Q_PROPERTY(BrushStyle backgroundBrushStyle READ backgroundBrushStyle WRITE setBackgroundBrushStyle)
     Q_PROPERTY(bool printIfEmpty READ printIfEmpty WRITE setPrintIfEmpty)
+    Q_PROPERTY(BGMode backgroundMode READ backgroundMode WRITE setBackgroundModeProperty)
+    Q_PROPERTY(int backgroundOpacity READ opacity WRITE setBackgroundOpacity)
     Q_ENUMS(BandColumnsLayoutType)
     friend class BandMarker;
     friend class BandNameLabel;
@@ -235,6 +237,8 @@ public:
     QColor alternateBackgroundColor() const;
     void setAlternateBackgroundColor(const QColor &alternateBackgroundColor);
     qreal bottomSpace() const;
+    void setBackgroundModeProperty(BGMode value);
+    void setBackgroundOpacity(int value);
 signals:
     void bandRendered(BandDesignIntf* band);        
 protected:

From 017c280ff67a0202a81792467033b95e4bc2543e Mon Sep 17 00:00:00 2001
From: Arin  Alex <arin_a@bk.ru>
Date: Thu, 19 Apr 2018 22:40:04 +0300
Subject: [PATCH 18/20] Version changed

---
 common.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.pri b/common.pri
index b2cb30a..17e0291 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 76
+LIMEREPORT_VERSION_RELEASE = 77
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"

From ab14b81ac30107f6857bdd6a3d35afab164ad295 Mon Sep 17 00:00:00 2001
From: Arin  Alex <arin_a@bk.ru>
Date: Fri, 20 Apr 2018 00:10:14 +0300
Subject: [PATCH 19/20] Prepare rect has been refactored

---
 common.pri                      |  2 +-
 limereport/lrbasedesignintf.cpp | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/common.pri b/common.pri
index 17e0291..6a8f275 100644
--- a/common.pri
+++ b/common.pri
@@ -62,7 +62,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 77
+LIMEREPORT_VERSION_RELEASE = 78
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp
index 83d9c7a..61c7283 100644
--- a/limereport/lrbasedesignintf.cpp
+++ b/limereport/lrbasedesignintf.cpp
@@ -400,19 +400,21 @@ void BaseDesignIntf::prepareRect(QPainter *painter, const QStyleOptionGraphicsIt
 {
     painter->save();
 
+    QRectF r = rect().adjusted(0, 0, borderLineSize(), borderLineSize());
     QBrush brush(m_backgroundColor,static_cast<Qt::BrushStyle>(m_backgroundBrushStyle));
     brush.setTransform(painter->worldTransform().inverted());
 
     if (isSelected() && (opacity() == 100) && (m_BGMode!=TransparentMode)) {
-        painter->fillRect(rect(), brush);
+        painter->fillRect(r, brush);
     }
     else {
         if (m_BGMode == OpaqueMode) {
-            painter->setOpacity(qreal(m_opacity) / 100);
-            painter->fillRect(rect(), brush);
+            qreal o = (itemMode() & DesignMode) ? 0.5 : qreal(m_opacity) / 100;
+            painter->setOpacity(o);
+            painter->fillRect(r, brush);
         } else if (itemMode() & DesignMode){
             painter->setOpacity(0.1);
-            painter->fillRect(rect(), QBrush(QPixmap(":/report/images/empty")));
+            painter->fillRect(r, QBrush(QPixmap(":/report/images/empty")));
         }
     }
     painter->restore();

From 36f75b011b895f1c3629872c439a4baccb85b5d0 Mon Sep 17 00:00:00 2001
From: Arin  Alex <arin_a@bk.ru>
Date: Tue, 24 Apr 2018 15:51:06 +0300
Subject: [PATCH 20/20] Parent object changing has been fixed

---
 limereport/items/lrsubitemparentpropitem.cpp  |  3 +-
 limereport/objectsbrowser/lrobjectbrowser.cpp | 29 ++++++++++++++++---
 limereport/objectsbrowser/lrobjectbrowser.h   |  3 ++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/limereport/items/lrsubitemparentpropitem.cpp b/limereport/items/lrsubitemparentpropitem.cpp
index 1587bc9..b02cfa7 100644
--- a/limereport/items/lrsubitemparentpropitem.cpp
+++ b/limereport/items/lrsubitemparentpropitem.cpp
@@ -77,8 +77,8 @@ void LimeReport::ItemLocationPropItem::setPropertyEditorData(QWidget *propertyEd
 }
 
 void LimeReport::ItemLocationPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *model, const QModelIndex &index){
-    object()->setProperty(propertyName().toLatin1(),stringToLocation(qobject_cast<ComboBoxEditor*>(propertyEditor)->text()));
     model->setData(index,object()->property(propertyName().toLatin1()));
+    setValueToObject(propertyName(), propertyValue());
 }
 
 QString LimeReport::ItemLocationPropItem::locationToString(LimeReport::ItemDesignIntf::LocationType location) const{
@@ -92,6 +92,5 @@ LimeReport::ItemDesignIntf::LocationType LimeReport::ItemLocationPropItem::strin
 void LimeReport::ItemLocationPropItem::slotLocationChanged(const QString &text){
     if ( locationToString(object()->property(propertyName().toLatin1()).toInt())!=text){
       object()->setProperty(propertyName().toLatin1(),stringToLocation(text));
-      dynamic_cast<ComboBoxEditor*>(sender())->setTextValue(locationToString(object()->property(propertyName().toLatin1()).toInt()));
     }
 }
diff --git a/limereport/objectsbrowser/lrobjectbrowser.cpp b/limereport/objectsbrowser/lrobjectbrowser.cpp
index e657a81..a5ee464 100644
--- a/limereport/objectsbrowser/lrobjectbrowser.cpp
+++ b/limereport/objectsbrowser/lrobjectbrowser.cpp
@@ -35,7 +35,8 @@
 namespace LimeReport{
 
 ObjectBrowser::ObjectBrowser(QWidget *parent)
-    :QWidget(parent), m_report(NULL), m_mainWindow(NULL), m_changingItemSelection(false)
+    :QWidget(parent), m_report(NULL), m_mainWindow(NULL),
+      m_changingItemSelection(false), m_movingItem(false)
 {
     QVBoxLayout *layout = new QVBoxLayout(this);
     setLayout(layout);
@@ -86,6 +87,7 @@ void ObjectBrowser::slotClear()
 }
 
 void ObjectBrowser::fillNode(QTreeWidgetItem* parentNode, BaseDesignIntf* reportItem, BaseDesignIntf *ignoredItem){
+
     foreach (BaseDesignIntf* item, reportItem->childBaseItems()) {
         if (item != ignoredItem){
             ObjectBrowserNode* treeItem = new ObjectBrowserNode(parentNode);
@@ -93,11 +95,11 @@ void ObjectBrowser::fillNode(QTreeWidgetItem* parentNode, BaseDesignIntf* report
             treeItem->setObject(item);
             treeItem->setIcon(0,QIcon(":/items/"+extractClassName(item->metaObject()->className())));
             connect(item, SIGNAL(propertyObjectNameChanged(QString,QString)),
-                    this, SLOT(slotPropertyObjectNameChanged(QString,QString)));
+                    this, SLOT(slotPropertyObjectNameChanged(QString,QString)), Qt::UniqueConnection);
             ItemDesignIntf* i = dynamic_cast<ItemDesignIntf*>(item);
             if (i){
                 connect(i, SIGNAL(itemLocationChanged(BaseDesignIntf*,BaseDesignIntf*)),
-                        this, SLOT(slotItemParentChanged(BaseDesignIntf*,BaseDesignIntf*)));
+                        this, SLOT(slotItemParentChanged(BaseDesignIntf*,BaseDesignIntf*)), Qt::UniqueConnection);
             }
             m_itemsMap.insert(item,treeItem);
             parentNode->addChild(treeItem);
@@ -283,7 +285,9 @@ void ObjectBrowser::slotActivePageUpdated(LimeReport::PageDesignIntf *)
     buildTree();
 }
 
-void ObjectBrowser::slotItemParentChanged(BaseDesignIntf* item, BaseDesignIntf* parent)
+
+
+void ObjectBrowser::moveItemNode(BaseDesignIntf* item, BaseDesignIntf* parent)
 {
     if (m_itemsMap.contains(item) && m_itemsMap.contains(parent)){
         m_itemsMap.value(item)->parent()->removeChild(m_itemsMap.value(item));
@@ -293,7 +297,24 @@ void ObjectBrowser::slotItemParentChanged(BaseDesignIntf* item, BaseDesignIntf*
         item->setSelected(true);
         m_changingItemSelection = false;
     }
+}
 
+void ObjectBrowser::slotItemParentChanged(BaseDesignIntf* item, BaseDesignIntf* parent)
+{
+    if (!m_movingItem){
+        m_movingItem = true;
+        moveItemNode(item, parent);
+        m_movingItem = false;
+        foreach(QObject* di, m_defferedItems){
+            BaseDesignIntf* b = dynamic_cast<BaseDesignIntf*>(di);
+            if (b)
+                moveItemNode(b, parent);
+        }
+        m_defferedItems.clear();
+    } else {
+        if (!m_defferedItems.contains(item))
+            m_defferedItems.append(item);
+    }
 }
 
 void ObjectBrowserNode::setObject(QObject *value)
diff --git a/limereport/objectsbrowser/lrobjectbrowser.h b/limereport/objectsbrowser/lrobjectbrowser.h
index 4bdcb52..9d9482b 100644
--- a/limereport/objectsbrowser/lrobjectbrowser.h
+++ b/limereport/objectsbrowser/lrobjectbrowser.h
@@ -60,6 +60,7 @@ protected:
     void buildTree(BaseDesignIntf *ignoredItem = 0);
     void removeItem(BaseDesignIntf* item);
     void findAndRemove(QTreeWidgetItem *node, BaseDesignIntf *item);
+    void moveItemNode(BaseDesignIntf* item, BaseDesignIntf* parent);
 private slots:
 //    void slotObjectNameChanged(const QString& objectName);
     void slotPropertyObjectNameChanged(const QString& oldName, const QString& newName);
@@ -82,6 +83,8 @@ private:
     QTreeWidget*        m_treeView;
     QMap<QObject*, ObjectBrowserNode*> m_itemsMap;
     bool m_changingItemSelection;
+    bool m_movingItem;
+    QList<QObject*> m_defferedItems;
 };
 
 } //namespace LimeReport