Mercurial Repositories > eric / changeset

changeset

Fixed issues setting the printer margins correctly. 5_1_x

Fri, 01 Jul 2011 19:46:37 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 01 Jul 2011 19:46:37 +0200
branch
5_1_x
changeset 1156
48999111929c
parent 1154
efa4ce3d50d2
child 1159
43d3b178ae5b

Fixed issues setting the printer margins correctly.
(transplanted from 4cbef040f07e114db3746343271cc3a522f8ca77)

Graphics/PixmapDiagram.py file | annotate | diff | comparison | revisions
Graphics/SvgDiagram.py file | annotate | diff | comparison | revisions
Graphics/UMLGraphicsView.py file | annotate | diff | comparison | revisions
Helpviewer/HelpTabWidget.py file | annotate | diff | comparison | revisions
QScintilla/Printer.py file | annotate | diff | comparison | revisions 
--- a/Graphics/PixmapDiagram.py	Thu Jun 30 08:24:39 2011 +0200
+++ b/Graphics/PixmapDiagram.py	Fri Jul 01 19:46:37 2011 +0200
@@ -273,6 +273,13 @@
             printer.setPageOrder(QPrinter.FirstPageFirst)
         else:
             printer.setPageOrder(QPrinter.LastPageFirst)
+        printer.setPageMargins(
+            Preferences.getPrinter("LeftMargin") * 10,
+            Preferences.getPrinter("TopMargin") * 10,
+            Preferences.getPrinter("RightMargin") * 10,
+            Preferences.getPrinter("BottomMargin") * 10,
+            QPrinter.Millimeter
+        )
         printer.setPrinterName(Preferences.getPrinter("PrinterName"))
         
         preview = QPrintPreviewDialog(printer, self)
--- a/Graphics/SvgDiagram.py	Thu Jun 30 08:24:39 2011 +0200
+++ b/Graphics/SvgDiagram.py	Fri Jul 01 19:46:37 2011 +0200
@@ -245,6 +245,13 @@
             printer.setPageOrder(QPrinter.FirstPageFirst)
         else:
             printer.setPageOrder(QPrinter.LastPageFirst)
+        printer.setPageMargins(
+            Preferences.getPrinter("LeftMargin") * 10,
+            Preferences.getPrinter("TopMargin") * 10,
+            Preferences.getPrinter("RightMargin") * 10,
+            Preferences.getPrinter("BottomMargin") * 10,
+            QPrinter.Millimeter
+        )
         printer.setPrinterName(Preferences.getPrinter("PrinterName"))
         
         preview = QPrintPreviewDialog(printer, self)
--- a/Graphics/UMLGraphicsView.py	Thu Jun 30 08:24:39 2011 +0200
+++ b/Graphics/UMLGraphicsView.py	Fri Jul 01 19:46:37 2011 +0200
@@ -376,6 +376,13 @@
             printer.setPageOrder(QPrinter.FirstPageFirst)
         else:
             printer.setPageOrder(QPrinter.LastPageFirst)
+        printer.setPageMargins(
+            Preferences.getPrinter("LeftMargin") * 10,
+            Preferences.getPrinter("TopMargin") * 10,
+            Preferences.getPrinter("RightMargin") * 10,
+            Preferences.getPrinter("BottomMargin") * 10,
+            QPrinter.Millimeter
+        )
         printer.setPrinterName(Preferences.getPrinter("PrinterName"))
         
         printDialog = QPrintDialog(printer, self)
@@ -398,6 +405,13 @@
             printer.setPageOrder(QPrinter.FirstPageFirst)
         else:
             printer.setPageOrder(QPrinter.LastPageFirst)
+        printer.setPageMargins(
+            Preferences.getPrinter("LeftMargin") * 10,
+            Preferences.getPrinter("TopMargin") * 10,
+            Preferences.getPrinter("RightMargin") * 10,
+            Preferences.getPrinter("BottomMargin") * 10,
+            QPrinter.Millimeter
+        )
         printer.setPrinterName(Preferences.getPrinter("PrinterName"))
         
         preview = QPrintPreviewDialog(printer, self)
--- a/Helpviewer/HelpTabWidget.py	Thu Jun 30 08:24:39 2011 +0200
+++ b/Helpviewer/HelpTabWidget.py	Fri Jul 01 19:46:37 2011 +0200
@@ -400,6 +400,13 @@
             printer.setPageOrder(QPrinter.FirstPageFirst)
         else:
             printer.setPageOrder(QPrinter.LastPageFirst)
+        printer.setPageMargins(
+            Preferences.getPrinter("LeftMargin") * 10,
+            Preferences.getPrinter("TopMargin") * 10,
+            Preferences.getPrinter("RightMargin") * 10,
+            Preferences.getPrinter("BottomMargin") * 10,
+            QPrinter.Millimeter
+        )
         printer.setPrinterName(Preferences.getPrinter("PrinterName"))
         
         printDialog = QPrintDialog(printer, self)
@@ -474,6 +481,13 @@
             printer.setPageOrder(QPrinter.FirstPageFirst)
         else:
             printer.setPageOrder(QPrinter.LastPageFirst)
+        printer.setPageMargins(
+            Preferences.getPrinter("LeftMargin") * 10,
+            Preferences.getPrinter("TopMargin") * 10,
+            Preferences.getPrinter("RightMargin") * 10,
+            Preferences.getPrinter("BottomMargin") * 10,
+            QPrinter.Millimeter
+        )
         printer.setPrinterName(Preferences.getPrinter("PrinterName"))
         
         self.__printPreviewBrowser = browser
--- a/QScintilla/Printer.py	Thu Jun 30 08:24:39 2011 +0200
+++ b/QScintilla/Printer.py	Fri Jul 01 19:46:37 2011 +0200
@@ -34,6 +34,13 @@
             self.setPageOrder(QPrinter.FirstPageFirst)
         else:
             self.setPageOrder(QPrinter.LastPageFirst)
+        self.setPageMargins(
+            Preferences.getPrinter("LeftMargin") * 10,
+            Preferences.getPrinter("TopMargin") * 10,
+            Preferences.getPrinter("RightMargin") * 10,
+            Preferences.getPrinter("BottomMargin") * 10,
+            QPrinter.Millimeter
+        )
         self.setPrinterName(Preferences.getPrinter("PrinterName"))
         self.time = QTime.currentTime().toString(Qt.LocalDate)
         self.date = QDate.currentDate().toString(Qt.LocalDate)

Mercurial Repository: eric

eric ide

mercurial