Mercurial Repositories > eric / file diff

--- a/eric7/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Sun Aug 29 20:21:41 2021 +0200
+++ b/eric7/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Mon Aug 30 20:02:39 2021 +0200
@@ -37,23 +37,21 @@
         
         # add the various lists
         
-        if hasattr(QWebEnginePage, "Notifications"):
-            # this was re-added in Qt 5.13.0
-            self.notifList = QTreeWidget()
-            self.notifList.setAlternatingRowColors(True)
-            self.notifList.setSelectionMode(
-                QAbstractItemView.SelectionMode.ExtendedSelection)
-            self.notifList.setRootIsDecorated(False)
-            self.notifList.setItemsExpandable(False)
-            self.notifList.setAllColumnsShowFocus(True)
-            self.notifList.setObjectName("notifList")
-            self.notifList.setSortingEnabled(True)
-            self.notifList.headerItem().setText(0, self.tr("Host"))
-            self.notifList.headerItem().setText(1, self.tr("Permission"))
-            self.tabWidget.addTab(
-                self.notifList,
-                UI.PixmapCache.getIcon("notification"),
-                self.tr("Notifications"))
+        self.notifList = QTreeWidget()
+        self.notifList.setAlternatingRowColors(True)
+        self.notifList.setSelectionMode(
+            QAbstractItemView.SelectionMode.ExtendedSelection)
+        self.notifList.setRootIsDecorated(False)
+        self.notifList.setItemsExpandable(False)
+        self.notifList.setAllColumnsShowFocus(True)
+        self.notifList.setObjectName("notifList")
+        self.notifList.setSortingEnabled(True)
+        self.notifList.headerItem().setText(0, self.tr("Host"))
+        self.notifList.headerItem().setText(1, self.tr("Permission"))
+        self.tabWidget.addTab(
+            self.notifList,
+            UI.PixmapCache.getIcon("notification"),
+            self.tr("Notifications"))
         
         self.geoList = QTreeWidget()
         self.geoList.setAlternatingRowColors(True)
@@ -135,55 +133,47 @@
             UI.PixmapCache.getIcon("mouse"),
             self.tr("Mouse Lock"))
         
-        if hasattr(QWebEnginePage, "DesktopVideoCapture"):
-            # these are shown as of Qt 5.10.0/PyQt 5.10.0
-            self.deskVidList = QTreeWidget()
-            self.deskVidList.setAlternatingRowColors(True)
-            self.deskVidList.setSelectionMode(
-                QAbstractItemView.SelectionMode.ExtendedSelection)
-            self.deskVidList.setRootIsDecorated(False)
-            self.deskVidList.setItemsExpandable(False)
-            self.deskVidList.setAllColumnsShowFocus(True)
-            self.deskVidList.setObjectName("deskVidList")
-            self.deskVidList.setSortingEnabled(True)
-            self.deskVidList.headerItem().setText(0, self.tr("Host"))
-            self.deskVidList.headerItem().setText(1, self.tr("Permission"))
-            self.tabWidget.addTab(
-                self.deskVidList,
-                UI.PixmapCache.getIcon("desktopVideoCapture"),
-                self.tr("Desktop Video"))
-            
-            self.deskAudVidList = QTreeWidget()
-            self.deskAudVidList.setAlternatingRowColors(True)
-            self.deskAudVidList.setSelectionMode(
-                QAbstractItemView.SelectionMode.ExtendedSelection)
-            self.deskAudVidList.setRootIsDecorated(False)
-            self.deskAudVidList.setItemsExpandable(False)
-            self.deskAudVidList.setAllColumnsShowFocus(True)
-            self.deskAudVidList.setObjectName("deskAudVidList")
-            self.deskAudVidList.setSortingEnabled(True)
-            self.deskAudVidList.headerItem().setText(0, self.tr("Host"))
-            self.deskAudVidList.headerItem().setText(1, self.tr("Permission"))
-            self.tabWidget.addTab(
-                self.deskAudVidList,
-                UI.PixmapCache.getIcon("desktopAudioVideoCapture"),
-                self.tr("Desktop Audio && Video"))
+        self.deskVidList = QTreeWidget()
+        self.deskVidList.setAlternatingRowColors(True)
+        self.deskVidList.setSelectionMode(
+            QAbstractItemView.SelectionMode.ExtendedSelection)
+        self.deskVidList.setRootIsDecorated(False)
+        self.deskVidList.setItemsExpandable(False)
+        self.deskVidList.setAllColumnsShowFocus(True)
+        self.deskVidList.setObjectName("deskVidList")
+        self.deskVidList.setSortingEnabled(True)
+        self.deskVidList.headerItem().setText(0, self.tr("Host"))
+        self.deskVidList.headerItem().setText(1, self.tr("Permission"))
+        self.tabWidget.addTab(
+            self.deskVidList,
+            UI.PixmapCache.getIcon("desktopVideoCapture"),
+            self.tr("Desktop Video"))
         
