eric: changeset 3048:83f86da6344e

--- a/Graphics/SvgDiagram.py	Mon Oct 21 19:25:12 2013 +0200
+++ b/Graphics/SvgDiagram.py	Sat Oct 26 17:37:39 2013 +0200
@@ -281,7 +281,9 @@
             printer.setPageOrder(QPrinter.FirstPageFirst)
         else:
             printer.setPageOrder(QPrinter.LastPageFirst)
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)

         printDialog = QPrintDialog(printer, self)
         if printDialog.exec_():
@@ -310,7 +312,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)

         preview = QPrintPreviewDialog(printer, self)
         preview.paintRequested[QPrinter].connect(self.__print)
--- a/Graphics/UMLGraphicsView.py	Mon Oct 21 19:25:12 2013 +0200
+++ b/Graphics/UMLGraphicsView.py	Sat Oct 26 17:37:39 2013 +0200
@@ -416,7 +416,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)

         printDialog = QPrintDialog(printer, self)
         if printDialog.exec_():
@@ -445,7 +447,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)

         preview = QPrintPreviewDialog(printer, self)
         preview.paintRequested[QPrinter].connect(self.__printPreviewPrint)
--- a/Helpviewer/HelpBrowserWV.py	Mon Oct 21 19:25:12 2013 +0200
+++ b/Helpviewer/HelpBrowserWV.py	Sat Oct 26 17:37:39 2013 +0200
@@ -2308,7 +2308,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)

         printDialog = QPrintDialog(printer, self)
         if printDialog.exec_() == QDialog.Accepted:
@@ -2344,7 +2346,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)

         preview = QPrintPreviewDialog(printer, self)
         preview.paintRequested.connect(self.__generatePrintPreviewClickedFrame)
@@ -2376,7 +2380,9 @@
             printer.setColorMode(QPrinter.Color)
         else:
             printer.setColorMode(QPrinter.GrayScale)
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         printer.setOutputFormat(QPrinter.PdfFormat)
         name = self.__clickedFrame.url().path().rsplit('/', 1)[-1]
         if name:
--- a/Helpviewer/HelpTabWidget.py	Mon Oct 21 19:25:12 2013 +0200
+++ b/Helpviewer/HelpTabWidget.py	Sat Oct 26 17:37:39 2013 +0200
@@ -513,7 +513,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)

         printDialog = QPrintDialog(printer, self)
         if printDialog.exec_() == QDialog.Accepted:
@@ -550,7 +552,9 @@
             printer.setColorMode(QPrinter.Color)
         else:
             printer.setColorMode(QPrinter.GrayScale)
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         printer.setOutputFormat(QPrinter.PdfFormat)
         name = frame.url().path().rsplit('/', 1)[-1]
         if name:
@@ -598,7 +602,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)

         self.__printPreviewBrowser = browser
         preview = QPrintPreviewDialog(printer, self)
--- a/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py	Mon Oct 21 19:25:12 2013 +0200
+++ b/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py	Sat Oct 26 17:37:39 2013 +0200
@@ -2,7 +2,7 @@

 # Resource object code
 #
-# Created: So. Okt 13 16:47:44 2013
+# Created: Sa. Okt 26 17:29:22 2013
 #      by: The Resource Compiler for PyQt (Qt v4.8.5)
 #
 # WARNING! All changes made in this file will be lost!
--- a/QScintilla/Printer.py	Mon Oct 21 19:25:12 2013 +0200
+++ b/QScintilla/Printer.py	Sat Oct 26 17:37:39 2013 +0200
@@ -42,7 +42,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        self.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         self.time = QTime.currentTime().toString(Qt.LocalDate)
         self.date = QDate.currentDate().toString(Qt.LocalDate)
         self.headerFont = Preferences.getPrinter("HeaderFont")
--- a/Tools/UIPreviewer.py	Mon Oct 21 19:25:12 2013 +0200
+++ b/Tools/UIPreviewer.py	Sat Oct 26 17:37:39 2013 +0200
@@ -518,7 +518,9 @@
         printer = QPrinter(QPrinter.HighResolution)
         printer.setFullPage(True)

-        printer.setPrinterName(settings.value("UIPreviewer/printername"))
+        printerName = Preferences.getPrinter("UIPreviewer/printername")
+        if printerName:
+            self.setPrinterName(printerName)
         printer.setPageSize(
             QPrinter.PageSize(int(settings.value("UIPreviewer/pagesize"))))
         printer.setPageOrder(
@@ -559,7 +561,9 @@
         printer = QPrinter(QPrinter.HighResolution)
         printer.setFullPage(True)

-        printer.setPrinterName(settings.value("UIPreviewer/printername"))
+        printerName = Preferences.getPrinter("UIPreviewer/printername")
+        if printerName:
+            self.setPrinterName(printerName)
         printer.setPageSize(
             QPrinter.PageSize(int(settings.value("UIPreviewer/pagesize"))))
         printer.setPageOrder(
Graphics/SvgDiagram.py		file \| annotate \| diff \| comparison \| revisions
Graphics/UMLGraphicsView.py		file \| annotate \| diff \| comparison \| revisions
Helpviewer/HelpBrowserWV.py		file \| annotate \| diff \| comparison \| revisions
Helpviewer/HelpTabWidget.py		file \| annotate \| diff \| comparison \| revisions
Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py		file \| annotate \| diff \| comparison \| revisions
QScintilla/Printer.py		file \| annotate \| diff \| comparison \| revisions
Tools/UIPreviewer.py		file \| annotate \| diff \| comparison \| revisions