Mercurial Repositories > eric / file diff

--- a/eric7/WebBrowser/Download/DownloadManager.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/WebBrowser/Download/DownloadManager.py	Sat May 22 18:51:46 2021 +0200
@@ -15,8 +15,8 @@
     QDialog, QStyle, QFileIconProvider, QMenu, QApplication
 )
 
-from E5Gui import E5MessageBox
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox
+from E5Gui.EricApplication import ericApp
 
 from .Ui_DownloadManager import Ui_DownloadManager
 
@@ -166,13 +166,13 @@
         @return flag indicating allowance to quit (boolean)
         """
         if self.activeDownloadsCount() > 0:
-            res = E5MessageBox.yesNo(
+            res = EricMessageBox.yesNo(
                 self,
                 self.tr(""),
                 self.tr("""There are %n downloads in progress.\n"""
                         """Do you want to quit anyway?""", "",
                         self.activeDownloadsCount()),
-                icon=E5MessageBox.Warning)
+                icon=EricMessageBox.Warning)
             if not res:
                 self.show()
                 return False
@@ -255,15 +255,15 @@
                     WebBrowserWindow.safeBrowsingManager()
                     .getThreatMessages(threatLists)
                 )
-                res = E5MessageBox.warning(
+                res = EricMessageBox.warning(
                     WebBrowserWindow.getWindow(),
                     self.tr("Suspicuous URL detected"),
                     self.tr("<p>The URL <b>{0}</b> was found in the Safe"
                             " Browsing database.</p>{1}").format(
                         url.toString(), "".join(threatMessages)),
-                    E5MessageBox.Abort | E5MessageBox.Ignore,
-                    E5MessageBox.Abort)
-                if res == E5MessageBox.Abort:
+                    EricMessageBox.Abort | EricMessageBox.Ignore,
+                    EricMessageBox.Abort)
+                if res == EricMessageBox.Abort:
                     downloadItem.cancel()
                     return
         
@@ -489,7 +489,7 @@
         
         if self.activeDownloadsCount() == 0:
             # all active downloads are done
-            if success and e5App().activeWindow() is not self:
+            if success and ericApp().activeWindow() is not self:
                 WebBrowserWindow.showNotification(
                     UI.PixmapCache.getPixmap("downloads48"),
                     self.tr("Downloads finished"),