Mercurial Repositories > eric / file diff

--- a/eric7/Preferences/__init__.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Preferences/__init__.py	Sat May 22 18:51:46 2021 +0200
@@ -36,7 +36,7 @@
     QWebEngineSettings = None
 from PyQt6.Qsci import QsciScintilla, QsciLexerPython
 
-from E5Gui import E5FileDialog
+from E5Gui import EricFileDialog
 
 from EricNetwork.EricFtp import EricFtpProxyType
 
@@ -1593,11 +1593,11 @@
     """
     Module function to initialize the central configuration store.
     """
-    from E5Gui.E5Application import e5App
+    from E5Gui.EricApplication import ericApp
     Prefs.settings = QSettings(
         QSettings.Format.IniFormat, QSettings.Scope.UserScope,
         Globals.settingsNameOrganization, Globals.settingsNameGlobal,
-        e5App())
+        ericApp())
     if not Globals.isWindowsPlatform():
         hp = QDir.homePath()
         dn = QDir(hp)
@@ -1627,7 +1627,7 @@
     
     @param prefClass preferences class used as the storage area
     """
-    filename, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+    filename, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
         None,
         QCoreApplication.translate("Preferences", "Export Preferences"),
         "",
@@ -1635,7 +1635,7 @@
             "Preferences",
             "Properties File (*.ini);;All Files (*)"),
         None,
-        E5FileDialog.DontConfirmOverwrite)
+        EricFileDialog.DontConfirmOverwrite)
     if filename:
         ext = QFileInfo(filename).suffix()
         if not ext:
@@ -1655,7 +1655,7 @@
     
     @param prefClass preferences class used as the storage area
     """
-    filename = E5FileDialog.getOpenFileName(
+    filename = EricFileDialog.getOpenFileName(
         None,
         QCoreApplication.translate("Preferences", "Import Preferences"),
         "",
@@ -1751,8 +1751,8 @@
             "Debugger/" + newKey, prefClass.debuggerDefaults[newKey])
         if venvName:
             try:
-                from E5Gui.E5Application import e5App
-                virtualenvManager = e5App().getObject("VirtualEnvManager")
+                from E5Gui.EricApplication import ericApp
+                virtualenvManager = ericApp().getObject("VirtualEnvManager")
             except KeyError:
                 from VirtualEnv.VirtualenvManager import VirtualenvManager
                 virtualenvManager = VirtualenvManager()