diff -r 27f636beebad -r 2c730d5fd177 eric6/WebBrowser/AdBlock/AdBlockTreeWidget.py
--- a/eric6/WebBrowser/AdBlock/AdBlockTreeWidget.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/AdBlock/AdBlockTreeWidget.py Tue Mar 02 17:17:09 2021 +0100
@@ -38,7 +38,7 @@
self.__ruleToBeSelected = ""
self.__itemChangingBlock = False
- self.setContextMenuPolicy(Qt.CustomContextMenu)
+ self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
self.setDefaultItemShowMode(E5TreeWidget.ItemsExpanded)
self.setHeaderHidden(True)
self.setAlternatingRowColors(True)
@@ -67,11 +67,13 @@
if not bool(self.__topItem) and bool(rule):
self.__ruleToBeSelected = rule.filter()
elif self.__ruleToBeSelected:
- items = self.findItems(self.__ruleToBeSelected, Qt.MatchRecursive)
+ items = self.findItems(
+ self.__ruleToBeSelected, Qt.MatchFlag.MatchRecursive)
if items:
item = items[0]
self.setCurrentItem(item)
- self.scrollToItem(item, QAbstractItemView.PositionAtCenter)
+ self.scrollToItem(
+ item, QAbstractItemView.ScrollHint.PositionAtCenter)
self.__ruleToBeSelected = ""
@@ -97,9 +99,9 @@
for rule in allRules:
item = QTreeWidgetItem(self.__topItem)
item.setText(0, rule.filter())
- item.setData(0, Qt.UserRole, index)
+ item.setData(0, Qt.ItemDataRole.UserRole, index)
if self.__subscription.canEditRules():
- item.setFlags(item.flags() | Qt.ItemIsEditable)
+ item.setFlags(item.flags() | Qt.ItemFlag.ItemIsEditable)
self.__adjustItemFeatures(item, rule)
index += 1
@@ -122,7 +124,7 @@
self,
self.tr("Add Custom Rule"),
self.tr("Write your rule here:"),
- QLineEdit.Normal)
+ QLineEdit.EchoMode.Normal)
if not ok or filterRule == "":
return
@@ -142,7 +144,7 @@
):
return
- offset = item.data(0, Qt.UserRole)
+ offset = item.data(0, Qt.ItemDataRole.UserRole)
self.__subscription.removeRule(offset)
self.deleteItem(item)
@@ -181,14 +183,20 @@
self.__itemChangingBlock = True
- offset = itm.data(0, Qt.UserRole)
+ offset = itm.data(0, Qt.ItemDataRole.UserRole)
oldRule = self.__subscription.rule(offset)
- if itm.checkState(0) == Qt.Unchecked and oldRule.isEnabled():
+ if (
+ itm.checkState(0) == Qt.CheckState.Unchecked and
+ oldRule.isEnabled()
+ ):
# Disable rule
rule = self.__subscription.setRuleEnabled(offset, False)
self.__adjustItemFeatures(itm, rule)
- elif itm.checkState(0) == Qt.Checked and not oldRule.isEnabled():
+ elif (
+ itm.checkState(0) == Qt.CheckState.Checked and
+ not oldRule.isEnabled()
+ ):
# Enable rule
rule = self.__subscription.setRuleEnabled(offset, True)
self.__adjustItemFeatures(itm, rule)
@@ -233,23 +241,23 @@
if not rule.isEnabled():
font = QFont()
font.setItalic(True)
- itm.setForeground(0, QColor(Qt.gray))
+ itm.setForeground(0, QColor(Qt.GlobalColor.gray))
if not rule.isComment() and not rule.isHeader():
- itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable)
- itm.setCheckState(0, Qt.Unchecked)
+ itm.setFlags(itm.flags() | Qt.ItemFlag.ItemIsUserCheckable)
+ itm.setCheckState(0, Qt.CheckState.Unchecked)
itm.setFont(0, font)
return
- itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable)
- itm.setCheckState(0, Qt.Checked)
+ itm.setFlags(itm.flags() | Qt.ItemFlag.ItemIsUserCheckable)
+ itm.setCheckState(0, Qt.CheckState.Checked)
if rule.isCSSRule():
- itm.setForeground(0, QColor(Qt.darkBlue))
+ itm.setForeground(0, QColor(Qt.GlobalColor.darkBlue))
itm.setFont(0, QFont())
elif rule.isException():
- itm.setForeground(0, QColor(Qt.darkGreen))
+ itm.setForeground(0, QColor(Qt.GlobalColor.darkGreen))
itm.setFont(0, QFont())
else:
itm.setForeground(0, QColor())
@@ -263,11 +271,11 @@
@type QKeyEvent
"""
if (
- evt.key() == Qt.Key_C and
- evt.modifiers() & Qt.ControlModifier
+ evt.key() == Qt.Key.Key_C and
+ evt.modifiers() & Qt.KeyboardModifier.ControlModifier
):
self.__copyFilter()
- elif evt.key() == Qt.Key_Delete:
+ elif evt.key() == Qt.Key.Key_Delete:
self.removeRule()
else:
super(AdBlockTreeWidget, self).keyPressEvent(evt)