-        if hasattr(QWebEnginePage, "Notifications"):
-            self.setTabOrder(self.tabWidget, self.notifList)
-            self.setTabOrder(self.notifList, self.geoList)
-        else:
-            self.setTabOrder(self.tabWidget, self.geoList)
+        self.deskAudVidList = QTreeWidget()
+        self.deskAudVidList.setAlternatingRowColors(True)
+        self.deskAudVidList.setSelectionMode(
+            QAbstractItemView.SelectionMode.ExtendedSelection)
+        self.deskAudVidList.setRootIsDecorated(False)
+        self.deskAudVidList.setItemsExpandable(False)
+        self.deskAudVidList.setAllColumnsShowFocus(True)
+        self.deskAudVidList.setObjectName("deskAudVidList")
+        self.deskAudVidList.setSortingEnabled(True)
+        self.deskAudVidList.headerItem().setText(0, self.tr("Host"))
+        self.deskAudVidList.headerItem().setText(1, self.tr("Permission"))
+        self.tabWidget.addTab(
+            self.deskAudVidList,
+            UI.PixmapCache.getIcon("desktopAudioVideoCapture"),
+            self.tr("Desktop Audio && Video"))
+        
+        self.setTabOrder(self.tabWidget, self.notifList)
+        self.setTabOrder(self.notifList, self.geoList)
         self.setTabOrder(self.geoList, self.micList)
         self.setTabOrder(self.micList, self.camList)
         self.setTabOrder(self.camList, self.micCamList)
         self.setTabOrder(self.micCamList, self.mouseLockList)
-        if hasattr(QWebEnginePage, "DesktopVideoCapture"):
-            self.setTabOrder(self.mouseLockList, self.deskVidList)
-            self.setTabOrder(self.deskVidList, self.deskAudVidList)
-            self.setTabOrder(self.deskAudVidList, self.removeButton)
-        else:
-            self.setTabOrder(self.mouseLockList, self.removeButton)
+        self.setTabOrder(self.mouseLockList, self.deskVidList)
+        self.setTabOrder(self.deskVidList, self.deskAudVidList)
+        self.setTabOrder(self.deskAudVidList, self.removeButton)
         self.setTabOrder(self.removeButton, self.removeAllButton)
         
         self.__permissionStrings = {
@@ -199,18 +189,11 @@
             QWebEnginePage.Feature.MediaVideoCapture: self.camList,
             QWebEnginePage.Feature.MediaAudioVideoCapture: self.micCamList,
             QWebEnginePage.Feature.MouseLock: self.mouseLockList,
+            QWebEnginePage.Feature.DesktopVideoCapture: self.deskVidList,
+            QWebEnginePage.Feature.DesktopAudioVideoCapture:
+                self.deskAudVidList,
+            QWebEnginePage.Feature.Notifications: self.notifList,
         }
-        if hasattr(QWebEnginePage, "DesktopVideoCapture"):
-            self.__permissionsLists.update({
-                QWebEnginePage.Feature.DesktopVideoCapture:
-                    self.deskVidList,
-                QWebEnginePage.Feature.DesktopAudioVideoCapture:
-                    self.deskAudVidList,
-            })
-        if hasattr(QWebEnginePage, "Notifications"):
-            self.__permissionsLists[QWebEnginePage.Feature.Notifications] = (
-                self.notifList
-            )
         
         for feature, permissionsList in self.__permissionsLists.items():
             for permission in featurePermissions[feature]:
@@ -281,7 +264,7 @@
         while currentList.topLevelItemCount() > 0:
             itm = currentList.takeTopLevelItem(0)      # __IGNORE_WARNING__
             del itm
-        self.__updateGeoButtons()
+        self.__updateButtons()
     
     def getData(self):
         """