Mercurial Repositories > eric / file diff

diff -r 19dff9c9cf26 -r 36c4b21c9f7b WebBrowser/AdBlock/AdBlockDialog.py
--- a/WebBrowser/AdBlock/AdBlockDialog.py	Sun Mar 13 20:54:42 2016 +0100
+++ b/WebBrowser/AdBlock/AdBlockDialog.py	Mon Mar 14 20:48:01 2016 +0100
@@ -24,24 +24,30 @@
     """
     Class implementing the AdBlock configuration dialog.
     """
-    def __init__(self, parent=None):
+    def __init__(self, manager, parent=None):
         """
         Constructor
         
+        @param manager reference to the AdBlock manager (AdBlockManager)
         @param parent reference to the parent object (QWidget)
         """
         super(AdBlockDialog, self).__init__(parent)
         self.setupUi(self)
         self.setWindowFlags(Qt.Window)
         
+        self.__manager = manager
+        
         self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("adBlockPlus48.png"))
         
-        self.updateSpinBox.setValue(Preferences.getHelp("AdBlockUpdatePeriod"))
+        self.updateSpinBox.setValue(
+            Preferences.getWebBrowser("AdBlockUpdatePeriod"))
+        
+        self.__useLimited = Preferences.getWebBrowser(
+            "AdBlockUseLimitedEasyList")
+        self.useLimitedEasyListCheckBox.setChecked(self.__useLimited)
         
         self.searchEdit.setInactiveText(self.tr("Search..."))
         
-        from WebBrowser.WebBrowserWindow import WebBrowserWindow
-        self.__manager = WebBrowserWindow.adBlockManager()
         self.adBlockGroup.setChecked(self.__manager.isEnabled())
         self.__manager.requiredSubscriptionLoaded.connect(self.addSubscription)
         
@@ -301,6 +307,11 @@
                 self.subscriptionsTabWidget.widget(index)
             self.__currentSubscription = \
                 self.__currentTreeWidget.subscription()
+            
+            isEasyList = \
+                self.__currentSubscription.url().toString().startswith(
+                    self.__manager.getDefaultSubscriptionUrl())
+            self.useLimitedEasyListCheckBox.setVisible(isEasyList)
     
     @pyqtSlot(str)
     def on_searchEdit_textChanged(self, filter):
@@ -323,3 +334,17 @@
         
         if state:
             self.__load()
+    
+    def closeEvent(self, evt):
+        """
+        Public method handling a close event.
+        
+        @param evt reference to the close event
+        @type QCloseEvent
+        """
+        if self.useLimitedEasyListCheckBox.isChecked() != \
+                self.__useLimited:
+            self.__manager.setUseLimitedEasyList(
+                self.useLimitedEasyListCheckBox.isChecked())
+        
+        super(AdBlockDialog, self).closeEvent(evt)