Mercurial Repositories > eric / file diff

--- a/src/eric7/Preferences/__init__.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Preferences/__init__.py	Sun Dec 18 19:33:46 2022 +0100
@@ -52,6 +52,7 @@
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricIconBar import EricIconBar
 from eric7.QScintilla.Shell import ShellHistoryStyle
+from eric7.SystemUtilities import OSUtilities, PythonUtilities, QtUtilities
 from eric7.Utilities.crypto import pwConvert
 from eric7.Utilities.crypto.py3PBKDF2 import hashPassword
 
@@ -723,7 +724,7 @@
         "YAMLFoldComment": False,
     }
 
-    if Globals.isWindowsPlatform():
+    if OSUtilities.isWindowsPlatform():
         editorDefaults["EOLMode"] = QsciScintilla.EolMode.EolWindows
     else:
         editorDefaults["EOLMode"] = QsciScintilla.EolMode.EolUnix
@@ -1520,7 +1521,7 @@
         "HighlightChanges": True,
         "RecentNumber": 9,
     }
-    if Globals.isWindowsPlatform():
+    if OSUtilities.isWindowsPlatform():
         hexEditorDefaults["Font"] = "Courier,10,-1,5,50,0,0,0,0,0"
     else:
         hexEditorDefaults["Font"] = "Monospace,10,-1,5,50,0,0,0,0,0"
@@ -1601,9 +1602,9 @@
             "https://github.com/calliope-mini/calliope-mini-micropython/"
         ),
     }
-    if Globals.isWindowsPlatform():
+    if OSUtilities.isWindowsPlatform():
         microPythonDefaults["ColorScheme"] = "Windows 10"
-    elif Globals.isMacPlatform():
+    elif OSUtilities.isMacPlatform():
         microPythonDefaults["ColorScheme"] = "xterm"
     else:
         microPythonDefaults["ColorScheme"] = "Ubuntu"
@@ -1738,7 +1739,7 @@
         Globals.settingsNameGlobal,
         ericApp(),
     )
-    if not Globals.isWindowsPlatform():
+    if not OSUtilities.isWindowsPlatform():
         hp = QDir.homePath()
         dn = QDir(hp)
         dn.mkdir(".eric7")
@@ -1933,7 +1934,7 @@
         else:
             interpreter = ""
         if not interpreter:
-            return Globals.getPythonExecutable()
+            return PythonUtilities.getPythonExecutable()
         return interpreter
     elif key == "DebugClientType3":
         debugClientType = Prefs.settings.value(
@@ -3233,8 +3234,8 @@
     )
     if s == "":
         s = QLibraryInfo.path(QLibraryInfo.LibraryPath.TranslationsPath)
-    if s == "" and Globals.isWindowsPlatform():
-        transPath = os.path.join(Globals.getPyQt6ModulesDirectory(), "translations")
+    if s == "" and OSUtilities.isWindowsPlatform():
+        transPath = os.path.join(QtUtilities.getPyQt6ModulesDirectory(), "translations")
         if os.path.exists(transPath):
             s = transPath
     return s