Mercurial Repositories > eric / file diff

--- a/Helpviewer/AdBlock/AdBlockManager.py	Sun Jul 29 13:40:11 2012 +0200
+++ b/Helpviewer/AdBlock/AdBlockManager.py	Sun Jul 29 15:41:58 2012 +0200
@@ -16,6 +16,8 @@
 from .AdBlockSubscription import AdBlockSubscription
 from .AdBlockDialog import AdBlockDialog
 
+import Helpviewer.HelpWindow
+
 from Utilities.AutoSaver import AutoSaver
 import Utilities
 import Preferences
@@ -75,6 +77,8 @@
             return
         
         self.__enabled = enabled
+        for mainWindow in Helpviewer.HelpWindow.HelpWindow.mainWindows():
+            mainWindow.adBlockIcon().setEnabled(enabled)
         if enabled:
             self.__loadSubscriptions()
         self.rulesChanged.emit()
@@ -221,7 +225,8 @@
             return
         
         defaultSubscriptionUrl = \
-            "abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList"
+            "abp:subscribe?location=" \
+            "http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList"
         defaultSubscriptions = []
         defaultSubscriptions.append(
             bytes(self.__customSubscriptionUrl().toEncoded()).decode())
@@ -250,6 +255,16 @@
         self.__adBlockDialog.show()
         return self.__adBlockDialog
     
+    def showRule(self):
+        """
+        Public slot to show an AdBlock rule.
+        """
+        act = self.sender()
+        if act is not None:
+            rule = act.data()
+            if rule:
+                self.showDialog().showRule(rule)
+    
     def elementHidingRules(self):
         """
         Public method to get the element hiding rules.