--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Sun Dec 18 14:19:10 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Sun Dec 18 19:33:46 2022 +0100 @@ -11,10 +11,11 @@ from PyQt6.QtCore import QUrl, pyqtSlot from PyQt6.QtWidgets import QDialog, QDialogButtonBox -from eric7 import Preferences, Utilities +from eric7 import Preferences from eric7.EricGui import EricPixmapCache from eric7.EricWidgets import EricFileDialog from eric7.EricWidgets.EricCompleters import EricDirCompleter +from eric7.SystemUtilities import FileSystemUtilities, OSUtilities from .Config import ConfigGitSchemes from .Ui_GitNewProjectOptionsDialog import Ui_GitNewProjectOptionsDialog @@ -49,13 +50,13 @@ self.vcsDirectoryCompleter = EricDirCompleter(self.vcsUrlCombo) self.vcsProjectDirCompleter = EricDirCompleter(self.vcsProjectDirEdit) - ipath = Preferences.getMultiProject("Workspace") or Utilities.getHomeDir() + ipath = Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir() self.__initPaths = [ - Utilities.fromNativeSeparators(ipath), - Utilities.fromNativeSeparators(ipath) + "/", + FileSystemUtilities.fromNativeSeparators(ipath), + FileSystemUtilities.fromNativeSeparators(ipath) + "/", ] self.vcsProjectDirEdit.setText( - Utilities.toNativeSeparators(self.__initPaths[0]) + FileSystemUtilities.toNativeSeparators(self.__initPaths[0]) ) self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) @@ -71,7 +72,8 @@ @param txt name of the project directory (string) """ self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled( - bool(txt) and Utilities.fromNativeSeparators(txt) not in self.__initPaths + bool(txt) + and FileSystemUtilities.fromNativeSeparators(txt) not in self.__initPaths ) @pyqtSlot() @@ -87,7 +89,9 @@ ) if directory: - self.vcsUrlCombo.setEditText(Utilities.toNativeSeparators(directory)) + self.vcsUrlCombo.setEditText( + FileSystemUtilities.toNativeSeparators(directory) + ) @pyqtSlot() def on_projectDirButton_clicked(self): @@ -102,7 +106,9 @@ ) if directory: - self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators(directory)) + self.vcsProjectDirEdit.setText( + FileSystemUtilities.toNativeSeparators(directory) + ) @pyqtSlot(str) def on_vcsUrlCombo_editTextChanged(self, txt):