[Uml-devel] branches/KDE/4.7/kdesdk/umbrello/umbrello

[Ralf Habacker]

SVN commit 1266452 by habacker:

backported from trunk r1266451: For each printing a new QPrinter instance is used, which makes it impossible to reuse changed printer settings. This is fixed now

 M  +6 -6      uml.cpp  
 M  +2 -0      uml.h  


--- branches/KDE/4.7/kdesdk/umbrello/umbrello/uml.cpp #1266451:1266452
@@ -134,6 +134,8 @@
     m_doc = new UMLDoc();
     m_doc->init();
     m_hasBegunMacro = false;
+    m_printer = new QPrinter;
+    m_printer->setFullPage(true);
 
     readOptionState();
     initActions();
@@ -188,6 +190,7 @@
     delete m_copyTimer;
     delete m_refactoringAssist;
     delete m_pUndoStack;
+    delete m_printer;
 }
 
 /**
@@ -1170,12 +1173,9 @@
  */
 void UMLApp::slotPrintPreview()
 {
-    QPrinter printer;
-    printer.setFullPage(true);
-
     slotStatusMsg(i18n("Print Preview..."));
 
-    QPrintPreviewDialog *preview = new QPrintPreviewDialog(&printer,this);
+    QPrintPreviewDialog *preview = new QPrintPreviewDialog(m_printer,this);
     connect(preview, SIGNAL(paintRequested(QPrinter *)), this, SLOT(slotPrintPreviewPaintRequested(QPrinter *)));
     preview->exec();
 }
@@ -1202,11 +1202,11 @@
 
     DiagramPrintPage * selectPage = new DiagramPrintPage(0, m_doc);
     QPrintDialog *printDialog =
-                  KdePrint::createPrintDialog(&printer, QList<QWidget*>() << selectPage, this);
+                  KdePrint::createPrintDialog(m_printer, QList<QWidget*>() << selectPage, this);
     printDialog->setWindowTitle(i18n("Print %1", m_doc->url().prettyUrl()));
 
     if (printDialog->exec()) {
-        m_doc->print(&printer, selectPage);
+        m_doc->print(m_printer, selectPage);
     }
     delete printDialog;
     resetStatusMsg();
--- branches/KDE/4.7/kdesdk/umbrello/umbrello/uml.h #1266451:1266452
@@ -407,6 +407,8 @@
 
     bool m_hasBegunMacro;  ///< Macro creation flag.
 
+    QPrinter *m_printer;   ///< qprinter instance
+
 signals:
     void sigCutSuccessful();