Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Mon Mar 21 20:03:40 2011 +0100
+++ b/APIs/Python3/eric5.api	Sat Mar 26 12:52:15 2011 +0100
@@ -1700,7 +1700,7 @@
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.title?4()
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.updateNow?4()
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.url?4()
-eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription?1(url, parent = None)
+eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription?1(url, parent = None, default = False)
 eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog.accept?4()
 eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog.addedNode?4()
 eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog.currentIndex?4()

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockSubscription.html	Mon Mar 21 20:03:40 2011 +0100
+++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockSubscription.html	Sat Mar 26 12:52:15 2011 +0100
@@ -135,7 +135,7 @@
 </table>
 <a NAME="AdBlockSubscription.__init__" ID="AdBlockSubscription.__init__"></a>
 <h4>AdBlockSubscription (Constructor)</h4>
-<b>AdBlockSubscription</b>(<i>url, parent = None</i>)
+<b>AdBlockSubscription</b>(<i>url, parent = None, default = False</i>)
 <p>
         Constructor
 </p><dl>
@@ -145,6 +145,9 @@
 </dd><dt><i>parent</i></dt>
 <dd>
 reference to the parent object (QObject)
+</dd><dt><i>default</i></dt>
+<dd>
+flag indicating a default subscription (Boolean)
 </dd>
 </dl><a NAME="AdBlockSubscription.__loadRules" ID="AdBlockSubscription.__loadRules"></a>
 <h4>AdBlockSubscription.__loadRules</h4>

--- a/Helpviewer/AdBlock/AdBlockManager.py	Mon Mar 21 20:03:40 2011 +0100
+++ b/Helpviewer/AdBlock/AdBlockManager.py	Sat Mar 26 12:52:15 2011 +0100
@@ -219,18 +219,20 @@
         if self.__subscriptionsLoaded:
             return
         
+        defaultSubscriptionUrl = \
+            "abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList"
         defaultSubscriptions = []
         defaultSubscriptions.append(
             bytes(self.__customSubscriptionUrl().toEncoded()).decode())
-        defaultSubscriptions.append(
-            "abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList")
+        defaultSubscriptions.append(defaultSubscriptionUrl)
         
         subscriptions = Preferences.getHelp("AdBlockSubscriptions")
         if len(subscriptions) == 0:
             subscriptions = defaultSubscriptions
         for subscription in subscriptions:
             url = QUrl.fromEncoded(subscription.encode())
-            adBlockSubscription = AdBlockSubscription(url, self)
+            adBlockSubscription = AdBlockSubscription(url, self, 
+                subscription == defaultSubscriptionUrl)
             adBlockSubscription.rulesChanged.connect(self.rulesChanged)
             adBlockSubscription.changed.connect(self.rulesChanged)
             self.__subscriptions.append(adBlockSubscription)

--- a/Helpviewer/AdBlock/AdBlockSubscription.py	Mon Mar 21 20:03:40 2011 +0100
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Sat Mar 26 12:52:15 2011 +0100
@@ -30,18 +30,20 @@
     changed = pyqtSignal()
     rulesChanged = pyqtSignal()
     
-    def __init__(self, url, parent = None):
+    def __init__(self, url, parent = None, default = False):
         """
         Constructor
         
         @param url AdBlock URL for the subscription (QUrl)
         @param parent reference to the parent object (QObject)
+        @param default flag indicating a default subscription (Boolean)
         """
         QObject.__init__(self, parent)
         
         self.__url = url.toEncoded()
         self.__enabled = False
         self.__downloading = None
+        self.__defaultSubscription = default
         
         self.__title = ""
         self.__location = QByteArray()
@@ -261,10 +263,15 @@
         self.__downloading = None
         
         if reply.error() != QNetworkReply.NoError:
-            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()))
+            if not self.__defaultSubscription:
+                # don't show error if we try to load the default
+                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()))
+            else:
+                # reset after first download attempt
+                self.__defaultSubscription = False
             return
         
         if redirect.isValid():