Imported Upstream version 3.1.1+dfsg1upstream/3.1.1+dfsg1

15 files changed, 48 insertions, 34 deletions

diff --git a/Plugins/PdfExport/PdfExport.pro b/Plugins/PdfExport/PdfExport.pro
index 95848c1..d0818b3 100644
--- a/Plugins/PdfExport/PdfExport.pro
+++ b/Plugins/PdfExport/PdfExport.pro
@@ -26,10 +26,10 @@ RESOURCES += \
     pdfexport.qrc
 
 
-TRANSLATIONS += PdfExport_it.ts \
+TRANSLATIONS += PdfExport_de.ts \
+		PdfExport_it.ts \
 		PdfExport_zh_CN.ts \
 		PdfExport_sk.ts \
-		PdfExport_de.ts \
 		PdfExport_ru.ts \
 		PdfExport_pt_BR.ts \
 		PdfExport_fr.ts \
@@ -48,3 +48,5 @@ TRANSLATIONS += PdfExport_it.ts \
 
 
 
+
+
diff --git a/Plugins/PdfExport/PdfExport_de.ts b/Plugins/PdfExport/PdfExport_de.ts
index 9f95b41..7498c43 100644
--- a/Plugins/PdfExport/PdfExport_de.ts
+++ b/Plugins/PdfExport/PdfExport_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_es.ts b/Plugins/PdfExport/PdfExport_es.ts
index 924d991..745a227 100644
--- a/Plugins/PdfExport/PdfExport_es.ts
+++ b/Plugins/PdfExport/PdfExport_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_fr.qm b/Plugins/PdfExport/PdfExport_fr.qm
index 8e38561..4d1bbc6 100644
--- a/Plugins/PdfExport/PdfExport_fr.qm
+++ b/Plugins/PdfExport/PdfExport_fr.qm
diff --git a/Plugins/PdfExport/PdfExport_fr.ts b/Plugins/PdfExport/PdfExport_fr.ts
index 064c5a1..e9c628f 100644
--- a/Plugins/PdfExport/PdfExport_fr.ts
+++ b/Plugins/PdfExport/PdfExport_fr.ts
@@ -17,13 +17,13 @@
         <location filename="pdfexport.cpp" line="89"/>
         <location filename="pdfexport.cpp" line="143"/>
         <source>Exported table: %1</source>
-        <translation>Table exportée: %1</translation>
+        <translation>Table exportée : %1</translation>
     </message>
     <message>
         <location filename="pdfexport.cpp" line="92"/>
         <location filename="pdfexport.cpp" line="158"/>
         <source>Table: %1</source>
-        <translation>Table: %1</translation>
+        <translation>Table : %1</translation>
     </message>
     <message>
         <location filename="pdfexport.cpp" line="94"/>
@@ -49,12 +49,12 @@
     <message>
         <location filename="pdfexport.cpp" line="214"/>
         <source>Exported database: %1</source>
-        <translation>Base de données exportée: %1</translation>
+        <translation>Base de données exportée : %1</translation>
     </message>
     <message>
         <location filename="pdfexport.cpp" line="222"/>
         <source>Index: %1</source>
-        <translation>Index: %1</translation>
+        <translation>Index : %1</translation>
     </message>
     <message>
         <location filename="pdfexport.cpp" line="224"/>
@@ -71,7 +71,7 @@
     <message>
         <location filename="pdfexport.cpp" line="227"/>
         <source>Indexed table</source>
-        <translation>Table indexées</translation>
+        <translation>Table indexée</translation>
     </message>
     <message>
         <location filename="pdfexport.cpp" line="228"/>
@@ -101,12 +101,12 @@
     <message>
         <location filename="pdfexport.cpp" line="246"/>
         <source>Partial index condition</source>
-        <translation>Condition de l&rsquo;index partiel</translation>
+        <translation>Condition de l’index partiel</translation>
     </message>
     <message>
         <location filename="pdfexport.cpp" line="260"/>
         <source>Trigger: %1</source>
-        <translation>Déchencheur: %1</translation>
+        <translation>Déchencheur : %1</translation>
     </message>
     <message>
         <location filename="pdfexport.cpp" line="262"/>
@@ -153,12 +153,12 @@
     <message>
         <location filename="pdfexport.cpp" line="296"/>
         <source>View: %1</source>
-        <translation>Vue: %1</translation>
+        <translation>Vue : %1</translation>
     </message>
     <message>
         <location filename="pdfexport.cpp" line="297"/>
         <source>Query:</source>
-        <translation>Requête:</translation>
+        <translation>Requête :</translation>
     </message>
     <message>
         <location filename="pdfexport.cpp" line="649"/>
@@ -176,27 +176,27 @@
     <message>
         <location filename="pdfexport.ui" line="36"/>
         <source>Page size:</source>
-        <translation>Dimension page:</translation>
+        <translation>Dimension page :</translation>
     </message>
     <message>
         <location filename="pdfexport.ui" line="63"/>
         <source>Right margin:</source>
-        <translation>Marge droite:</translation>
+        <translation>Marge droite :</translation>
     </message>
     <message>
         <location filename="pdfexport.ui" line="70"/>
         <source>Left margin:</source>
-        <translation>Marge gauche:</translation>
+        <translation>Marge gauche :</translation>
     </message>
     <message>
         <location filename="pdfexport.ui" line="77"/>
         <source>Cell padding:</source>
-        <translation>Remplissage cellule:</translation>
+        <translation>Remplissage cellule :</translation>
     </message>
     <message>
         <location filename="pdfexport.ui" line="84"/>
         <source>Limit characters in single cell:</source>
-        <translation>Limite de caractères dans une cellule unique:</translation>
+        <translation>Limite de caractères dans une cellule unique :</translation>
     </message>
     <message>
         <location filename="pdfexport.ui" line="91"/>
@@ -210,12 +210,12 @@
     <message>
         <location filename="pdfexport.ui" line="139"/>
         <source>Bottom margin:</source>
-        <translation>Marge inférieure:</translation>
+        <translation>Marge inférieure :</translation>
     </message>
     <message>
         <location filename="pdfexport.ui" line="163"/>
         <source>Top margin:</source>
-        <translation>Marge supérieure:</translation>
+        <translation>Marge supérieure :</translation>
     </message>
     <message>
         <location filename="pdfexport.ui" line="183"/>
@@ -230,12 +230,12 @@
     <message>
         <location filename="pdfexport.ui" line="212"/>
         <source>Headers background:</source>
-        <translation>Arrière plan des en-têtes:</translation>
+        <translation>Arrière plan des en-têtes :</translation>
     </message>
     <message>
         <location filename="pdfexport.ui" line="235"/>
         <source>NULL value color:</source>
-        <translation>Couleur pour valeur NULL:</translation>
+        <translation>Couleur pour valeur NULL :</translation>
     </message>
     <message>
         <location filename="pdfexport.ui" line="261"/>
diff --git a/Plugins/PdfExport/PdfExport_it.ts b/Plugins/PdfExport/PdfExport_it.ts
index 8288875..913432b 100644
--- a/Plugins/PdfExport/PdfExport_it.ts
+++ b/Plugins/PdfExport/PdfExport_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="it_IT">
+<TS version="2.1" language="it_IT">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_pl.ts b/Plugins/PdfExport/PdfExport_pl.ts
index 5ac637d..e806995 100644
--- a/Plugins/PdfExport/PdfExport_pl.ts
+++ b/Plugins/PdfExport/PdfExport_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl_PL">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_pt_BR.ts b/Plugins/PdfExport/PdfExport_pt_BR.ts
index 76e9fff..59df275 100644
--- a/Plugins/PdfExport/PdfExport_pt_BR.ts
+++ b/Plugins/PdfExport/PdfExport_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<TS version="2.1" language="pt_BR">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_ru.ts b/Plugins/PdfExport/PdfExport_ru.ts
index 9f14f09..715a6ff 100644
--- a/Plugins/PdfExport/PdfExport_ru.ts
+++ b/Plugins/PdfExport/PdfExport_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_sk.ts b/Plugins/PdfExport/PdfExport_sk.ts
index 9a8f3e2..6684b8b 100644
--- a/Plugins/PdfExport/PdfExport_sk.ts
+++ b/Plugins/PdfExport/PdfExport_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sk_SK">
+<TS version="2.1" language="sk_SK">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_zh_CN.ts b/Plugins/PdfExport/PdfExport_zh_CN.ts
index ec250b9..b570ede 100644
--- a/Plugins/PdfExport/PdfExport_zh_CN.ts
+++ b/Plugins/PdfExport/PdfExport_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_CN">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/pdfexport.cpp b/Plugins/PdfExport/pdfexport.cpp
index 38389a1..f47f5a6 100644
--- a/Plugins/PdfExport/pdfexport.cpp
+++ b/Plugins/PdfExport/pdfexport.cpp
@@ -21,11 +21,12 @@ void PdfExport::deinit()
     safe_delete(textOption);
 }
 
