Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sat Aug 04 17:32:24 2012 +0200
+++ b/APIs/Python3/eric5.api	Sat Aug 04 18:01:38 2012 +0200
@@ -1707,7 +1707,7 @@
 eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply.abort?4()
 eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply.readData?4(maxlen)
 eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply?1(request, subscription, rule, parent=None)
-eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4()
+eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(filter)
 eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addSubscription?4(subscription, refresh=True)
 eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_adBlockGroup_toggled?4(state)
 eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_searchEdit_textChanged?4(filter)
@@ -1814,7 +1814,7 @@
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.updateNow?4()
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.url?4()
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription?1(url, custom, parent=None, default=False)
-eric5.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.addRule?4()
+eric5.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.addRule?4(filter="")
 eric5.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.keyPressEvent?4(evt)
 eric5.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.refresh?4()
 eric5.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.removeRule?4()

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sat Aug 04 17:32:24 2012 +0200
+++ b/Documentation/Help/source.qhp	Sat Aug 04 18:01:38 2012 +0200
@@ -1057,6 +1057,7 @@
       <keyword name="AdBlockDialog (Constructor)" id="AdBlockDialog (Constructor)" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.__init__" />
       <keyword name="AdBlockDialog (Module)" id="AdBlockDialog (Module)" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html" />
       <keyword name="AdBlockDialog.__aboutToShowActionMenu" id="AdBlockDialog.__aboutToShowActionMenu" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.__aboutToShowActionMenu" />
+      <keyword name="AdBlockDialog.__addCustomRule" id="AdBlockDialog.__addCustomRule" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.__addCustomRule" />
       <keyword name="AdBlockDialog.__browseSubscriptions" id="AdBlockDialog.__browseSubscriptions" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.__browseSubscriptions" />
       <keyword name="AdBlockDialog.__learnAboutWritingFilters" id="AdBlockDialog.__learnAboutWritingFilters" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.__learnAboutWritingFilters" />
       <keyword name="AdBlockDialog.__load" id="AdBlockDialog.__load" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.__load" />

--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockDialog.html	Sat Aug 04 17:32:24 2012 +0200
+++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockDialog.html	Sat Aug 04 18:01:38 2012 +0200
@@ -64,6 +64,9 @@
 <td><a href="#AdBlockDialog.__aboutToShowActionMenu">__aboutToShowActionMenu</a></td>
 <td>Private slot to show the actions menu.</td>
 </tr><tr>
+<td><a href="#AdBlockDialog.__addCustomRule">__addCustomRule</a></td>
+<td>Private slot to add a custom AdBlock rule.</td>
+</tr><tr>
 <td><a href="#AdBlockDialog.__browseSubscriptions">__browseSubscriptions</a></td>
 <td>Private slot to browse the list of available AdBlock subscriptions.</td>
 </tr><tr>
@@ -130,6 +133,11 @@
 <b>__aboutToShowActionMenu</b>(<i></i>)
 <p>
         Private slot to show the actions menu.
+</p><a NAME="AdBlockDialog.__addCustomRule" ID="AdBlockDialog.__addCustomRule"></a>
+<h4>AdBlockDialog.__addCustomRule</h4>
+<b>__addCustomRule</b>(<i></i>)
+<p>
+        Private slot to add a custom AdBlock rule.
 </p><a NAME="AdBlockDialog.__browseSubscriptions" ID="AdBlockDialog.__browseSubscriptions"></a>
 <h4>AdBlockDialog.__browseSubscriptions</h4>
 <b>__browseSubscriptions</b>(<i></i>)
@@ -190,10 +198,15 @@
         Private slot to update the selected subscription.
 </p><a NAME="AdBlockDialog.addCustomRule" ID="AdBlockDialog.addCustomRule"></a>
 <h4>AdBlockDialog.addCustomRule</h4>
-<b>addCustomRule</b>(<i></i>)
+<b>addCustomRule</b>(<i>filter</i>)
 <p>
         Public slot to add a custom AdBlock rule.
