Mercurial Repositories > eric / file diff

--- a/src/eric7/MultiProject/MultiProject.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/MultiProject/MultiProject.py	Sun Dec 18 19:33:46 2022 +0100
@@ -15,7 +15,7 @@
 from PyQt6.QtCore import QFile, QIODevice, QObject, QUuid, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QMenu, QToolBar
 
-from eric7 import Preferences, Utilities
+from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction, createActionGroup
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
@@ -23,6 +23,7 @@
 from eric7.EricWidgets.EricPathPickerDialog import EricPathPickerModes
 from eric7.EricXML.MultiProjectReader import MultiProjectReader
 from eric7.Globals import recentNameMultiProject
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
 from eric7.UI import Config
 
 from .MultiProjectFile import MultiProjectFile
@@ -535,7 +536,7 @@
             fn = EricFileDialog.getOpenFileName(
                 self.parent(),
                 self.tr("Open Multi Project"),
-                Preferences.getMultiProject("Workspace") or Utilities.getHomeDir(),
+                Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir(),
                 self.tr(
                     "Multi Project Files (*.emj);;"
                     "XML Multi Project Files (*.e5m *.e4m)"
@@ -595,7 +596,7 @@
         defaultPath = (
             self.ppath
             if self.ppath
-            else (Preferences.getMultiProject("Workspace") or Utilities.getHomeDir())
+            else (Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir())
         )
         fn, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
             self.parent(),
@@ -907,7 +908,7 @@
         projects with the central store.
         """
         for recent in self.recent[:]:
-            if Utilities.samepath(self.pfile, recent):
+            if FileSystemUtilities.samepath(self.pfile, recent):
                 self.recent.remove(recent)
         self.recent.insert(0, self.pfile)
         maxRecent = Preferences.getProject("RecentNumber")
@@ -927,7 +928,7 @@
             formatStr = "&{0:d}. {1}" if idx < 10 else "{0:d}. {1}"
             act = self.recentMenu.addAction(
                 formatStr.format(
-                    idx, Utilities.compactPath(rp, self.ui.maxMenuFilePathLen)
+                    idx, FileSystemUtilities.compactPath(rp, self.ui.maxMenuFilePathLen)
                 )
             )
             act.setData(rp)