diff -r 27f636beebad -r 2c730d5fd177 eric6/QScintilla/Printer.py
--- a/eric6/QScintilla/Printer.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/QScintilla/Printer.py Tue Mar 02 17:17:09 2021 +0100
@@ -19,7 +19,7 @@
"""
Class implementing the QsciPrinter with a header.
"""
- def __init__(self, mode=QPrinter.ScreenResolution):
+ def __init__(self, mode=QPrinter.PrinterMode.ScreenResolution):
"""
Constructor
@@ -29,25 +29,25 @@
self.setMagnification(Preferences.getPrinter("Magnification"))
if Preferences.getPrinter("ColorMode"):
- self.setColorMode(QPrinter.Color)
+ self.setColorMode(QPrinter.ColorMode.Color)
else:
- self.setColorMode(QPrinter.GrayScale)
+ self.setColorMode(QPrinter.ColorMode.GrayScale)
if Preferences.getPrinter("FirstPageFirst"):
- self.setPageOrder(QPrinter.FirstPageFirst)
+ self.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
else:
- self.setPageOrder(QPrinter.LastPageFirst)
+ self.setPageOrder(QPrinter.PageOrder.LastPageFirst)
self.setPageMargins(
Preferences.getPrinter("LeftMargin") * 10,
Preferences.getPrinter("TopMargin") * 10,
Preferences.getPrinter("RightMargin") * 10,
Preferences.getPrinter("BottomMargin") * 10,
- QPrinter.Millimeter
+ QPrinter.Unit.Millimeter
)
printerName = Preferences.getPrinter("PrinterName")
if printerName:
self.setPrinterName(printerName)
- self.time = QTime.currentTime().toString(Qt.LocalDate)
- self.date = QDate.currentDate().toString(Qt.LocalDate)
+ self.time = QTime.currentTime().toString(Qt.DateFormat.LocalDate)
+ self.date = QDate.currentDate().toString(Qt.DateFormat.LocalDate)
self.headerFont = Preferences.getPrinter("HeaderFont")
def formatPage(self, painter, drawing, area, pagenr):
@@ -67,7 +67,7 @@
painter.save()
painter.setFont(self.headerFont) # set our header font
- painter.setPen(QColor(Qt.black)) # set color
+ painter.setPen(QColor(Qt.GlobalColor.black)) # set color
if drawing:
fm = painter.fontMetrics()
try:
