summaryrefslogtreecommitdiffstats
path: root/Plugins/Printing
diff options
context:
space:
mode:
Diffstat (limited to 'Plugins/Printing')
-rw-r--r--Plugins/Printing/Printing.pro6
-rw-r--r--Plugins/Printing/Printing_de.ts2
-rw-r--r--Plugins/Printing/Printing_es.ts2
-rw-r--r--Plugins/Printing/Printing_fr.ts2
-rw-r--r--Plugins/Printing/Printing_it.ts2
-rw-r--r--Plugins/Printing/Printing_pl.ts2
-rw-r--r--Plugins/Printing/Printing_pt_BR.ts2
-rw-r--r--Plugins/Printing/Printing_ru.ts2
-rw-r--r--Plugins/Printing/Printing_sk.ts2
-rw-r--r--Plugins/Printing/Printing_zh_CN.ts2
-rw-r--r--Plugins/Printing/printing.cpp9
-rw-r--r--Plugins/Printing/printing.h1
-rw-r--r--Plugins/Printing/printing.json2
-rw-r--r--Plugins/Printing/printing.qrc6
-rw-r--r--Plugins/Printing/printingexport.cpp8
-rw-r--r--Plugins/Printing/printingexport.h3
16 files changed, 27 insertions, 26 deletions
diff --git a/Plugins/Printing/Printing.pro b/Plugins/Printing/Printing.pro
index 5006d60..f0cc54e 100644
--- a/Plugins/Printing/Printing.pro
+++ b/Plugins/Printing/Printing.pro
@@ -35,10 +35,10 @@ RESOURCES += \
printing.qrc
-TRANSLATIONS += Printing_it.ts \
+TRANSLATIONS += Printing_de.ts \
+ Printing_it.ts \
Printing_zh_CN.ts \
Printing_sk.ts \
- Printing_de.ts \
Printing_ru.ts \
Printing_pt_BR.ts \
Printing_fr.ts \
@@ -57,3 +57,5 @@ TRANSLATIONS += Printing_it.ts \
+
+
diff --git a/Plugins/Printing/Printing_de.ts b/Plugins/Printing/Printing_de.ts
index cdf72f8..fb45beb 100644
--- a/Plugins/Printing/Printing_de.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
<message>
diff --git a/Plugins/Printing/Printing_es.ts b/Plugins/Printing/Printing_es.ts
index d76730d..cad9a2f 100644
--- a/Plugins/Printing/Printing_es.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
<message>
diff --git a/Plugins/Printing/Printing_fr.ts b/Plugins/Printing/Printing_fr.ts
index 9d86ad5..c851a95 100644
--- a/Plugins/Printing/Printing_fr.ts
+++ b/Plugins/Printing/Printing_fr.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
<context>
<name>Printing</name>
<message>
diff --git a/Plugins/Printing/Printing_it.ts b/Plugins/Printing/Printing_it.ts
index 1154473..0a21af2 100644
--- a/Plugins/Printing/Printing_it.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
<message>
diff --git a/Plugins/Printing/Printing_pl.ts b/Plugins/Printing/Printing_pl.ts
index b372ef9..b56a3ce 100644
--- a/Plugins/Printing/Printing_pl.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
<message>
diff --git a/Plugins/Printing/Printing_pt_BR.ts b/Plugins/Printing/Printing_pt_BR.ts
index c003b38..61016f0 100644
--- a/Plugins/Printing/Printing_pt_BR.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
<message>
diff --git a/Plugins/Printing/Printing_ru.ts b/Plugins/Printing/Printing_ru.ts
index 6a63c83..642f912 100644
--- a/Plugins/Printing/Printing_ru.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
<message>
diff --git a/Plugins/Printing/Printing_sk.ts b/Plugins/Printing/Printing_sk.ts
index 4e35c9d..8dce4a8 100644
--- a/Plugins/Printing/Printing_sk.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
<message>
diff --git a/Plugins/Printing/Printing_zh_CN.ts b/Plugins/Printing/Printing_zh_CN.ts
index a9449f5..e3a7a2d 100644
--- a/Plugins/Printing/Printing_zh_CN.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
<message>
diff --git a/Plugins/Printing/printing.cpp b/Plugins/Printing/printing.cpp
index 3591d4b..c24fc89 100644
--- a/Plugins/Printing/printing.cpp
+++ b/Plugins/Printing/printing.cpp
@@ -57,7 +57,6 @@ void Printing::deinit()
safe_delete(printDataAction);
safe_delete(separatorAction);
safe_delete(printQueryAction);
- safe_delete(printDialog);
Q_CLEANUP_RESOURCE(printing);
}
@@ -76,8 +75,7 @@ void Printing::dataPrintRequested(ExtActionContainer* actionContainer)
return;
}
- safe_delete(printDialog);
- printDialog = new QPrintDialog(MAINWINDOW);
+ QPrintDialog* printDialog = new QPrintDialog(MAINWINDOW);
if (printDialog->exec() != QDialog::Accepted)
return;
@@ -90,6 +88,7 @@ void Printing::dataPrintRequested(ExtActionContainer* actionContainer)
ExportWorker* worker = new ExportWorker(printingExport, printingConfig, nullptr);
worker->prepareExportQueryResults(db, query);
+ connect(worker, SIGNAL(finished(bool,QIODevice*)), printDialog, SLOT(deleteLater()));
QThreadPool::globalInstance()->start(worker);
}
@@ -102,8 +101,7 @@ void Printing::queryPrintRequested(ExtActionContainer* actionContainer)
return;
}
- safe_delete(printDialog);
- printDialog = new QPrintDialog(MAINWINDOW);
+ QPrintDialog* printDialog = new QPrintDialog(MAINWINDOW);
if (printDialog->exec() != QDialog::Accepted)
return;
@@ -111,4 +109,5 @@ void Printing::queryPrintRequested(ExtActionContainer* actionContainer)
QTextDocument* doc = editor->getEditor()->document();
doc->print(printDialog->printer());
+ printDialog->deleteLater();
}
diff --git a/Plugins/Printing/printing.h b/Plugins/Printing/printing.h
index 78463a9..7be98f4 100644
--- a/Plugins/Printing/printing.h
+++ b/Plugins/Printing/printing.h
@@ -26,7 +26,6 @@ class PRINTINGSHARED_EXPORT Printing : public GenericPlugin, public GeneralPurpo
ExtActionPrototype* printQueryAction = nullptr;
PrintingExport* printingExport = nullptr;
ExportManager::StandardExportConfig* printingConfig = nullptr;
- QPrintDialog* printDialog = nullptr;
private slots:
void dataPrintRequested(ExtActionContainer* actionContainer);
diff --git a/Plugins/Printing/printing.json b/Plugins/Printing/printing.json
index 5313186..e0972c3 100644
--- a/Plugins/Printing/printing.json
+++ b/Plugins/Printing/printing.json
@@ -2,7 +2,7 @@
"type": "GeneralPurposePlugin",
"title": "Printing",
"description": "Provides printing support.",
- "version": 10002,
+ "version": 10003,
"author": "SalSoft",
"gui": true,
"dependencies": "PdfExport"
diff --git a/Plugins/Printing/printing.qrc b/Plugins/Printing/printing.qrc
index c4be754..c09851f 100644
--- a/Plugins/Printing/printing.qrc
+++ b/Plugins/Printing/printing.qrc
@@ -3,6 +3,9 @@
<file>printer.png</file>
</qresource>
<qresource prefix="/msg">
+ <file>Printing_de.qm</file>
+
+
<file>Printing_pl.qm</file>
<file>Printing_ru.qm</file>
<file>Printing_fr.qm</file>
@@ -10,3 +13,6 @@
<file>Printing_zh_CN.qm</file>
</qresource>
</RCC>
+
+
+
diff --git a/Plugins/Printing/printingexport.cpp b/Plugins/Printing/printingexport.cpp
index c2d7fd0..4f6b669 100644
--- a/Plugins/Printing/printingexport.cpp
+++ b/Plugins/Printing/printingexport.cpp
@@ -3,14 +3,10 @@
#include "mainwindow.h"
#include "services/notifymanager.h"
-QPagedPaintDevice* PrintingExport::createPaintDevice(const QString& documentTitle)
+QPagedPaintDevice* PrintingExport::createPaintDevice(const QString& documentTitle, bool& takeOwnership)
{
UNUSED(documentTitle);
- return paintDevice;
-}
-
-QPagedPaintDevice* PrintingExport::getPaintDevice() const
-{
+ takeOwnership = false;
return paintDevice;
}
diff --git a/Plugins/Printing/printingexport.h b/Plugins/Printing/printingexport.h
index fc6172d..e62ceb6 100644
--- a/Plugins/Printing/printingexport.h
+++ b/Plugins/Printing/printingexport.h
@@ -15,11 +15,10 @@ class PRINTINGSHARED_EXPORT PrintingExport : public PdfExport
ExportManager::StandardConfigFlags standardOptionsToEnable() const;
ExportManager::ExportModes getSupportedModes() const;
- QPagedPaintDevice* getPaintDevice() const;
void setPaintDevice(QPagedPaintDevice* value);
protected:
- QPagedPaintDevice* createPaintDevice(const QString& documentTitle);
+ QPagedPaintDevice* createPaintDevice(const QString& documentTitle, bool& takeOwnership);
private:
QPagedPaintDevice* paintDevice = nullptr;
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-26 23:06:45 +0000