Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserWindow.py	Sun Mar 13 14:56:13 2016 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Sun Mar 13 20:54:42 2016 +0100
@@ -53,7 +53,7 @@
 from UI.Info import Version
 ##
 ##from .data import icons_rc          # __IGNORE_WARNING__
-##from .data import html_rc           # __IGNORE_WARNING__
+from .data import html_rc           # __IGNORE_WARNING__
 from .data import javascript_rc     # __IGNORE_WARNING__
 
 
@@ -89,7 +89,7 @@
     _bookmarksManager = None
     _historyManager = None
     _passwordManager = None
-##    _adblockManager = None
+    _adblockManager = None
     _downloadManager = None
     _feedsManager = None
 ##    _userAgentsManager = None
@@ -155,8 +155,7 @@
 ##            from .HelpSearchWidget import HelpSearchWidget
             from .WebBrowserView import WebBrowserView
             from .WebBrowserTabWidget import WebBrowserTabWidget
-            # TODO: AdBlock
-##            from .AdBlock.AdBlockIcon import AdBlockIcon
+            from .AdBlock.AdBlockIcon import AdBlockIcon
             from .VirusTotal.VirusTotalApi import VirusTotalAPI
             
             # TODO: allow using Qt Help even if not called from eric6
@@ -286,16 +285,15 @@
             self.__tabWidget.newBrowser(home)
             self.__tabWidget.currentBrowser().setFocus()
             
-            # TODO: AdBlock
-##            self.__adBlockIcon = AdBlockIcon(self)
-##            self.statusBar().addPermanentWidget(self.__adBlockIcon)
-##            self.__adBlockIcon.setEnabled(
-##                Preferences.getWebBrowser("AdBlockEnabled"))
-##            self.__tabWidget.currentChanged[int].connect(
-##                self.__adBlockIcon.currentChanged)
-##            self.__tabWidget.sourceChanged.connect(
-##                self.__adBlockIcon.sourceChanged)
-##            
+            self.__adBlockIcon = AdBlockIcon(self)
+            self.statusBar().addPermanentWidget(self.__adBlockIcon)
+            self.__adBlockIcon.setEnabled(
+                Preferences.getWebBrowser("AdBlockEnabled"))
+            self.__tabWidget.currentChanged[int].connect(
+                self.__adBlockIcon.currentChanged)
+            self.__tabWidget.sourceChanged.connect(
+                self.__adBlockIcon.sourceChanged)
+            
             self.networkIcon = E5NetworkIcon(self)
             self.statusBar().addPermanentWidget(self.networkIcon)
             
@@ -2553,9 +2551,8 @@
         
         self.passwordManager().close()
         
-        # TODO: AdBlock
-##        self.adBlockManager().close()
-##        
+        self.adBlockManager().close()
+        
         # TODO: UserAgents
 ##        self.userAgentsManager().close()
 ##        
@@ -2633,7 +2630,8 @@
         """
         Private slot called to handle the reload action.
         """
-        self.currentBrowser().reloadBypassingCache()
+##        self.currentBrowser().reloadBypassingCache()
+        self.currentBrowser().reload()
     
     def __stopLoading(self):
         """
@@ -3577,28 +3575,27 @@
         
         return cls._passwordManager
     
-    # TODO: AdBlock
-##    @classmethod
-##    def adBlockManager(cls):
-##        """
-##        Class method to get a reference to the AdBlock manager.
-##        
-##        @return reference to the AdBlock manager (AdBlockManager)
-##        """
-##        if cls._adblockManager is None:
-##            from .AdBlock.AdBlockManager import AdBlockManager
-##            cls._adblockManager = AdBlockManager()
-##        
-##        return cls._adblockManager
-##    
-##    def adBlockIcon(self):
-##        """
-##        Public method to get a reference to the AdBlock icon.
-##        
-##        @return reference to the AdBlock icon (AdBlockIcon)
-##        """
-##        return self.__adBlockIcon
-##    
+    @classmethod
+    def adBlockManager(cls):
+        """
+        Class method to get a reference to the AdBlock manager.
+        
+        @return reference to the AdBlock manager (AdBlockManager)
+        """
+        if cls._adblockManager is None:
+            from .AdBlock.AdBlockManager import AdBlockManager
+            cls._adblockManager = AdBlockManager()
+        
+        return cls._adblockManager
+    
+    def adBlockIcon(self):
+        """
+        Public method to get a reference to the AdBlock icon.
+        
+        @return reference to the AdBlock icon (AdBlockIcon)
+        """
+        return self.__adBlockIcon
+    
     @classmethod
     def downloadManager(cls):
         """