--- a/eric7/PluginManager/PluginRepositoryDialog.py Sat May 22 17:01:51 2021 +0200 +++ b/eric7/PluginManager/PluginRepositoryDialog.py Sat May 22 18:51:46 2021 +0200 @@ -27,9 +27,9 @@ from .Ui_PluginRepositoryDialog import Ui_PluginRepositoryDialog -from E5Gui import E5MessageBox -from E5Gui.E5MainWindow import E5MainWindow -from E5Gui.E5Application import e5App +from E5Gui import EricMessageBox +from E5Gui.EricMainWindow import EricMainWindow +from E5Gui.EricApplication import ericApp from EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired try: @@ -342,7 +342,7 @@ self.__downloadButton.setEnabled(len(self.__selectedItems())) self.__downloadInstallButton.setEnabled(len(self.__selectedItems())) self.__installButton.setEnabled(len(self.__selectedItems())) - ui = (e5App().getObject("UserInterface") + ui = (ericApp().getObject("UserInterface") if not self.__external else None) if ui is not None: ui.showNotification( @@ -354,7 +354,7 @@ self.closeAndInstall.emit() else: if ui is None: - E5MessageBox.information( + EricMessageBox.information( self, self.tr("Download Plugin Files"), self.tr("""The requested plugins were downloaded.""")) @@ -402,7 +402,7 @@ url = Preferences.getUI("PluginRepositoryUrl7") if url != self.repositoryUrlEdit.text(): self.repositoryUrlEdit.setText(url) - E5MessageBox.warning( + EricMessageBox.warning( self, self.tr("Plugins Repository URL Changed"), self.tr( @@ -410,7 +410,7 @@ """ changed. Select the "Update" button to get""" """ the new repository file.""")) else: - E5MessageBox.critical( + EricMessageBox.critical( self, self.tr("Read plugins repository file"), self.tr("<p>The plugins repository file <b>{0}</b> " @@ -483,7 +483,7 @@ reply.error() != QNetworkReply.NetworkError.OperationCanceledError ): - E5MessageBox.warning( + EricMessageBox.warning( self, self.tr("Error downloading file"), self.tr( @@ -822,7 +822,7 @@ return self.cw.getDownloadedPlugins() -class PluginRepositoryWindow(E5MainWindow): +class PluginRepositoryWindow(EricMainWindow): """ Main window class for the standalone dialog. """ @@ -861,7 +861,7 @@ not os.path.isfile(applPath) or not proc.startDetached(sys.executable, args) ): - E5MessageBox.critical( + EricMessageBox.critical( self, self.tr('Process Generation Error'), self.tr( @@ -947,7 +947,7 @@ os.remove(os.path.join(downloadPath, removeFile)) except OSError as err: if not quiet: - E5MessageBox.critical( + EricMessageBox.critical( None, QCoreApplication.translate( "PluginRepositoryWidget", @@ -976,7 +976,7 @@ os.remove(os.path.join(downloadPath, removeFile)) except OSError as err: if not quiet: - E5MessageBox.critical( + EricMessageBox.critical( None, QCoreApplication.translate( "PluginRepositoryWidget",