diff -r 9c1f429cb56b -r b47dfa7a137d src/eric7/Tools/TrayStarter.py
--- a/src/eric7/Tools/TrayStarter.py Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Tools/TrayStarter.py Sun Dec 18 19:33:46 2022 +0100
@@ -18,10 +18,11 @@
from PyQt6.QtGui import QCursor
from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QSystemTrayIcon
-from eric7 import Globals, Preferences, Utilities
+from eric7 import Globals, Preferences
from eric7.EricGui import EricPixmapCache
from eric7.EricWidgets import EricMessageBox
from eric7.EricWidgets.EricApplication import ericApp
+from eric7.SystemUtilities import DesktopUtilities, FileSystemUtilities, PythonUtilities
from eric7.UI.Info import Program, Version
@@ -303,14 +304,14 @@
args = []
args.append(applPath)
- args.append("--config={0}".format(Utilities.getConfigDir()))
+ args.append("--config={0}".format(Globals.getConfigDir()))
if self.settingsDir:
args.append("--settings={0}".format(self.settingsDir))
for arg in applArgs:
args.append(arg)
if not os.path.isfile(applPath) or not proc.startDetached(
- Globals.getPythonExecutable(), args
+ PythonUtilities.getPythonExecutable(), args
):
EricMessageBox.critical(
self,
@@ -474,7 +475,7 @@
formatStr = "&{0:d}. {1}" if idx < 10 else "{0:d}. {1}"
act = self.recentProjectsMenu.addAction(
formatStr.format(
- idx, Utilities.compactPath(rp, self.maxMenuFilePathLen)
+ idx, FileSystemUtilities.compactPath(rp, self.maxMenuFilePathLen)
)
)
act.setData(rp)
@@ -493,7 +494,7 @@
formatStr = "&{0:d}. {1}" if idx < 10 else "{0:d}. {1}"
act = self.recentMultiProjectsMenu.addAction(
formatStr.format(
- idx, Utilities.compactPath(rmp, self.maxMenuFilePathLen)
+ idx, FileSystemUtilities.compactPath(rmp, self.maxMenuFilePathLen)
)
)
act.setData(rmp)
@@ -512,7 +513,7 @@
formatStr = "&{0:d}. {1}" if idx < 10 else "{0:d}. {1}"
act = self.recentFilesMenu.addAction(
formatStr.format(
- idx, Utilities.compactPath(rf, self.maxMenuFilePathLen)
+ idx, FileSystemUtilities.compactPath(rf, self.maxMenuFilePathLen)
)
)
act.setData(rf)
@@ -626,8 +627,8 @@
)
# desktop and session type
- desktop = Globals.desktopName()
- session = Globals.sessionType()
+ desktop = DesktopUtilities.desktopName()
+ session = DesktopUtilities.sessionType()
if desktop or session:
versionText += "<tr><td></td><td></td></tr>"
if desktop:
