Mercurial Repositories > eric / file diff

--- a/src/eric7/QScintilla/ShellWindow.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/QScintilla/ShellWindow.py	Sun Dec 18 19:33:46 2022 +0100
@@ -22,7 +22,8 @@
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
-from eric7.Globals import getConfig, getPythonExecutable, isMacPlatform
+from eric7.Globals import getConfig
+from eric7.SystemUtilities import OSUtilities, PythonUtilities
 from eric7.UI import Config
 from eric7.UI.SearchWidget import SearchWidget
 from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager
@@ -474,7 +475,7 @@
             self.editorActGrp,
             "vm_edit_delete_previous_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+H"))
             )
@@ -496,7 +497,7 @@
             self.editorActGrp,
             "vm_edit_delete_current_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+D"))
             )
@@ -550,7 +551,7 @@
             self.editorActGrp,
             "vm_edit_delete_line_right",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+K"))
             )
@@ -573,7 +574,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"))
             )
@@ -588,7 +589,7 @@
             self.editorActGrp,
             "vm_edit_move_right_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+F"))
             )
@@ -604,7 +605,7 @@
             self.editorActGrp,
             "vm_edit_move_left_word",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Left"))
             )
@@ -624,7 +625,7 @@
             self.editorActGrp,
             "vm_edit_move_right_word",
         )
-        if not isMacPlatform():
+        if not OSUtilities.isMacPlatform()():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Right"))
             )
@@ -644,7 +645,7 @@
             self.editorActGrp,
             "vm_edit_move_first_visible_char",
         )
-        if not isMacPlatform():
+        if not OSUtilities.isMacPlatform()():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Home"))
             )
@@ -660,7 +661,7 @@
             self.editorActGrp,
             "vm_edit_move_end_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+E"))
             )
@@ -680,7 +681,7 @@
             self.editorActGrp,
             "vm_edit_move_up_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+P"))
             )
@@ -696,7 +697,7 @@
             self.editorActGrp,
             "vm_edit_move_down_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+N"))
             )
@@ -748,7 +749,7 @@
             self.editorActGrp,
             "vm_edit_move_down_page",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+V"))
             )
@@ -780,7 +781,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_left_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+B"))
             )
@@ -800,7 +801,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_right_char",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setAlternateShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+F"))
             )
@@ -816,7 +817,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_left_word",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Alt+Shift+Left")
@@ -844,7 +845,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_right_word",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setShortcut(
                 QKeySequence(
                     QCoreApplication.translate("ViewManager", "Alt+Shift+Right")
@@ -874,7 +875,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"))
             )
@@ -894,7 +895,7 @@
             self.editorActGrp,
             "vm_edit_extend_selection_end_line",
         )
-        if isMacPlatform():
+        if OSUtilities.isMacPlatform()():
             act.setShortcut(
                 QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+E"))
             )
@@ -1257,7 +1258,7 @@
         """
         Private slot to start a new instance of eric.
         """
-        program = getPythonExecutable()
+        program = PythonUtilities.getPythonExecutable()
         eric7 = os.path.join(getConfig("ericDir"), "eric7_shell.py")
         args = [eric7]
         QProcess.startDetached(program, args)