Mercurial Repositories > eric / changeset
changeset
Corrected the print related code.
Thu, 19 Aug 2021 18:36:06 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 19 Aug 2021 18:36:06 +0200
- branch
- eric7
- changeset 8518
- 6a3eadfc3fb6
- parent 8517
- 639768825569
- child 8519
- fd4722a8f782
Corrected the print related code.
--- a/eric7/Graphics/PixmapDiagram.py Thu Aug 19 17:21:03 2021 +0200 +++ b/eric7/Graphics/PixmapDiagram.py Thu Aug 19 18:36:06 2021 +0200 @@ -9,7 +9,8 @@ from PyQt6.QtCore import Qt, QSize, QEvent from PyQt6.QtGui import ( - QPalette, QImage, QPixmap, QPainter, QFont, QColor, QAction + QPalette, QImage, QPixmap, QPainter, QFont, QColor, QAction, QMarginsF, + QPageLayout ) from PyQt6.QtWidgets import ( QLabel, QSizePolicy, QScrollArea, QMenu, QToolBar @@ -358,12 +359,12 @@ printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst) else: printer.setPageOrder(QPrinter.PageOrder.LastPageFirst) - printer.setPageMargins( + printer.setPageMargins(QMarginsF( Preferences.getPrinter("LeftMargin") * 10, Preferences.getPrinter("TopMargin") * 10, Preferences.getPrinter("RightMargin") * 10, - Preferences.getPrinter("BottomMargin") * 10, - QPrinter.Unit.Millimeter + Preferences.getPrinter("BottomMargin") * 10), + QPageLayout.Unit.Millimeter ) printer.setPrinterName(Preferences.getPrinter("PrinterName"))
--- a/eric7/Graphics/SvgDiagram.py Thu Aug 19 17:21:03 2021 +0200 +++ b/eric7/Graphics/SvgDiagram.py Thu Aug 19 18:36:06 2021 +0200 @@ -7,8 +7,8 @@ Module implementing a dialog showing a SVG graphic. """ -from PyQt6.QtCore import Qt, QSize, QEvent -from PyQt6.QtGui import QPalette, QPainter, QFont, QColor, QAction +from PyQt6.QtCore import Qt, QSize, QEvent, QMarginsF +from PyQt6.QtGui import QPalette, QPainter, QFont, QColor, QAction, QPageLayout from PyQt6.QtWidgets import QSizePolicy, QScrollArea, QMenu, QToolBar from PyQt6.QtPrintSupport import QPrinter, QPrintDialog from PyQt6.QtSvgWidgets import QSvgWidget @@ -323,12 +323,12 @@ printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst) else: printer.setPageOrder(QPrinter.PageOrder.LastPageFirst) - printer.setPageMargins( + printer.setPageMargins(QMarginsF( Preferences.getPrinter("LeftMargin") * 10, Preferences.getPrinter("TopMargin") * 10, Preferences.getPrinter("RightMargin") * 10, - Preferences.getPrinter("BottomMargin") * 10, - QPrinter.Unit.Millimeter + Preferences.getPrinter("BottomMargin") * 10), + QPageLayout.Unit.Millimeter ) printerName = Preferences.getPrinter("PrinterName") if printerName:
--- a/eric7/Graphics/UMLGraphicsView.py Thu Aug 19 17:21:03 2021 +0200 +++ b/eric7/Graphics/UMLGraphicsView.py Thu Aug 19 18:36:06 2021 +0200 @@ -8,9 +8,9 @@ """ from PyQt6.QtCore import ( - pyqtSignal, Qt, QSignalMapper, QFileInfo, QEvent, QRectF + pyqtSignal, Qt, QSignalMapper, QFileInfo, QEvent, QRectF, QMarginsF ) -from PyQt6.QtGui import QAction +from PyQt6.QtGui import QAction, QPageLayout from PyQt6.QtWidgets import QGraphicsView, QToolBar, QDialog from PyQt6.QtPrintSupport import QPrinter, QPrintDialog @@ -441,12 +441,12 @@ printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst) else: printer.setPageOrder(QPrinter.PageOrder.LastPageFirst) - printer.setPageMargins( + printer.setPageMargins(QMarginsF( Preferences.getPrinter("LeftMargin") * 10, Preferences.getPrinter("TopMargin") * 10, Preferences.getPrinter("RightMargin") * 10, - Preferences.getPrinter("BottomMargin") * 10, - QPrinter.Unit.Millimeter + Preferences.getPrinter("BottomMargin") * 10), + QPageLayout.Unit.Millimeter ) printerName = Preferences.getPrinter("PrinterName") if printerName: @@ -473,12 +473,12 @@ printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst) else: printer.setPageOrder(QPrinter.PageOrder.LastPageFirst) - printer.setPageMargins( + printer.setPageMargins(QMarginsF( Preferences.getPrinter("LeftMargin") * 10, Preferences.getPrinter("TopMargin") * 10, Preferences.getPrinter("RightMargin") * 10, - Preferences.getPrinter("BottomMargin") * 10, - QPrinter.Unit.Millimeter + Preferences.getPrinter("BottomMargin") * 10), + QPageLayout.Unit.Millimeter ) printerName = Preferences.getPrinter("PrinterName") if printerName:
--- a/eric7/QScintilla/Printer.py Thu Aug 19 17:21:03 2021 +0200 +++ b/eric7/QScintilla/Printer.py Thu Aug 19 18:36:06 2021 +0200 @@ -7,8 +7,8 @@ Module implementing the printer functionality. """ -from PyQt6.QtCore import QTime, QDate, Qt, QCoreApplication -from PyQt6.QtGui import QColor +from PyQt6.QtCore import QTime, QDate, Qt, QCoreApplication, QMarginsF +from PyQt6.QtGui import QColor, QPageLayout from PyQt6.QtPrintSupport import QPrinter from PyQt6.Qsci import QsciPrinter @@ -36,18 +36,18 @@ self.setPageOrder(QPrinter.PageOrder.FirstPageFirst) else: self.setPageOrder(QPrinter.PageOrder.LastPageFirst) - self.setPageMargins( + self.setPageMargins(QMarginsF( Preferences.getPrinter("LeftMargin") * 10, Preferences.getPrinter("TopMargin") * 10, Preferences.getPrinter("RightMargin") * 10, - Preferences.getPrinter("BottomMargin") * 10, - QPrinter.Unit.Millimeter + Preferences.getPrinter("BottomMargin") * 10), + QPageLayout.Unit.Millimeter ) printerName = Preferences.getPrinter("PrinterName") if printerName: self.setPrinterName(printerName) - self.time = QTime.currentTime().toString(Qt.DateFormat.LocalDate) - self.date = QDate.currentDate().toString(Qt.DateFormat.LocalDate) + self.time = QTime.currentTime().toString(Qt.DateFormat.RFC2822Date) + self.date = QDate.currentDate().toString(Qt.DateFormat.RFC2822Date) self.headerFont = Preferences.getPrinter("HeaderFont") def formatPage(self, painter, drawing, area, pagenr):
--- a/eric7/WebBrowser/WebBrowserTabWidget.py Thu Aug 19 17:21:03 2021 +0200 +++ b/eric7/WebBrowser/WebBrowserTabWidget.py Thu Aug 19 18:36:06 2021 +0200 @@ -9,8 +9,10 @@ import os -from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QFile, QFileDevice -from PyQt6.QtGui import QIcon, QPixmap, QPainter +from PyQt6.QtCore import ( + pyqtSignal, pyqtSlot, Qt, QUrl, QFile, QFileDevice, QMarginsF +) +from PyQt6.QtGui import QIcon, QPixmap, QPainter, QPageLayout from PyQt6.QtWidgets import ( QWidget, QHBoxLayout, QMenu, QToolButton, QDialog ) @@ -652,12 +654,12 @@ printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst) else: printer.setPageOrder(QPrinter.PageOrder.LastPageFirst) - printer.setPageMargins( + printer.setPageMargins(QMarginsF( Preferences.getPrinter("LeftMargin") * 10, Preferences.getPrinter("TopMargin") * 10, Preferences.getPrinter("RightMargin") * 10, - Preferences.getPrinter("BottomMargin") * 10, - QPrinter.Unit.Millimeter + Preferences.getPrinter("BottomMargin") * 10), + QPageLayout.Unit.Millimeter ) printerName = Preferences.getPrinter("PrinterName") if printerName: @@ -780,12 +782,12 @@ printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst) else: printer.setPageOrder(QPrinter.PageOrder.LastPageFirst) - printer.setPageMargins( + printer.setPageMargins(QMarginsF( Preferences.getPrinter("LeftMargin") * 10, Preferences.getPrinter("TopMargin") * 10, Preferences.getPrinter("RightMargin") * 10, - Preferences.getPrinter("BottomMargin") * 10, - QPrinter.Unit.Millimeter + Preferences.getPrinter("BottomMargin") * 10), + QPageLayout.Unit.Millimeter ) printerName = Preferences.getPrinter("PrinterName") if printerName:
