Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/TabManager/TabManagerWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/TabManager/TabManagerWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -41,8 +41,8 @@
     GroupByDomain = 1
     GroupByHost = 2
     
-    WebBrowserRole = Qt.UserRole + 1
-    WebWindowRole = Qt.UserRole + 2
+    WebBrowserRole = Qt.ItemDataRole.UserRole + 1
+    WebWindowRole = Qt.ItemDataRole.UserRole + 2
     
     groupTypeChanged = pyqtSignal(int)
     
@@ -60,14 +60,15 @@
         @type bool
         """
         super(TabManagerWidget, self).__init__(parent)
-        self.setWindowFlags(Qt.Window)
+        self.setWindowFlags(Qt.WindowType.Window)
         
         self.__layout = QVBoxLayout(self)
         self.__layout.setContentsMargins(0, 0, 0, 0)
         self.__tree = QTreeWidget(self)
         self.__tree.setHeaderHidden(True)
         self.__tree.setExpandsOnDoubleClick(False)
-        self.__tree.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.__tree.setContextMenuPolicy(
+            Qt.ContextMenuPolicy.CustomContextMenu)
         self.__layout.addWidget(self.__tree)
         
         self.setWindowTitle(self.tr("Tab Manager"))
@@ -244,11 +245,13 @@
         itm = QTreeWidgetItem(parentItem)
         flags = itm.flags()
         if parent:
-            flags |= Qt.ItemIsUserCheckable
+            flags |= Qt.ItemFlag.ItemIsUserCheckable
         else:
-            flags |= Qt.ItemIsUserCheckable | Qt.ItemIsTristate
+            flags |= (
+                Qt.ItemFlag.ItemIsUserCheckable | Qt.ItemFlag.ItemIsTristate
+            )
         itm.setFlags(itm.flags() | flags)
-        itm.setCheckState(0, Qt.Unchecked)
+        itm.setCheckState(0, Qt.CheckState.Unchecked)
         
         return itm
     
@@ -369,12 +372,12 @@
         selectedBrowsers = []
         for index in range(self.__tree.topLevelItemCount()):
             winItem = self.__tree.topLevelItem(index)
-            if winItem.checkState(0) == Qt.Unchecked:
+            if winItem.checkState(0) == Qt.CheckState.Unchecked:
                 continue
             
             for row in range(winItem.childCount()):
                 tabItem = winItem.child(row)
-                if tabItem.checkState(0) == Qt.Unchecked:
+                if tabItem.checkState(0) == Qt.CheckState.Unchecked:
                     continue
                 selectedBrowsers.append(
                     tabItem.data(0, TabManagerWidget.WebBrowserRole))
@@ -399,7 +402,7 @@
                 if tabItem.data(0, TabManagerWidget.WebBrowserRole) in (
                     selectedBrowsers
                 ):
-                    tabItem.setCheckState(0, Qt.Checked)
+                    tabItem.setCheckState(0, Qt.CheckState.Checked)
         
         self.__tree.expandAll()
         self.__isRefreshing = False
@@ -421,12 +424,12 @@
         
         for index in range(self.__tree.topLevelItemCount()):
             winItem = self.__tree.topLevelItem(index)
-            if winItem.checkState(0) == Qt.Unchecked:
+            if winItem.checkState(0) == Qt.CheckState.Unchecked:
                 continue
             
             for row in range(winItem.childCount()):
                 tabItem = winItem.child(row)
-                if tabItem.checkState(0) == Qt.Unchecked:
+                if tabItem.checkState(0) == Qt.CheckState.Unchecked:
                     continue
                 
                 mainWin = tabItem.data(0, TabManagerWidget.WebWindowRole)
@@ -434,7 +437,7 @@
                 
                 selectedBrowsers[mainWin].append(browser)
             
-            winItem.setCheckState(0, Qt.Unchecked)
+            winItem.setCheckState(0, Qt.CheckState.Unchecked)
         
         if selectedBrowsers:
             if command == "closeSelection":
@@ -488,7 +491,7 @@
         selected = False
         for topRow in range(self.__tree.topLevelItemCount()):
             topItm = self.__tree.topLevelItem(topRow)
-            if topItm.checkState(0) != Qt.Unchecked:
+            if topItm.checkState(0) != Qt.CheckState.Unchecked:
                 selected = True
                 break
         
@@ -583,7 +586,8 @@
             window = icon.parentWidget()
         
         if window is not None:
-            titleBarHeight = self.style().pixelMetric(QStyle.PM_TitleBarHeight)
+            titleBarHeight = self.style().pixelMetric(
+                QStyle.PixelMetric.PM_TitleBarHeight)
             
             y = max(0, window.frameGeometry().top() + titleBarHeight + 1)