diff -r 7f1a56e80124 -r 87f9bce38a44 Helpviewer/AdBlock/AdBlockSubscription.py
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Tue Aug 31 12:36:10 2010 +0200
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py Tue Aug 31 13:23:27 2010 +0200
@@ -13,6 +13,8 @@
from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply
from PyQt4.QtGui import QMessageBox
+from E5Gui import E5MessageBox
+
from .AdBlockRule import AdBlockRule
import Helpviewer.HelpWindow
@@ -199,7 +201,7 @@
f = QFile(fileName)
if f.exists():
if not f.open(QIODevice.ReadOnly):
- QMessageBox.warning(None,
+ E5MessageBox.warning(None,
self.trUtf8("Load subscription rules"),
self.trUtf8("""Unable to open adblock file '{0}' for reading.""")\
.format(fileName))
@@ -207,7 +209,7 @@
textStream = QTextStream(f)
header = textStream.readLine(1024)
if not header.startswith("[Adblock"):
- QMessageBox.warning(None,
+ E5MessageBox.warning(None,
self.trUtf8("Load subscription rules"),
self.trUtf8("""Adblock file '{0}' does not start"""
""" with [Adblock.""")\
@@ -260,7 +262,7 @@
self.__downloading = None
if reply.error() != QNetworkReply.NoError:
- QMessageBox.warning(None,
+ E5MessageBox.warning(None,
self.trUtf8("Downloading subscription rules"),
self.trUtf8("""<p>Subscription rules could not be downloaded.</p>"""
"""<p>Error: {0}</p>""").format(reply.errorString()))
@@ -274,7 +276,7 @@
return
if response.isEmpty():
- QMessageBox.warning(None,
+ E5MessageBox.warning(None,
self.trUtf8("Downloading subscription rules"),
self.trUtf8("""Got empty subscription rules."""))
return
@@ -282,7 +284,7 @@
fileName = self.rulesFileName()
f = QFile(fileName)
if not f.open(QIODevice.ReadWrite):
- QMessageBox.warning(None,
+ E5MessageBox.warning(None,
self.trUtf8("Downloading subscription rules"),
self.trUtf8("""Unable to open adblock file '{0}' for writing.""")\
.file(fileName))
@@ -303,7 +305,7 @@
f = QFile(fileName)
if not f.open(QIODevice.ReadWrite | QIODevice.Truncate):
- QMessageBox.warning(None,
+ E5MessageBox.warning(None,
self.trUtf8("Saving subscription rules"),
self.trUtf8("""Unable to open adblock file '{0}' for writing.""")\
.format(fileName))
@@ -407,4 +409,4 @@
elif rule.isException():
self.__networkExceptionRules.append(rule)
else:
- self.__networkBlockRules.append(rule)
+ self.__networkBlockRules.append(rule)
\ No newline at end of file
