diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Utilities/MouseUtilities.py
--- a/src/eric7/Utilities/MouseUtilities.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Utilities/MouseUtilities.py Wed Jul 13 14:55:47 2022 +0200
@@ -14,46 +14,63 @@
if Globals.isMacPlatform():
__modifier2String = {
Qt.KeyboardModifier.ShiftModifier: QCoreApplication.translate(
- "MouseUtilities", "Shift"),
+ "MouseUtilities", "Shift"
+ ),
Qt.KeyboardModifier.AltModifier: QCoreApplication.translate(
- "MouseUtilities", "Alt"),
+ "MouseUtilities", "Alt"
+ ),
Qt.KeyboardModifier.ControlModifier: QCoreApplication.translate(
- "MouseUtilities", "Cmd"),
+ "MouseUtilities", "Cmd"
+ ),
Qt.KeyboardModifier.MetaModifier: QCoreApplication.translate(
- "MouseUtilities", "Ctrl"),
+ "MouseUtilities", "Ctrl"
+ ),
}
- __modifierOrder = [Qt.KeyboardModifier.MetaModifier,
- Qt.KeyboardModifier.AltModifier,
- Qt.KeyboardModifier.ShiftModifier,
- Qt.KeyboardModifier.ControlModifier]
+ __modifierOrder = [
+ Qt.KeyboardModifier.MetaModifier,
+ Qt.KeyboardModifier.AltModifier,
+ Qt.KeyboardModifier.ShiftModifier,
+ Qt.KeyboardModifier.ControlModifier,
+ ]
else:
__modifier2String = {
Qt.KeyboardModifier.ShiftModifier: QCoreApplication.translate(
- "MouseUtilities", "Shift"),
+ "MouseUtilities", "Shift"
+ ),
Qt.KeyboardModifier.AltModifier: QCoreApplication.translate(
- "MouseUtilities", "Alt"),
+ "MouseUtilities", "Alt"
+ ),
Qt.KeyboardModifier.ControlModifier: QCoreApplication.translate(
- "MouseUtilities", "Ctrl"),
+ "MouseUtilities", "Ctrl"
+ ),
Qt.KeyboardModifier.MetaModifier: QCoreApplication.translate(
- "MouseUtilities", "Meta"),
+ "MouseUtilities", "Meta"
+ ),
}
- __modifierOrder = [Qt.KeyboardModifier.MetaModifier,
- Qt.KeyboardModifier.ControlModifier,
- Qt.KeyboardModifier.AltModifier,
- Qt.KeyboardModifier.ShiftModifier]
+ __modifierOrder = [
+ Qt.KeyboardModifier.MetaModifier,
+ Qt.KeyboardModifier.ControlModifier,
+ Qt.KeyboardModifier.AltModifier,
+ Qt.KeyboardModifier.ShiftModifier,
+ ]
__button2String = {
Qt.MouseButton.LeftButton: QCoreApplication.translate(
- "MouseUtilities", "Left Button"),
+ "MouseUtilities", "Left Button"
+ ),
Qt.MouseButton.RightButton: QCoreApplication.translate(
- "MouseUtilities", "Right Button"),
+ "MouseUtilities", "Right Button"
+ ),
Qt.MouseButton.MiddleButton: QCoreApplication.translate(
- "MouseUtilities", "Middle Button"),
+ "MouseUtilities", "Middle Button"
+ ),
Qt.MouseButton.XButton1: QCoreApplication.translate(
- "MouseUtilities", "Extra Button 1"),
+ "MouseUtilities", "Extra Button 1"
+ ),
Qt.MouseButton.XButton2: QCoreApplication.translate(
- "MouseUtilities", "Extra Button 2"),
+ "MouseUtilities", "Extra Button 2"
+ ),
}
@@ -61,7 +78,7 @@
"""
Function to convert a modifier and mouse button combination to a
displayable string.
-
+
@param modifiers keyboard modifiers of the handler
@type Qt.KeyboardModifiers
@param button mouse button of the handler
@@ -71,7 +88,7 @@
"""
if button not in __button2String:
return ""
-
+
parts = []
for mod in __modifierOrder:
if modifiers & mod:
