Mercurial Repositories > eric / file diff

--- a/src/eric7/QScintilla/MiniEditor.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/QScintilla/MiniEditor.py	Sun Dec 18 19:33:46 2022 +0100
@@ -44,7 +44,7 @@
     QWidget,
 )
 
-from eric7 import Preferences, Utilities
+from eric7 import Globals, Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction, createActionGroup
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
@@ -52,7 +52,7 @@
 from eric7.EricWidgets.EricClickableLabel import EricClickableLabel
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
-from eric7.Globals import isMacPlatform
+from eric7.SystemUtilities import OSUtilities
 from eric7.UI import Config
 
 from . import Lexers
@@ -901,7 +901,7 @@
             "vm_edit_move_left_char",
         )
         self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFT)
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+B"))
             )
@@ -916,7 +916,7 @@
             self.editorActGrp,
             "vm_edit_move_right_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+F"))
             )
@@ -932,7 +932,7 @@
             self.editorActGrp,
             "vm_edit_move_up_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+P"))
             )
@@ -948,7 +948,7 @@
             self.editorActGrp,
             "vm_edit_move_down_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+N"))
             )
@@ -964,7 +964,7 @@
             self.editorActGrp,
             "vm_edit_move_left_word_part",
         )
-        if not isMacPlatform():
+        if not OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Left"))
             )
@@ -980,7 +980,7 @@
             self.editorActGrp,
             "vm_edit_move_right_word_part",
         )
-        if not isMacPlatform():
+        if not OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Right"))
             )
@@ -996,7 +996,7 @@
             self.editorActGrp,
             "vm_edit_move_left_word",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Left"))
             )
@@ -1016,7 +1016,7 @@
             self.editorActGrp,
             "vm_edit_move_right_word",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Right"))
             )
@@ -1040,7 +1040,7 @@
             self.editorActGrp,
             "vm_edit_move_first_visible_char",
         )
-        if not isMacPlatform():
+        if not OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Home"))
             )
@@ -1056,7 +1056,7 @@
             self.editorActGrp,
             "vm_edit_move_start_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Left"))
             )
@@ -1076,7 +1076,7 @@
             self.editorActGrp,
             "vm_edit_move_end_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+E"))
             )
@@ -1156,7 +1156,7 @@
             self.editorActGrp,
             "vm_edit_move_down_page",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+V"))
             )
@@ -1172,7 +1172,7 @@
             self.editorActGrp,
             "vm_edit_move_start_text",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Up"))
             )
@@ -1192,7 +1192,7 @@
             self.editorActGrp,
             "vm_edit_move_end_text",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Down"))
             )
@@ -1240,7 +1240,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_left_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+B"))
             )
@@ -1260,7 +1260,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_right_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+F"))
             )
@@ -1276,7 +1276,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_up_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+P"))
             )
@@ -1292,7 +1292,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_down_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+N"))
             )
@@ -1312,7 +1312,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_left_word_part",
         )
-        if not isMacPlatform():
+        if not OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Alt+Shift+Left")
@@ -1334,7 +1334,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_right_word_part",
         )
-        if not isMacPlatform():
+        if not OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Alt+Shift+Right")
@@ -1352,7 +1352,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_left_word",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Alt+Shift+Left")
@@ -1380,7 +1380,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_right_word",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Alt+Shift+Right")
@@ -1410,7 +1410,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_first_visible_char",
         )
-        if not isMacPlatform():
+        if not OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Shift+Home"))
             )
@@ -1430,7 +1430,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_end_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+E"))
             )
@@ -1494,7 +1494,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_down_page",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+V"))
             )
@@ -1514,7 +1514,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_start_text",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Shift+Up"))
             )
@@ -1540,7 +1540,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_end_text",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Ctrl+Shift+Down")
@@ -1564,7 +1564,7 @@
             self.editorActGrp,
             "vm_edit_delete_previous_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+H"))
             )
@@ -1602,7 +1602,7 @@
             self.editorActGrp,
             "vm_edit_delete_current_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+D"))
             )
@@ -1656,7 +1656,7 @@
             self.editorActGrp,
             "vm_edit_delete_line_right",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+K"))
             )
@@ -1810,7 +1810,7 @@
             self.editorActGrp,
             "vm_edit_move_end_displayed_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Right"))
             )
@@ -1834,7 +1834,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_end_displayed_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Ctrl+Shift+Right")
@@ -1880,7 +1880,7 @@
             self.editorActGrp,
             "vm_edit_extend_rect_selection_down_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+N")
@@ -1902,7 +1902,7 @@
             self.editorActGrp,
             "vm_edit_extend_rect_selection_up_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+P")
