221 |
221 |
222 self.__subscriptions.insert(-1, subscription) |
222 self.__subscriptions.insert(-1, subscription) |
223 |
223 |
224 subscription.rulesChanged.connect(self.rulesChanged) |
224 subscription.rulesChanged.connect(self.rulesChanged) |
225 subscription.changed.connect(self.rulesChanged) |
225 subscription.changed.connect(self.rulesChanged) |
|
226 subscription.enabledChanged.connect(self.rulesChanged) |
226 |
227 |
227 self.rulesChanged.emit() |
228 self.rulesChanged.emit() |
228 |
229 |
229 def save(self): |
230 def save(self): |
230 """ |
231 """ |
282 if subscription.startswith(self.__customSubscriptionUrlString): |
283 if subscription.startswith(self.__customSubscriptionUrlString): |
283 break |
284 break |
284 else: |
285 else: |
285 subscriptions.append(self.__customSubscriptionUrlString) |
286 subscriptions.append(self.__customSubscriptionUrlString) |
286 else: |
287 else: |
287 subscriptions = [self.__defaultSubscriptionUrlString, self.__customSubscriptionUrlString] |
288 subscriptions = [self.__defaultSubscriptionUrlString, |
|
289 self.__customSubscriptionUrlString] |
288 for subscription in subscriptions: |
290 for subscription in subscriptions: |
289 url = QUrl.fromEncoded(subscription.encode()) |
291 url = QUrl.fromEncoded(subscription.encode()) |
290 adBlockSubscription = AdBlockSubscription(url, |
292 adBlockSubscription = AdBlockSubscription(url, |
291 subscription.startswith(self.__customSubscriptionUrlString), |
293 subscription.startswith(self.__customSubscriptionUrlString), |
292 self, |
294 self, |
293 subscription.startswith(self.__defaultSubscriptionUrlString)) |
295 subscription.startswith(self.__defaultSubscriptionUrlString)) |
294 adBlockSubscription.rulesChanged.connect(self.rulesChanged) |
296 adBlockSubscription.rulesChanged.connect(self.rulesChanged) |
295 adBlockSubscription.changed.connect(self.rulesChanged) |
297 adBlockSubscription.changed.connect(self.rulesChanged) |
|
298 adBlockSubscription.enabledChanged.connect(self.rulesChanged) |
296 self.__subscriptions.append(adBlockSubscription) |
299 self.__subscriptions.append(adBlockSubscription) |
297 |
300 |
298 self.__subscriptionsLoaded = True |
301 self.__subscriptionsLoaded = True |
299 |
302 |
300 def loadRequiredSubscription(self, location, title): |
303 def loadRequiredSubscription(self, location, title): |