-QPagedPaintDevice* PdfExport::createPaintDevice(const QString& documentTitle)
+QPagedPaintDevice* PdfExport::createPaintDevice(const QString& documentTitle, bool &takeOwnership)
 {
     QPdfWriter* pdfWriter = new QPdfWriter(output);
     pdfWriter->setTitle(documentTitle);
     pdfWriter->setCreator(tr("SQLiteStudio v%1").arg(SQLITESTUDIO->getVersionString()));
+    takeOwnership = true;
     return pdfWriter;
 }
 
@@ -309,8 +310,11 @@ bool PdfExport::isBinaryData() const
 bool PdfExport::beginDoc(const QString& title)
 {
     safe_delete(painter);
-    safe_delete(pagedWriter);
-    pagedWriter = createPaintDevice(title);
+
+    if (takeDeviceOwnership)
+        safe_delete(pagedWriter);
+
+    pagedWriter = createPaintDevice(title, takeDeviceOwnership);
     if (!pagedWriter)
         return false;
 
@@ -330,7 +334,8 @@ void PdfExport::endDoc()
 void PdfExport::cleanupAfterExport()
 {
     safe_delete(painter);
-    safe_delete(pagedWriter);
+    if (takeDeviceOwnership)
+        safe_delete(pagedWriter);
 }
 
 void PdfExport::setupConfig()
diff --git a/Plugins/PdfExport/pdfexport.h b/Plugins/PdfExport/pdfexport.h
index 9c7cc62..54239ff 100644
--- a/Plugins/PdfExport/pdfexport.h
+++ b/Plugins/PdfExport/pdfexport.h
@@ -72,7 +72,7 @@ class PDFEXPORTSHARED_EXPORT PdfExport : public GenericExportPlugin
         void deinit();
 
     protected:
-        virtual QPagedPaintDevice* createPaintDevice(const QString& documentTitle);
+        virtual QPagedPaintDevice* createPaintDevice(const QString& documentTitle, bool& takeOwnership);
 
         int lineWidth = 15;
 
@@ -182,6 +182,7 @@ class PDFEXPORTSHARED_EXPORT PdfExport : public GenericExportPlugin
 
         CFG_LOCAL(PdfExportConfig, cfg)
         QPagedPaintDevice* pagedWriter = nullptr;
+        bool takeDeviceOwnership = true;
         QPainter* painter = nullptr;
         QTextOption* textOption = nullptr;
         QFont stdFont;
diff --git a/Plugins/PdfExport/pdfexport.json b/Plugins/PdfExport/pdfexport.json
index 9f64d2f..a2ad9c7 100644
--- a/Plugins/PdfExport/pdfexport.json
+++ b/Plugins/PdfExport/pdfexport.json
@@ -2,7 +2,7 @@
     "type":         "ExportPlugin",
     "title":        "PDF export",
     "description":  "Provides PDF format for exporting.",
-    "version":      10001,
+    "version":      10002,
     "author":       "SalSoft",
     "gui":          true
 }
diff --git a/Plugins/PdfExport/pdfexport.qrc b/Plugins/PdfExport/pdfexport.qrc
index 1e079fd..e425878 100644
--- a/Plugins/PdfExport/pdfexport.qrc
+++ b/Plugins/PdfExport/pdfexport.qrc
@@ -3,6 +3,9 @@
         <file>pdfexport.ui</file>
     </qresource>
     <qresource prefix="/msg">
+        <file>PdfExport_de.qm</file>
+
+
         <file>PdfExport_pl.qm</file>
         <file>PdfExport_ru.qm</file>
         <file>PdfExport_fr.qm</file>
@@ -10,3 +13,6 @@
         <file>PdfExport_zh_CN.qm</file>
     </qresource>
 </RCC>
+
+
+