Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -42,7 +42,7 @@
             self.notifList = QTreeWidget()
             self.notifList.setAlternatingRowColors(True)
             self.notifList.setSelectionMode(
-                QAbstractItemView.ExtendedSelection)
+                QAbstractItemView.SelectionMode.ExtendedSelection)
             self.notifList.setRootIsDecorated(False)
             self.notifList.setItemsExpandable(False)
             self.notifList.setAllColumnsShowFocus(True)
@@ -57,7 +57,8 @@
         
         self.geoList = QTreeWidget()
         self.geoList.setAlternatingRowColors(True)
-        self.geoList.setSelectionMode(QAbstractItemView.ExtendedSelection)
+        self.geoList.setSelectionMode(
+            QAbstractItemView.SelectionMode.ExtendedSelection)
         self.geoList.setRootIsDecorated(False)
         self.geoList.setItemsExpandable(False)
         self.geoList.setAllColumnsShowFocus(True)
@@ -72,7 +73,8 @@
         
         self.micList = QTreeWidget()
         self.micList.setAlternatingRowColors(True)
-        self.micList.setSelectionMode(QAbstractItemView.ExtendedSelection)
+        self.micList.setSelectionMode(
+            QAbstractItemView.SelectionMode.ExtendedSelection)
         self.micList.setRootIsDecorated(False)
         self.micList.setItemsExpandable(False)
         self.micList.setAllColumnsShowFocus(True)
@@ -87,7 +89,8 @@
         
         self.camList = QTreeWidget()
         self.camList.setAlternatingRowColors(True)
-        self.camList.setSelectionMode(QAbstractItemView.ExtendedSelection)
+        self.camList.setSelectionMode(
+            QAbstractItemView.SelectionMode.ExtendedSelection)
         self.camList.setRootIsDecorated(False)
         self.camList.setItemsExpandable(False)
         self.camList.setAllColumnsShowFocus(True)
@@ -102,7 +105,8 @@
         
         self.micCamList = QTreeWidget()
         self.micCamList.setAlternatingRowColors(True)
-        self.micCamList.setSelectionMode(QAbstractItemView.ExtendedSelection)
+        self.micCamList.setSelectionMode(
+            QAbstractItemView.SelectionMode.ExtendedSelection)
         self.micCamList.setRootIsDecorated(False)
         self.micCamList.setItemsExpandable(False)
         self.micCamList.setAllColumnsShowFocus(True)
@@ -118,7 +122,7 @@
         self.mouseLockList = QTreeWidget()
         self.mouseLockList.setAlternatingRowColors(True)
         self.mouseLockList.setSelectionMode(
-            QAbstractItemView.ExtendedSelection)
+            QAbstractItemView.SelectionMode.ExtendedSelection)
         self.mouseLockList.setRootIsDecorated(False)
         self.mouseLockList.setItemsExpandable(False)
         self.mouseLockList.setAllColumnsShowFocus(True)
@@ -136,7 +140,7 @@
             self.deskVidList = QTreeWidget()
             self.deskVidList.setAlternatingRowColors(True)
             self.deskVidList.setSelectionMode(
-                QAbstractItemView.ExtendedSelection)
+                QAbstractItemView.SelectionMode.ExtendedSelection)
             self.deskVidList.setRootIsDecorated(False)
             self.deskVidList.setItemsExpandable(False)
             self.deskVidList.setAllColumnsShowFocus(True)
@@ -152,7 +156,7 @@
             self.deskAudVidList = QTreeWidget()
             self.deskAudVidList.setAlternatingRowColors(True)
             self.deskAudVidList.setSelectionMode(
-                QAbstractItemView.ExtendedSelection)
+                QAbstractItemView.SelectionMode.ExtendedSelection)
             self.deskAudVidList.setRootIsDecorated(False)
             self.deskAudVidList.setItemsExpandable(False)
             self.deskAudVidList.setAllColumnsShowFocus(True)
@@ -183,24 +187,28 @@
         self.setTabOrder(self.removeButton, self.removeAllButton)
         
         self.__permissionStrings = {
-            QWebEnginePage.PermissionGrantedByUser: self.tr("Allow"),
-            QWebEnginePage.PermissionDeniedByUser: self.tr("Deny"),
+            QWebEnginePage.PermissionPolicy.PermissionGrantedByUser:
+                self.tr("Allow"),
+            QWebEnginePage.PermissionPolicy.PermissionDeniedByUser:
+                self.tr("Deny"),
         }
         
         self.__permissionsLists = {
-            QWebEnginePage.Geolocation: self.geoList,
-            QWebEnginePage.MediaAudioCapture: self.micList,
-            QWebEnginePage.MediaVideoCapture: self.camList,
-            QWebEnginePage.MediaAudioVideoCapture: self.micCamList,
-            QWebEnginePage.MouseLock: self.mouseLockList,
+            QWebEnginePage.Feature.Geolocation: self.geoList,
+            QWebEnginePage.Feature.MediaAudioCapture: self.micList,
+            QWebEnginePage.Feature.MediaVideoCapture: self.camList,
+            QWebEnginePage.Feature.MediaAudioVideoCapture: self.micCamList,
+            QWebEnginePage.Feature.MouseLock: self.mouseLockList,
         }
         if hasattr(QWebEnginePage, "DesktopVideoCapture"):
             self.__permissionsLists.update({
-                QWebEnginePage.DesktopVideoCapture: self.deskVidList,
-                QWebEnginePage.DesktopAudioVideoCapture: self.deskAudVidList,
+                QWebEnginePage.Feature.DesktopVideoCapture:
+                    self.deskVidList,
+                QWebEnginePage.Feature.DesktopAudioVideoCapture:
+                    self.deskAudVidList,
             })
         if hasattr(QWebEnginePage, "Notifications"):
-            self.__permissionsLists[QWebEnginePage.Notifications] = (
+            self.__permissionsLists[QWebEnginePage.Feature.Notifications] = (
                 self.notifList
             )
         
@@ -210,7 +218,7 @@
                     itm = QTreeWidgetItem(
                         permissionsList,
                         [host, self.__permissionStrings[permission]])
-                    itm.setData(0, Qt.UserRole, permission)
+                    itm.setData(0, Qt.ItemDataRole.UserRole, permission)
         
         self.__previousCurrent = -1
         self.tabWidget.currentChanged.connect(self.__currentTabChanged)
@@ -285,13 +293,13 @@
         featurePermissions = {}
         for feature, permissionsList in self.__permissionsLists.items():
             featurePermissions[feature] = {
-                QWebEnginePage.PermissionGrantedByUser: [],
-                QWebEnginePage.PermissionDeniedByUser: [],
+                QWebEnginePage.PermissionPolicy.PermissionGrantedByUser: [],
+                QWebEnginePage.PermissionPolicy.PermissionDeniedByUser: [],
             }
             for row in range(permissionsList.topLevelItemCount()):
                 itm = permissionsList.topLevelItem(row)
                 host = itm.text(0)
-                permission = itm.data(0, Qt.UserRole)
+                permission = itm.data(0, Qt.ItemDataRole.UserRole)
                 featurePermissions[feature][permission].append(host)
         
         return featurePermissions