Mercurial Repositories > eric / file diff

--- a/eric6/Graphics/SvgDiagram.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/SvgDiagram.py	Tue Mar 02 17:17:09 2021 +0100
@@ -51,12 +51,13 @@
         
         self.svgWidget = QSvgWidget()
         self.svgWidget.setObjectName("svgWidget")
-        self.svgWidget.setBackgroundRole(QPalette.Base)
-        self.svgWidget.setSizePolicy(QSizePolicy.Ignored, QSizePolicy.Ignored)
+        self.svgWidget.setBackgroundRole(QPalette.ColorRole.Base)
+        self.svgWidget.setSizePolicy(
+            QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored)
         
         self.svgView = QScrollArea()
         self.svgView.setObjectName("svgView")
-        self.svgView.setBackgroundRole(QPalette.Dark)
+        self.svgView.setBackgroundRole(QPalette.ColorRole.Dark)
         self.svgView.setWidget(self.svgWidget)
         
         self.setCentralWidget(self.svgView)
@@ -82,7 +83,7 @@
         self.__initContextMenu()
         self.__initToolBars()
         
-        self.grabGesture(Qt.PinchGesture)
+        self.grabGesture(Qt.GestureType.PinchGesture)
         
     def __initActions(self):
         """
@@ -113,7 +114,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):
@@ -137,8 +138,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 getDiagramName(self):
         """
@@ -154,7 +155,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()
@@ -172,7 +173,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
         
@@ -184,11 +185,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()
     
@@ -273,16 +274,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)
         printerName = Preferences.getPrinter("PrinterName")
         if printerName:
             printer.setPrinterName(printerName)
@@ -297,22 +298,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
         )
         printerName = Preferences.getPrinter("PrinterName")
         if printerName:
@@ -367,7 +368,7 @@
                          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
         painter.setViewport(marginX, marginY, width, height)