Mercurial Repositories > eric / file diff

--- a/eric7/PluginManager/PluginManager.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/PluginManager/PluginManager.py	Sat May 22 18:51:46 2021 +0200
@@ -22,8 +22,8 @@
     QNetworkAccessManager, QNetworkRequest, QNetworkReply
 )
 
-from E5Gui import E5MessageBox
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox
+from E5Gui.EricApplication import ericApp
 
 from EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 try:
@@ -438,7 +438,7 @@
                 with contextlib.suppress(KeyError, AttributeError):
                     pluginObject = self.__onDemandInactivePlugins[name]
                     pluginObject.initToolbar(
-                        self.__ui, e5App().getObject("ToolbarManager"))
+                        self.__ui, ericApp().getObject("ToolbarManager"))
         except PluginLoadError:
             print("Error loading plug-in module:", name)
         except Exception as err:
@@ -554,7 +554,7 @@
         Public method to initialize plug-in toolbars.
         
         @param toolbarManager reference to the toolbar manager object
-            (E5ToolBarManager)
+            (EricToolBarManager)
         """
         self.initOnDemandPlugins()
         for pluginObject in self.__onDemandInactivePlugins.values():
@@ -1200,7 +1200,7 @@
                     try:
                         os.mkdir(downloadDir, 0o755)
                     except OSError as err:
-                        E5MessageBox.critical(
+                        EricMessageBox.critical(
                             self.__ui,
                             self.tr("Plugin Manager Error"),
                             self.tr(
@@ -1277,7 +1277,7 @@
             self.__replies.remove(reply)
         
         if reply.error() != QNetworkReply.NetworkError.NoError:
-            E5MessageBox.warning(
+            EricMessageBox.warning(
                 None,
                 self.tr("Error downloading file"),
                 self.tr(
@@ -1314,15 +1314,15 @@
                     return
                 
                 if self.__updateAvailable:
-                    res = E5MessageBox.information(
+                    res = EricMessageBox.information(
                         None,
                         self.tr("New plugin versions available"),
                         self.tr("<p>There are new plug-ins or plug-in"
                                 " updates available. Use the plug-in"
                                 " repository dialog to get them.</p>"),
-                        E5MessageBox.Ignore | E5MessageBox.Open,
-                        E5MessageBox.Open)
-                    if res == E5MessageBox.Open:
+                        EricMessageBox.Ignore | EricMessageBox.Open,
+                        EricMessageBox.Open)
+                    if res == EricMessageBox.Open:
                         self.__ui.showPluginsAvailable()
     
     def checkPluginEntry(self, name, short, description, url, author, version,
@@ -1436,7 +1436,7 @@
         @type list of str
         """
         try:
-            pip = e5App().getObject("Pip")
+            pip = ericApp().getObject("Pip")
         except KeyError:
             # Installation is performed via the plug-in installation script.
             from PipInterface.Pip import Pip