-</p><a NAME="AdBlockDialog.addSubscription" ID="AdBlockDialog.addSubscription"></a>
+</p><dl>
+<dt><i>filter</i></dt>
+<dd>
+filter to be added (string)
+</dd>
+</dl><a NAME="AdBlockDialog.addSubscription" ID="AdBlockDialog.addSubscription"></a>
 <h4>AdBlockDialog.addSubscription</h4>
 <b>addSubscription</b>(<i>subscription, refresh=True</i>)
 <p>

--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockTreeWidget.html	Sat Aug 04 17:32:24 2012 +0200
+++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockTreeWidget.html	Sat Aug 04 18:01:38 2012 +0200
@@ -157,10 +157,15 @@
         Private slot handling a subscription change.
 </p><a NAME="AdBlockTreeWidget.addRule" ID="AdBlockTreeWidget.addRule"></a>
 <h4>AdBlockTreeWidget.addRule</h4>
-<b>addRule</b>(<i></i>)
+<b>addRule</b>(<i>filter=""</i>)
 <p>
         Public slot to add a new rule.
-</p><a NAME="AdBlockTreeWidget.keyPressEvent" ID="AdBlockTreeWidget.keyPressEvent"></a>
+</p><dl>
+<dt><i>filter</i></dt>
+<dd>
+filter to be added (string)
+</dd>
+</dl><a NAME="AdBlockTreeWidget.keyPressEvent" ID="AdBlockTreeWidget.keyPressEvent"></a>
 <h4>AdBlockTreeWidget.keyPressEvent</h4>
 <b>keyPressEvent</b>(<i>evt</i>)
 <p>

--- a/Helpviewer/AdBlock/AdBlockDialog.py	Sat Aug 04 17:32:24 2012 +0200
+++ b/Helpviewer/AdBlock/AdBlockDialog.py	Sat Aug 04 18:01:38 2012 +0200
@@ -122,7 +122,7 @@
         menu = self.actionButton.menu()
         menu.clear()
         
-        menu.addAction(self.trUtf8("Add Rule"), self.addCustomRule)\
+        menu.addAction(self.trUtf8("Add Rule"), self.__addCustomRule)\
             .setEnabled(subscriptionEditable)
         menu.addAction(self.trUtf8("Remove Rule"), self.__removeCustomRule)\
             .setEnabled(subscriptionEditable)
@@ -146,9 +146,19 @@
         menu.addAction(self.trUtf8("Learn more about writing rules..."),
                        self.__learnAboutWritingFilters)
     
-    def addCustomRule(self):
+    def addCustomRule(self, filter):
         """
         Public slot to add a custom AdBlock rule.
+        
+        @param filter filter to be added (string)
+        """
+        self.subscriptionsTabWidget.setCurrentIndex(
+            self.subscriptionsTabWidget.count() - 1)
+        self.__currentTreeWidget.addRule(filter)
+    
+    def __addCustomRule(self):
+        """
+        Private slot to add a custom AdBlock rule.
         """
         self.__currentTreeWidget.addRule()
     

--- a/Helpviewer/AdBlock/AdBlockTreeWidget.py	Sat Aug 04 17:32:24 2012 +0200
+++ b/Helpviewer/AdBlock/AdBlockTreeWidget.py	Sat Aug 04 18:01:38 2012 +0200
@@ -105,20 +105,23 @@
         QApplication.restoreOverrideCursor()
         QApplication.processEvents()
     
-    def addRule(self):
+    def addRule(self, filter=""):
         """
         Public slot to add a new rule.
+        
+        @param filter filter to be added (string)
         """
         if not self.__subscription.canEditRules():
             return
         
-        filter = QInputDialog.getText(
-            self,
-            self.trUtf8("Add Custom Rule"),
-            self.trUtf8("Write your rule here:"),
-            QLineEdit.Normal)
-        if filter == "":
-            return
+        if not filter:
+            filter = QInputDialog.getText(
+                self,
+                self.trUtf8("Add Custom Rule"),
+                self.trUtf8("Write your rule here:"),
+                QLineEdit.Normal)
+            if filter == "":
+                return
         
         rule = AdBlockRule(filter, self.__subscription)
         offset = self.__subscription.addRule(rule)