Mercurial Repositories > eric / file diff

--- a/eric6/Graphics/PixmapDiagram.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/PixmapDiagram.py	Tue Mar 02 17:17:09 2021 +0100
@@ -53,14 +53,14 @@
         
         self.pixmapLabel = QLabel()
         self.pixmapLabel.setObjectName("pixmapLabel")
-        self.pixmapLabel.setBackgroundRole(QPalette.Base)
+        self.pixmapLabel.setBackgroundRole(QPalette.ColorRole.Base)
         self.pixmapLabel.setSizePolicy(
-            QSizePolicy.Ignored, QSizePolicy.Ignored)
+            QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored)
         self.pixmapLabel.setScaledContents(True)
         
         self.pixmapView = QScrollArea()
         self.pixmapView.setObjectName("pixmapView")
-        self.pixmapView.setBackgroundRole(QPalette.Dark)
+        self.pixmapView.setBackgroundRole(QPalette.ColorRole.Dark)
         self.pixmapView.setWidget(self.pixmapLabel)
         
         self.setCentralWidget(self.pixmapView)
@@ -84,7 +84,7 @@
         self.__initContextMenu()
         self.__initToolBars()
         
-        self.grabGesture(Qt.PinchGesture)
+        self.grabGesture(Qt.GestureType.PinchGesture)
     
     def __initActions(self):
         """
@@ -115,7 +115,7 @@
         self.__menu.addAction(self.printPreviewAct)
         self.__menu.addAction(self.printAct)
         
-        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         self.customContextMenuRequested.connect(self.__showContextMenu)
         
     def __showContextMenu(self, coord):
@@ -139,8 +139,8 @@
         self.graphicsToolBar.addAction(self.printPreviewAct)
         self.graphicsToolBar.addAction(self.printAct)
         
-        self.addToolBar(Qt.TopToolBarArea, self.windowToolBar)
-        self.addToolBar(Qt.TopToolBarArea, self.graphicsToolBar)
+        self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.windowToolBar)
+        self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.graphicsToolBar)
         
     def __showPixmap(self, filename):
         """
@@ -185,7 +185,7 @@
         
         @param evt reference to the wheel event (QWheelEvent)
         """
-        if evt.modifiers() & Qt.ControlModifier:
+        if evt.modifiers() & Qt.KeyboardModifier.ControlModifier:
             delta = evt.angleDelta().y()
             if delta < 0:
                 self.__zoomOut()
@@ -203,7 +203,7 @@
         @param evt reference to the event (QEvent)
         @return flag indicating, if the event was handled (boolean)
         """
-        if evt.type() == QEvent.Gesture:
+        if evt.type() == QEvent.Type.Gesture:
             self.gestureEvent(evt)
             return True
         
@@ -215,11 +215,11 @@
         
         @param evt reference to the gesture event (QGestureEvent
         """
-        pinch = evt.gesture(Qt.PinchGesture)
+        pinch = evt.gesture(Qt.GestureType.PinchGesture)
         if pinch:
-            if pinch.state() == Qt.GestureStarted:
+            if pinch.state() == Qt.GestureState.GestureStarted:
                 pinch.setTotalScaleFactor(self.__zoom() / 100)
-            elif pinch.state() == Qt.GestureUpdated:
+            elif pinch.state() == Qt.GestureState.GestureUpdated:
                 self.__doZoom(int(pinch.totalScaleFactor() * 100))
             evt.accept()
     
@@ -306,16 +306,16 @@
         """
         Private slot called to print the diagram.
         """
-        printer = QPrinter(mode=QPrinter.ScreenResolution)
+        printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
         printer.setFullPage(True)
         if Preferences.getPrinter("ColorMode"):
-            printer.setColorMode(QPrinter.Color)
+            printer.setColorMode(QPrinter.ColorMode.Color)
         else:
-            printer.setColorMode(QPrinter.GrayScale)
+            printer.setColorMode(QPrinter.ColorMode.GrayScale)
         if Preferences.getPrinter("FirstPageFirst"):
-            printer.setPageOrder(QPrinter.FirstPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
         else:
-            printer.setPageOrder(QPrinter.LastPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
         printer.setPrinterName(Preferences.getPrinter("PrinterName"))
         
         printDialog = QPrintDialog(printer, self)
@@ -328,22 +328,22 @@
         """
         from PyQt5.QtPrintSupport import QPrintPreviewDialog
         
-        printer = QPrinter(mode=QPrinter.ScreenResolution)
+        printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
         printer.setFullPage(True)
         if Preferences.getPrinter("ColorMode"):
-            printer.setColorMode(QPrinter.Color)
+            printer.setColorMode(QPrinter.ColorMode.Color)
         else:
-            printer.setColorMode(QPrinter.GrayScale)
+            printer.setColorMode(QPrinter.ColorMode.GrayScale)
         if Preferences.getPrinter("FirstPageFirst"):
-            printer.setPageOrder(QPrinter.FirstPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
         else:
-            printer.setPageOrder(QPrinter.LastPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
         printer.setPageMargins(
             Preferences.getPrinter("LeftMargin") * 10,
             Preferences.getPrinter("TopMargin") * 10,
             Preferences.getPrinter("RightMargin") * 10,
             Preferences.getPrinter("BottomMargin") * 10,
-            QPrinter.Millimeter
+            QPrinter.Unit.Millimeter
         )
         printer.setPrinterName(Preferences.getPrinter("PrinterName"))
         
@@ -396,12 +396,12 @@
                          marginX + width, marginY + height + 2)
         painter.setFont(font)
         painter.drawText(marginX, marginY + height + 4, width,
-                         fontHeight, Qt.AlignRight, s)
+                         fontHeight, Qt.AlignmentFlag.AlignRight, s)
 
         # render the diagram
         size = self.pixmapLabel.pixmap().size()
         size.scale(QSize(width - 10, height - 10),  # 5 px inner margin
-                   Qt.KeepAspectRatio)
+                   Qt.AspectRatioMode.KeepAspectRatio)
         painter.setViewport(marginX + 5, marginY + 5,
                             size.width(), size.height())
         painter.setWindow(self.pixmapLabel.pixmap().rect())