diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/WebBrowser/AdBlock/AdBlockSubscription.py --- a/eric7/WebBrowser/AdBlock/AdBlockSubscription.py Sat May 22 17:01:51 2021 +0200 +++ b/eric7/WebBrowser/AdBlock/AdBlockSubscription.py Sat May 22 18:51:46 2021 +0200 @@ -18,7 +18,7 @@ ) from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest -from E5Gui import E5MessageBox +from E5Gui import EricMessageBox import Utilities import Preferences @@ -281,7 +281,7 @@ f = QFile(fileName) if f.exists(): if not f.open(QIODevice.OpenModeFlag.ReadOnly): - E5MessageBox.warning( + EricMessageBox.warning( None, self.tr("Load subscription rules"), self.tr( @@ -291,7 +291,7 @@ textStream = QTextStream(f) header = textStream.readLine(1024) if not header.startswith("[Adblock"): - E5MessageBox.warning( + EricMessageBox.warning( None, self.tr("Load subscription rules"), self.tr("""AdBlock file '{0}' does not start""" @@ -396,7 +396,7 @@ if reply.error() != QNetworkReply.NetworkError.NoError: if not self.__defaultSubscription: # don't show error if we try to load the default - E5MessageBox.warning( + EricMessageBox.warning( None, self.tr("Downloading subscription rules"), self.tr( @@ -409,7 +409,7 @@ return if response.isEmpty(): - E5MessageBox.warning( + EricMessageBox.warning( None, self.tr("Downloading subscription rules"), self.tr("""Got empty subscription rules.""")) @@ -419,7 +419,7 @@ QFile.remove(fileName) f = QFile(fileName) if not f.open(QIODevice.OpenModeFlag.ReadWrite): - E5MessageBox.warning( + EricMessageBox.warning( None, self.tr("Downloading subscription rules"), self.tr( @@ -499,7 +499,7 @@ if calculatedChecksum == expectedChecksum: return True else: - res = E5MessageBox.yesNo( + res = EricMessageBox.yesNo( None, self.tr("Downloading subscription rules"), self.tr( @@ -523,7 +523,7 @@ f = QFile(fileName) if not f.open(QIODevice.OpenModeFlag.ReadWrite | QIODevice.OpenModeFlag.Truncate): - E5MessageBox.warning( + EricMessageBox.warning( None, self.tr("Saving subscription rules"), self.tr(