diff -r 4ee26909ac0d -r 561f2bd9cfb9 WebBrowser/WebBrowserView.py
--- a/WebBrowser/WebBrowserView.py Sat Mar 19 16:05:11 2016 +0100
+++ b/WebBrowser/WebBrowserView.py Sat Mar 19 18:18:09 2016 +0100
@@ -551,9 +551,8 @@
self.__createContextMenu(self.__menu, hitTest)
- # TODO: AdBlock
-## if not hitTest.isContentEditable() and not hitTest.isContentSelected():
-## self.__menu.addAction(self.__mw.adBlockIcon().menuAction())
+ if not hitTest.isContentEditable() and not hitTest.isContentSelected():
+ self.__menu.addAction(self.__mw.adBlockIcon().menuAction())
if Preferences.getWebBrowser("WebInspectorEnabled"):
self.__menu.addSeparator()
@@ -688,12 +687,11 @@
UI.PixmapCache.getIcon("mailSend.png"),
self.tr("Send Image Link"),
self.__sendLink).setData(hitTest.imageUrl())
- # TODO: AdBlock
-## menu.addSeparator()
-## menu.addAction(
-## UI.PixmapCache.getIcon("adBlockPlus.png"),
-## self.tr("Block Image"), self.__blockImage)\
-## .setData(hitTest.imageUrl().toString())
+ menu.addSeparator()
+ menu.addAction(
+ UI.PixmapCache.getIcon("adBlockPlus.png"),
+ self.tr("Block Image"), self.__blockImage)\
+ .setData(hitTest.imageUrl().toString())
if Preferences.getWebBrowser("VirusTotalEnabled") and \
Preferences.getWebBrowser("VirusTotalServiceKey") != "":
menu.addAction(
@@ -1038,16 +1036,15 @@
## """
## self.triggerPageAction(QWebEnginePage.CopyImageToClipboard)
- # TODO: AdBlock
-## def __blockImage(self):
-## """
-## Private slot to add a block rule for an image URL.
-## """
-## import WebBrowser.WebBrowserWindow
-## act = self.sender()
-## url = act.data()
-## dlg = WebBrowser.WebBrowserWindow.WebBrowserWindow.adBlockManager().showDialog()
-## dlg.addCustomRule(url)
+ def __blockImage(self):
+ """
+ Private slot to add a block rule for an image URL.
+ """
+ from WebBrowser.WebBrowserWindow import WebBrowserWindow
+ act = self.sender()
+ url = act.data()
+ dlg = WebBrowserWindow.adBlockManager().showDialog()
+ dlg.addCustomRule(url)
# TODO: Qt 5.6
## def __downloadMedia(self):
@@ -1535,8 +1532,8 @@
if ok:
self.__mw.historyManager().addHistoryEntry(self)
- # TODO: AdBlock
-## self.__mw.adBlockManager().page().hideBlockedPageEntries(self.page())
+ self.__mw.adBlockManager().page().hideBlockedPageEntries(
+ self.page())
self.__mw.passwordManager().completePage(self.page())
def isLoading(self):
