Mercurial Repositories > eric / file diff

--- a/APIs/Python3/eric5.api	Thu Jul 26 18:38:15 2012 +0200
+++ b/APIs/Python3/eric5.api	Sat Jul 28 11:23:12 2012 +0200
@@ -1684,7 +1684,7 @@
 eric5.Helpviewer.AdBlock.AdBlockAccessHandler.AdBlockAccessHandler.createRequest?4(op, request, outgoingData=None)
 eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply.abort?4()
 eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply.readData?4(maxlen)
-eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply?1(request, rule, parent=None)
+eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply?1(request, subscription, rule, parent=None)
 eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(rule="")
 eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.model?4()
 eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_updateSpinBox_valueChanged?4(value)
@@ -1693,6 +1693,8 @@
 eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.addSubscription?4(subscription)
 eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.close?4()
 eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.customRules?4()
+eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.elementHidingRules?4()
+eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.elementHidingRulesForDomain?4(url)
 eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.isEnabled?4()
 eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.load?4()
 eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.network?4()
@@ -1719,28 +1721,45 @@
 eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.subscriptionIndex?4(subscription)
 eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel?1(parent=None)
 eric5.Helpviewer.AdBlock.AdBlockNetwork.AdBlockNetwork.block?4(request)
-eric5.Helpviewer.AdBlock.AdBlockPage.AdBlockPage.applyRulesToPage?4(page)
+eric5.Helpviewer.AdBlock.AdBlockNetwork.AdBlockNetwork.canRunOnScheme?4(scheme)
+eric5.Helpviewer.AdBlock.AdBlockPage.AdBlockPage.hideBlockedPageEntries?4(page)
+eric5.Helpviewer.AdBlock.AdBlockPage.AdBlockedPageEntry.urlString?4()
+eric5.Helpviewer.AdBlock.AdBlockPage.AdBlockedPageEntry?1(rule, url)
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.cssSelector?4()
 eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.filter?4()
 eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.isCSSRule?4()
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.isComment?4()
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.isDocument?4()
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.isDomainRestricted?4()
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.isElementHiding?4()
 eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.isEnabled?4()
 eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.isException?4()
-eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.networkMatch?4(encodedUrl)
-eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.regExpPattern?4()
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.isInternalDisabled?4()
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.isSlow?4()
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.matchDomain?4(domain)
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.matchObject?4(req)
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.matchSubdocument?4(req)
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.matchThirdParty?4(req)
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.matchXmlHttpRequest?4(req)
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.networkMatch?4(request, domain, encodedUrl)
 eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setEnabled?4(enabled)
 eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setException?4(exception)
 eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filter)
-eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setPattern?4(pattern, isRegExp)
+eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.urlMatch?4(url)
 eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule?1(filter="")
+eric5.Helpviewer.AdBlock.AdBlockRule.toSecondLevelDomain?4(url)
+eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.adBlockDisabledForUrl?4(url)
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.addRule?4(rule)
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.allRules?4()
-eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.allow?4(urlString)
-eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.block?4(urlString)
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.changed?7
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.checkForUpdate?4()
+eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.elemHideDisabledForUrl?4(url)
+eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.elementHidingRules?4()
+eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.elementHidingRulesForDomain?4(domain)
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.isEnabled?4()
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.lastUpdate?4()
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.location?4()
-eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.pageRules?4()
+eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.match?4(req, urlDomain, urlString)
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.removeRule?4(offset)
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.replaceRule?4(rule, offset)
 eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.rulesChanged?7
@@ -2194,8 +2213,10 @@
 eric5.Helpviewer.HelpBrowserWV.HelpBrowser?1(mainWindow, parent=None, name="")
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage._webPluginFactory?8
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.acceptNavigationRequest?4(frame, request, type_)
+eric5.Helpviewer.HelpBrowserWV.HelpWebPage.addAdBlockRule?4(rule, url)
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.event?4(evt)
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.extension?4(extension, option, output)
+eric5.Helpviewer.HelpBrowserWV.HelpWebPage.getAdBlockedPageEntries?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.getSslInfo?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.hasValidSslInfo?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.pageAttributeId?4()
@@ -2203,6 +2224,7 @@
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.setUserAgent?4(agent)
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.showSslInfo?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.supportsExtension?4(extension)
+eric5.Helpviewer.HelpBrowserWV.HelpWebPage.url?4()
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.userAgent?4(resolveEmpty=False)
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.userAgentForUrl?4(url)
 eric5.Helpviewer.HelpBrowserWV.HelpWebPage.webPluginFactory?4()