Print preview dialog in all cases

mgrojo · mgrojo · commit 57f0175a1d45 · 2018-09-29T19:21:11.000+02:00
Add print preview dialogs to all the cases where we have printable objects.
Remaining were table browsers and Scintilla editors.
diff --git a/src/ExtendedScintilla.cpp b/src/ExtendedScintilla.cpp
@@ -13,7 +13,7 @@
 #include <QAction>
 #include <QMenu>
 #include <QPalette>
-#include <QPrintDialog>
+#include <QPrintPreviewDialog>
 #include <cmath>
 
 
@@ -246,11 +246,15 @@ void ExtendedScintilla::showContextMenu(const QPoint &pos)
 
 void ExtendedScintilla::openPrintDialog()
 {
-    QsciPrinter* printer = new QsciPrinter;
+    QsciPrinter printer;
+    QPrintPreviewDialog *dialog = new QPrintPreviewDialog(&printer);
 
-    QPrintDialog printDialog(printer, this);
-    if (printDialog.exec() == QDialog::Accepted)
-        printer->printRange(this);
+    connect(dialog, &QPrintPreviewDialog::paintRequested, [&](QPrinter *previewPrinter) {
+        QsciPrinter* sciPrinter = static_cast<QsciPrinter*>(previewPrinter);
+        sciPrinter->printRange(this);
+    });
 
-    delete printer;
+    dialog->exec();
+
+    delete dialog;
 }
diff --git a/src/ExtendedTableWidget.cpp b/src/ExtendedTableWidget.cpp
@@ -17,7 +17,7 @@
 #include <QDateTime>
 #include <QLineEdit>
 #include <QPrinter>
-#include <QPrintDialog>
+#include <QPrintPreviewDialog>
 #include <QTextDocument>
 #include <QCompleter>
 
@@ -874,12 +874,15 @@ void ExtendedTableWidget::openPrintDialog()
     document->setHtml(mimeData->html());
 
     QPrinter printer;
+    QPrintPreviewDialog *dialog = new QPrintPreviewDialog(&printer);
 
-    QPrintDialog *dialog = new QPrintDialog(&printer, nullptr);
-    if (dialog->exec() == QDialog::Accepted) {
-        document->print(&printer);
-    }
+    connect(dialog, &QPrintPreviewDialog::paintRequested, [&](QPrinter *previewPrinter) {
+        document->print(previewPrinter);
+    });
+
+    dialog->exec();
 
+    delete dialog;
     delete document;
     delete mimeData;
 }
