Mercurial Repositories > eric / file diff

diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Preferences/ConfigurationDialog.py
--- a/eric7/Preferences/ConfigurationDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Preferences/ConfigurationDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -20,9 +20,9 @@
     QVBoxLayout, QTreeWidgetItem, QLabel, QAbstractScrollArea, QLineEdit
 )
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
-from E5Gui.E5MainWindow import E5MainWindow
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
+from E5Gui.EricMainWindow import EricMainWindow
 
 from Globals import isMacPlatform, getWebBrowserSupport
 
@@ -116,17 +116,17 @@
         if not fromEric:
             from PluginManager.PluginManager import PluginManager
             try:
-                self.pluginManager = e5App().getObject("PluginManager")
+                self.pluginManager = ericApp().getObject("PluginManager")
             except KeyError:
                 self.pluginManager = PluginManager(self)
-                e5App().registerObject("PluginManager", self.pluginManager)
+                ericApp().registerObject("PluginManager", self.pluginManager)
             
             from VirtualEnv.VirtualenvManager import VirtualenvManager
             try:
-                self.virtualenvManager = e5App().getObject("VirtualEnvManager")
+                self.virtualenvManager = ericApp().getObject("VirtualEnvManager")
             except KeyError:
                 self.virtualenvManager = VirtualenvManager(self)
-                e5App().registerObject("VirtualEnvManager",
+                ericApp().registerObject("VirtualEnvManager",
                                        self.virtualenvManager)
         
         if displayMode == ConfigurationMode.DEFAULTMODE:
@@ -364,7 +364,7 @@
                 })
             
             self.configItems.update(
-                e5App().getObject("PluginManager").getPluginConfigData())
+                ericApp().getObject("PluginManager").getPluginConfigData())
         
         elif displayMode == ConfigurationMode.WEBBROWSERMODE:
             self.configItems = {
@@ -662,7 +662,7 @@
                 mod = getattr(mod, comp)
             return mod
         except ImportError:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr("Configuration Page Error"),
                 self.tr("""<p>The configuration page <b>{0}</b>"""
@@ -1018,7 +1018,7 @@
         super().accept()
 
 
-class ConfigurationWindow(E5MainWindow):
+class ConfigurationWindow(EricMainWindow):
     """
     Main window class for the standalone dialog.
     """