Helpviewer/AdBlock/AdBlockManager.py

changeset 956
f3e1500da1df
parent 945
8cd4d08fa9f6
child 992
566e87428fc8
equal deleted inserted replaced
954:a096fdc38f71 956:f3e1500da1df
218 Private method to load the set of subscriptions. 218 Private method to load the set of subscriptions.
219 """ 219 """
220 if self.__subscriptionsLoaded: 220 if self.__subscriptionsLoaded:
221 return 221 return
222 222
223 defaultSubscriptionUrl = \
224 "abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList"
223 defaultSubscriptions = [] 225 defaultSubscriptions = []
224 defaultSubscriptions.append( 226 defaultSubscriptions.append(
225 bytes(self.__customSubscriptionUrl().toEncoded()).decode()) 227 bytes(self.__customSubscriptionUrl().toEncoded()).decode())
226 defaultSubscriptions.append( 228 defaultSubscriptions.append(defaultSubscriptionUrl)
227 "abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList")
228 229
229 subscriptions = Preferences.getHelp("AdBlockSubscriptions") 230 subscriptions = Preferences.getHelp("AdBlockSubscriptions")
230 if len(subscriptions) == 0: 231 if len(subscriptions) == 0:
231 subscriptions = defaultSubscriptions 232 subscriptions = defaultSubscriptions
232 for subscription in subscriptions: 233 for subscription in subscriptions:
233 url = QUrl.fromEncoded(subscription.encode()) 234 url = QUrl.fromEncoded(subscription.encode())
234 adBlockSubscription = AdBlockSubscription(url, self) 235 adBlockSubscription = AdBlockSubscription(url, self,
236 subscription == defaultSubscriptionUrl)
235 adBlockSubscription.rulesChanged.connect(self.rulesChanged) 237 adBlockSubscription.rulesChanged.connect(self.rulesChanged)
236 adBlockSubscription.changed.connect(self.rulesChanged) 238 adBlockSubscription.changed.connect(self.rulesChanged)
237 self.__subscriptions.append(adBlockSubscription) 239 self.__subscriptions.append(adBlockSubscription)
238 240
239 self.__subscriptionsLoaded = True 241 self.__subscriptionsLoaded = True

eric ide

mercurial