@@ -1924,7 +1924,7 @@
             self.editorActGrp,
             "vm_edit_extend_rect_selection_left_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+B")
@@ -1946,7 +1946,7 @@
             self.editorActGrp,
             "vm_edit_extend_rect_selection_right_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+F")
@@ -1972,7 +1972,7 @@
             self.editorActGrp,
             "vm_edit_extend_rect_selection_first_visible_char",
         )
-        if not isMacPlatform():
+        if not OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Alt+Shift+Home")
@@ -1994,7 +1994,7 @@
             self.editorActGrp,
             "vm_edit_extend_rect_selection_end_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+E")
@@ -2036,7 +2036,7 @@
             self.editorActGrp,
             "vm_edit_extend_rect_selection_down_page",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform():
             act.setAlternateShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+V")
@@ -2071,7 +2071,7 @@
                 self.editorActGrp,
                 "vm_edit_scroll_start_text",
             )
-            if isMacPlatform():
+            if OSUtilities.isMacPlatform():
                 act.setShortcut(
                     QKeySequence(QCoreApplication.translate("ViewManager", "Home"))
                 )
@@ -2088,7 +2088,7 @@
                 self.editorActGrp,
                 "vm_edit_scroll_end_text",
             )
-            if isMacPlatform():
+            if OSUtilities.isMacPlatform():
                 act.setShortcut(
                     QKeySequence(QCoreApplication.translate("ViewManager", "End"))
                 )
@@ -2109,7 +2109,7 @@
                 self.editorActGrp,
                 "vm_edit_scroll_vertically_center",
             )
-            if isMacPlatform():
+            if OSUtilities.isMacPlatform():
                 act.setShortcut(
                     QKeySequence(QCoreApplication.translate("ViewManager", "Meta+L"))
                 )
@@ -2126,7 +2126,7 @@
                 self.editorActGrp,
                 "vm_edit_move_end_next_word",
             )
-            if isMacPlatform():
+            if OSUtilities.isMacPlatform():
                 act.setShortcut(
                     QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Right"))
                 )
@@ -2147,7 +2147,7 @@
                 self.editorActGrp,
                 "vm_edit_select_end_next_word",
             )
-            if isMacPlatform():
+            if OSUtilities.isMacPlatform():
                 act.setShortcut(
                     QKeySequence(
                         QCoreApplication.translate("ViewManager", "Alt+Shift+Right")
@@ -2204,7 +2204,7 @@
                 self.editorActGrp,
                 "vm_edit_move_start_document_line",
             )
-            if isMacPlatform():
+            if OSUtilities.isMacPlatform():
                 act.setShortcut(
                     QKeySequence(QCoreApplication.translate("ViewManager", "Meta+A"))
                 )
@@ -2225,7 +2225,7 @@
                 self.editorActGrp,
                 "vm_edit_extend_selection_start_document_line",
             )
-            if isMacPlatform():
+            if OSUtilities.isMacPlatform():
                 act.setShortcut(
                     QKeySequence(
                         QCoreApplication.translate("ViewManager", "Meta+Shift+A")
@@ -2250,7 +2250,7 @@
                 self.editorActGrp,
                 "vm_edit_select_rect_start_line",
             )
-            if isMacPlatform():
+            if OSUtilities.isMacPlatform():
                 act.setShortcut(
                     QKeySequence(
                         QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+A")
@@ -2273,7 +2273,7 @@
                 self.editorActGrp,
                 "vm_edit_extend_selection_start_display_line",
             )
-            if isMacPlatform():
+            if OSUtilities.isMacPlatform():
                 act.setShortcut(
                     QKeySequence(
                         QCoreApplication.translate("ViewManager", "Ctrl+Shift+Left")
@@ -2470,7 +2470,7 @@
                 self.editorActGrp,
                 "vm_edit_delete_right_end_next_word",
             )
-            if isMacPlatform():
+            if OSUtilities.isMacPlatform():
                 act.setShortcut(
                     QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Del"))
                 )
@@ -4365,9 +4365,9 @@
             elif option == "DefaultEncoding":
                 value = config["charset"]
             elif option == "InsertFinalNewline":
-                value = Utilities.toBool(config["insert_final_newline"])
+                value = Globals.toBool(config["insert_final_newline"])
             elif option == "StripTrailingWhitespace":
-                value = Utilities.toBool(config["trim_trailing_whitespace"])
+                value = Globals.toBool(config["trim_trailing_whitespace"])
             elif option == "TabWidth":
                 value = int(config["tab_width"])
             elif option == "IndentWidth":