Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserWindow.py	Sat Mar 19 16:05:11 2016 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Sat Mar 19 18:18:09 2016 +0100
@@ -1568,23 +1568,22 @@
             self.passwordsAct.triggered.connect(self.__showPasswordsDialog)
         self.__actions.append(self.passwordsAct)
         
-        # TODO: AdBlock
-##        self.adblockAct = E5Action(
-##            self.tr('Ad Block'),
-##            UI.PixmapCache.getIcon("adBlockPlus.png"),
-##            self.tr('&Ad Block...'),
-##            0, 0,
-##            self, 'webbrowser_adblock')
-##        self.adblockAct.setStatusTip(self.tr(
-##            'Configure AdBlock subscriptions and rules'))
-##        self.adblockAct.setWhatsThis(self.tr(
-##            """<b>Ad Block...</b>"""
-##            """<p>Opens a dialog to configure AdBlock subscriptions and"""
-##            """ rules.</p>"""
-##        ))
-##        if not self.__initShortcutsOnly:
-##            self.adblockAct.triggered.connect(self.__showAdBlockDialog)
-##        self.__actions.append(self.adblockAct)
+        self.adblockAct = E5Action(
+            self.tr('Ad Block'),
+            UI.PixmapCache.getIcon("adBlockPlus.png"),
+            self.tr('&Ad Block...'),
+            0, 0,
+            self, 'webbrowser_adblock')
+        self.adblockAct.setStatusTip(self.tr(
+            'Configure AdBlock subscriptions and rules'))
+        self.adblockAct.setWhatsThis(self.tr(
+            """<b>Ad Block...</b>"""
+            """<p>Opens a dialog to configure AdBlock subscriptions and"""
+            """ rules.</p>"""
+        ))
+        if not self.__initShortcutsOnly:
+            self.adblockAct.triggered.connect(self.__showAdBlockDialog)
+        self.__actions.append(self.adblockAct)
         
         # TODO: Click2Flash (?)
 ##        self.flashblockAct = E5Action(
@@ -1911,7 +1910,7 @@
         menu.addAction(self.zoomValuesAct)
         menu.addAction(self.manageIconsAct)
         menu.addSeparator()
-##        menu.addAction(self.adblockAct)
+        menu.addAction(self.adblockAct)
 ##        menu.addAction(self.flashblockAct)
 ##        menu.addSeparator()
         self.__settingsMenu = menu
@@ -3394,13 +3393,12 @@
         """
         self.networkManager().showSslErrorExceptionsDialog()
     
-    # TODO: AdBlock
-##    def __showAdBlockDialog(self):
-##        """
-##        Private slot to show the AdBlock configuration dialog.
-##        """
-##        self.adBlockManager().showDialog()
-##        
+    def __showAdBlockDialog(self):
+        """
+        Private slot to show the AdBlock configuration dialog.
+        """
+        self.adBlockManager().showDialog()
+        
     # TODO: Click2Flash
 ##    def __showClickToFlashDialog(self):
 ##        """