Mercurial Repositories > eric / file diff

--- a/eric6/Tools/UIPreviewer.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Tools/UIPreviewer.py	Tue Mar 02 17:17:09 2021 +0100
@@ -86,16 +86,16 @@
             self.styleCombo.setCurrentIndex(int(currentStyle))
         
         styleSpacer = QSpacerItem(
-            40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         self.styleLayout.addItem(styleSpacer)
         self.UIPreviewerLayout.addLayout(self.styleLayout)
 
         self.previewSV = QScrollArea(self.cw)
         self.previewSV.setObjectName("preview")
-        self.previewSV.setFrameShape(QFrame.NoFrame)
-        self.previewSV.setFrameShadow(QFrame.Plain)
+        self.previewSV.setFrameShape(QFrame.Shape.NoFrame)
+        self.previewSV.setFrameShadow(QFrame.Shadow.Plain)
         self.previewSV.setSizePolicy(
-            QSizePolicy.Expanding, QSizePolicy.Expanding)
+            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         self.UIPreviewerLayout.addWidget(self.previewSV)
 
         self.setCentralWidget(self.cw)
@@ -434,7 +434,7 @@
         @return flag indicating if event was filtered out
         """
         if obj == self.mainWidget:
-            if ev.type() == QEvent.Close:
+            if ev.type() == QEvent.Type.Close:
                 self.__handleCloseEvent()
             return True
         else:
@@ -514,7 +514,7 @@
             return
         
         settings = Preferences.Prefs.settings
-        printer = QPrinter(QPrinter.HighResolution)
+        printer = QPrinter(QPrinter.PrinterMode.HighResolution)
         printer.setFullPage(True)
         
         printerName = Preferences.getPrinter("UIPreviewer/printername")
@@ -530,7 +530,7 @@
             QPrinter.ColorMode(int(settings.value("UIPreviewer/colormode"))))
         
         printDialog = QPrintDialog(printer, self)
-        if printDialog.exec() == QDialog.Accepted:
+        if printDialog.exec() == QDialog.DialogCode.Accepted:
             self.statusBar().showMessage(self.tr("Printing the image..."))
             self.__print(printer)
             
@@ -557,7 +557,7 @@
             return
         
         settings = Preferences.Prefs.settings
-        printer = QPrinter(QPrinter.HighResolution)
+        printer = QPrinter(QPrinter.PrinterMode.HighResolution)
         printer.setFullPage(True)
         
         printerName = Preferences.getPrinter("UIPreviewer/printername")
@@ -587,7 +587,7 @@
         marginY = (printer.pageRect().y() - printer.paperRect().y()) // 2
 
         # double the margin on bottom of page
-        if printer.orientation() == QPrinter.Portrait:
+        if printer.orientation() == QPrinter.Orientation.Portrait:
             width = printer.width() - marginX * 2
             height = printer.height() - marginY * 3
         else:
@@ -596,7 +596,11 @@
             height = printer.height() - marginY * 2
         img = self.mainWidget.grab().toImage()
         self.__updateChildren(self.lastStyle)
-        p.drawImage(marginX, marginY,
-                    img.scaled(width, height,
-                               Qt.KeepAspectRatio, Qt.SmoothTransformation))
+        p.drawImage(
+            marginX, marginY, img.scaled(
+                width, height,
+                Qt.AspectRatioMode.KeepAspectRatio,
+                Qt.TransformationMode.SmoothTransformation
+            )
+        )
         p.end()