Mercurial Repositories > eric / file diff

diff -r e01ae92db699 -r 31965986ecd1 eric6/IconEditor/IconEditorWindow.py
--- a/eric6/IconEditor/IconEditorWindow.py	Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/IconEditor/IconEditorWindow.py	Sun Mar 28 15:00:11 2021 +0200
@@ -69,7 +69,8 @@
             self.__editor = IconEditorGrid()
             self.__scrollArea = QScrollArea()
             self.__scrollArea.setWidget(self.__editor)
-            self.__scrollArea.viewport().setBackgroundRole(QPalette.Dark)
+            self.__scrollArea.viewport().setBackgroundRole(
+                QPalette.ColorRole.Dark)
             self.__scrollArea.viewport().setAutoFillBackground(True)
             self.setCentralWidget(self.__scrollArea)
             
@@ -115,7 +116,7 @@
             self.__lastOpenPath = ""
             self.__lastSavePath = ""
             
-            self.grabGesture(Qt.PinchGesture)
+            self.grabGesture(Qt.GestureType.PinchGesture)
     
     def __initFileFilters(self):
         """
@@ -557,7 +558,11 @@
         Private method to create the View actions.
         """
         self.esm = QSignalMapper(self)
-        self.esm.mapped[int].connect(self.__editor.setTool)
+        try:
+            self.esm.mappedInt.connect(self.__editor.setTool)
+        except AttributeError:
+            # pre Qt 5.15
+            self.esm.mapped[int].connect(self.__editor.setTool)
         
         self.drawingActGrp = createActionGroup(self)
         self.drawingActGrp.setExclusive(True)
@@ -994,11 +999,17 @@
         self.__paletteDock = QDockWidget(self)
         self.__paletteDock.setObjectName("paletteDock")
         self.__paletteDock.setFeatures(
-            QDockWidget.DockWidgetFeatures(QDockWidget.AllDockWidgetFeatures))
+            QDockWidget.DockWidgetFeatures(
+                QDockWidget.DockWidgetFeature.DockWidgetClosable |
+                QDockWidget.DockWidgetFeature.DockWidgetMovable |
+                QDockWidget.DockWidgetFeature.DockWidgetFloatable
+            )
+        )
         self.__paletteDock.setWindowTitle("Palette")
         self.__palette = IconEditorPalette()
         self.__paletteDock.setWidget(self.__palette)
-        self.addDockWidget(Qt.RightDockWidgetArea, self.__paletteDock)
+        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea,
+                           self.__paletteDock)
     
     def closeEvent(self, evt):
         """
@@ -1351,7 +1362,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()
@@ -1369,7 +1380,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
         
@@ -1381,11 +1392,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.__editor.zoomFactor() / 100.0)
-            elif pinch.state() == Qt.GestureUpdated:
+            elif pinch.state() == Qt.GestureState.GestureUpdated:
                 self.__editor.setZoomFactor(
                     int(pinch.totalScaleFactor() * 100))
                 self.__updateZoom()