diff -r aedc309827c7 -r a28338eaf694 eric6/WebBrowser/AdBlock/AdBlockDialog.py
--- a/eric6/WebBrowser/AdBlock/AdBlockDialog.py Wed Sep 25 18:37:35 2019 +0200
+++ b/eric6/WebBrowser/AdBlock/AdBlockDialog.py Wed Sep 25 18:48:22 2019 +0200
@@ -121,26 +121,34 @@
"""
Private slot to show the actions menu.
"""
- subscriptionEditable = self.__currentSubscription and \
+ subscriptionEditable = (
+ self.__currentSubscription and
self.__currentSubscription.canEditRules()
- subscriptionRemovable = self.__currentSubscription and \
+ )
+ subscriptionRemovable = (
+ self.__currentSubscription and
self.__currentSubscription.canBeRemoved()
- subscriptionEnabled = self.__currentSubscription and \
+ )
+ subscriptionEnabled = (
+ self.__currentSubscription and
self.__currentSubscription.isEnabled()
+ )
menu = self.actionButton.menu()
menu.clear()
- menu.addAction(self.tr("Add Rule"), self.__addCustomRule)\
- .setEnabled(subscriptionEditable)
- menu.addAction(self.tr("Remove Rule"), self.__removeCustomRule)\
- .setEnabled(subscriptionEditable)
+ menu.addAction(
+ self.tr("Add Rule"), self.__addCustomRule
+ ).setEnabled(subscriptionEditable)
+ menu.addAction(
+ self.tr("Remove Rule"), self.__removeCustomRule
+ ).setEnabled(subscriptionEditable)
menu.addSeparator()
menu.addAction(
self.tr("Browse Subscriptions..."), self.__browseSubscriptions)
menu.addAction(
- self.tr("Remove Subscription"), self.__removeSubscription)\
- .setEnabled(subscriptionRemovable)
+ self.tr("Remove Subscription"), self.__removeSubscription
+ ).setEnabled(subscriptionRemovable)
if self.__currentSubscription:
menu.addSeparator()
if subscriptionEnabled:
@@ -150,8 +158,8 @@
menu.addAction(txt, self.__switchSubscriptionEnabled)
menu.addSeparator()
menu.addAction(
- self.tr("Update Subscription"), self.__updateSubscription)\
- .setEnabled(not subscriptionEditable)
+ self.tr("Update Subscription"), self.__updateSubscription
+ ).setEnabled(not subscriptionEditable)
menu.addAction(
self.tr("Update All Subscriptions"),
self.__updateAllSubscriptions)
@@ -217,8 +225,9 @@
Private slot to remove the selected subscription.
"""
requiresTitles = []
- requiresSubscriptions = \
+ requiresSubscriptions = (
self.__manager.getRequiresSubscriptions(self.__currentSubscription)
+ )
for subscription in requiresSubscriptions:
requiresTitles.append(subscription.title())
if requiresTitles:
@@ -272,8 +281,9 @@
icon = UI.PixmapCache.getIcon("adBlockPlus.png")
else:
# disable dependent ones as well
- requiresSubscriptions = \
+ requiresSubscriptions = (
self.__manager.getRequiresSubscriptions(subscription)
+ )
icon = UI.PixmapCache.getIcon("adBlockPlusDisabled.png")
requiresSubscriptions.append(subscription)
for sub in requiresSubscriptions:
@@ -310,14 +320,17 @@
@type int
"""
if index != -1:
- self.__currentTreeWidget = \
+ self.__currentTreeWidget = (
self.subscriptionsTabWidget.widget(index)
- self.__currentSubscription = \
+ )
+ self.__currentSubscription = (
self.__currentTreeWidget.subscription()
+ )
- isEasyList = \
+ isEasyList = (
self.__currentSubscription.url().toString().startswith(
self.__manager.getDefaultSubscriptionUrl())
+ )
self.useLimitedEasyListCheckBox.setVisible(isEasyList)
@pyqtSlot(str)
