Mercurial Repositories > eric / file diff

--- a/eric6/Utilities/MouseUtilities.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Utilities/MouseUtilities.py	Tue Mar 02 17:17:09 2021 +0100
@@ -13,42 +13,46 @@
 
 if Globals.isMacPlatform():
     __modifier2String = {
-        Qt.ShiftModifier: QCoreApplication.translate(
+        Qt.KeyboardModifier.ShiftModifier: QCoreApplication.translate(
             "MouseUtilities", "Shift"),
-        Qt.AltModifier: QCoreApplication.translate(
+        Qt.KeyboardModifier.AltModifier: QCoreApplication.translate(
             "MouseUtilities", "Alt"),
-        Qt.ControlModifier: QCoreApplication.translate(
+        Qt.KeyboardModifier.ControlModifier: QCoreApplication.translate(
             "MouseUtilities", "Cmd"),
-        Qt.MetaModifier: QCoreApplication.translate(
+        Qt.KeyboardModifier.MetaModifier: QCoreApplication.translate(
             "MouseUtilities", "Ctrl"),
     }
-    __modifierOrder = [Qt.MetaModifier, Qt.AltModifier, Qt.ShiftModifier,
-                       Qt.ControlModifier]
+    __modifierOrder = [Qt.KeyboardModifier.MetaModifier,
+                       Qt.KeyboardModifier.AltModifier,
+                       Qt.KeyboardModifier.ShiftModifier,
+                       Qt.KeyboardModifier.ControlModifier]
 else:
     __modifier2String = {
-        Qt.ShiftModifier: QCoreApplication.translate(
+        Qt.KeyboardModifier.ShiftModifier: QCoreApplication.translate(
             "MouseUtilities", "Shift"),
-        Qt.AltModifier: QCoreApplication.translate(
+        Qt.KeyboardModifier.AltModifier: QCoreApplication.translate(
             "MouseUtilities", "Alt"),
-        Qt.ControlModifier: QCoreApplication.translate(
+        Qt.KeyboardModifier.ControlModifier: QCoreApplication.translate(
             "MouseUtilities", "Ctrl"),
-        Qt.MetaModifier: QCoreApplication.translate(
+        Qt.KeyboardModifier.MetaModifier: QCoreApplication.translate(
             "MouseUtilities", "Meta"),
     }
-    __modifierOrder = [Qt.MetaModifier, Qt.ControlModifier, Qt.AltModifier,
-                       Qt.ShiftModifier]
+    __modifierOrder = [Qt.KeyboardModifier.MetaModifier,
+                       Qt.KeyboardModifier.ControlModifier,
+                       Qt.KeyboardModifier.AltModifier,
+                       Qt.KeyboardModifier.ShiftModifier]
 
 
 __button2String = {
-    Qt.LeftButton: QCoreApplication.translate(
+    Qt.MouseButton.LeftButton: QCoreApplication.translate(
         "MouseUtilities", "Left Button"),
-    Qt.RightButton: QCoreApplication.translate(
+    Qt.MouseButton.RightButton: QCoreApplication.translate(
         "MouseUtilities", "Right Button"),
-    Qt.MidButton: QCoreApplication.translate(
+    Qt.MouseButton.MidButton: QCoreApplication.translate(
         "MouseUtilities", "Middle Button"),
-    Qt.XButton1: QCoreApplication.translate(
+    Qt.MouseButton.XButton1: QCoreApplication.translate(
         "MouseUtilities", "Extra Button 1"),
-    Qt.XButton2: QCoreApplication.translate(
+    Qt.MouseButton.XButton2: QCoreApplication.translate(
         "MouseUtilities", "Extra Button 2"),
 }