Mercurial Repositories > eric / file comparison
comparison: Helpviewer/AdBlock/AdBlockManager.py
Helpviewer/AdBlock/AdBlockManager.py
- changeset 12
- 1d8dd9706f46
- parent 0
- de9c2efb9d02
- child 13
- 1af94a91f439
equal
deleted
inserted
replaced
| 11:b0996e4a289e | 12:1d8dd9706f46 |
|---|---|
| 11 | 11 |
| 12 from PyQt4.QtCore import * | 12 from PyQt4.QtCore import * |
| 13 | 13 |
| 14 import Helpviewer.HelpWindow | 14 import Helpviewer.HelpWindow |
| 15 | 15 |
| 16 from AdBlockNetwork import AdBlockNetwork | 16 from .AdBlockNetwork import AdBlockNetwork |
| 17 from AdBlockPage import AdBlockPage | 17 from .AdBlockPage import AdBlockPage |
| 18 from AdBlockSubscription import AdBlockSubscription | 18 from .AdBlockSubscription import AdBlockSubscription |
| 19 from AdBlockDialog import AdBlockDialog | 19 from .AdBlockDialog import AdBlockDialog |
| 20 | 20 |
| 21 from Utilities.AutoSaver import AutoSaver | 21 from Utilities.AutoSaver import AutoSaver |
| 22 import Utilities | 22 import Utilities |
| 23 import Preferences | 23 import Preferences |
| 24 | 24 |
| 112 Private method to generate the URL for custom subscriptions. | 112 Private method to generate the URL for custom subscriptions. |
| 113 | 113 |
| 114 @return URL for custom subscriptions (QUrl) | 114 @return URL for custom subscriptions (QUrl) |
| 115 """ | 115 """ |
| 116 location = self.__customSubscriptionLocation() | 116 location = self.__customSubscriptionLocation() |
| 117 encodedUrl = unicode(location.toEncoded()) | 117 encodedUrl = bytes(location.toEncoded()).decode() |
| 118 url = QUrl("abp:subscribe?location=%s&title=%s" % \ | 118 url = QUrl("abp:subscribe?location=%s&title=%s" % \ |
| 119 (encodedUrl, self.trUtf8("Custom Rules"))) | 119 (encodedUrl, self.trUtf8("Custom Rules"))) |
| 120 return url | 120 return url |
| 121 | 121 |
| 122 def customRules(self): | 122 def customRules(self): |
| 193 Preferences.setHelp("AdBlockEnabled", int(self.__enabled)) | 193 Preferences.setHelp("AdBlockEnabled", int(self.__enabled)) |
| 194 subscriptions = [] | 194 subscriptions = [] |
| 195 for subscription in self.__subscriptions: | 195 for subscription in self.__subscriptions: |
| 196 if subscription is None: | 196 if subscription is None: |
| 197 continue | 197 continue |
| 198 subscriptions.append(unicode(subscription.url().toEncoded())) | 198 subscriptions.append(bytes(subscription.url().toEncoded()).decode()) |
| 199 subscription.saveRules() | 199 subscription.saveRules() |
| 200 Preferences.setHelp("AdBlockSubscriptions", subscriptions) | 200 Preferences.setHelp("AdBlockSubscriptions", subscriptions) |
| 201 | 201 |
| 202 def load(self): | 202 def load(self): |
| 203 """ | 203 """ |
| 210 | 210 |
| 211 self.__enabled = bool(Preferences.getHelp("AdBlockEnabled")) | 211 self.__enabled = bool(Preferences.getHelp("AdBlockEnabled")) |
| 212 | 212 |
| 213 defaultSubscriptions = [] | 213 defaultSubscriptions = [] |
| 214 defaultSubscriptions.append( | 214 defaultSubscriptions.append( |
| 215 unicode(self.__customSubscriptionUrl().toEncoded())) | 215 bytes(self.__customSubscriptionUrl().toEncoded()).decode()) |
| 216 defaultSubscriptions.append( | 216 defaultSubscriptions.append( |
| 217 "abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList") | 217 "abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList") |
| 218 | 218 |
| 219 subscriptions = Preferences.getHelp("AdBlockSubscriptions") | 219 subscriptions = Preferences.getHelp("AdBlockSubscriptions") |
| 220 if len(subscriptions) == 0: | 220 if len(subscriptions) == 0: |
