Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Tue Mar 02 17:17:09 2021 +0100
@@ -43,23 +43,23 @@
         self.__manager = manager
         
         self.__permissionFeatureTexts = {
-            QWebEnginePage.Geolocation:
+            QWebEnginePage.Feature.Geolocation:
                 self.tr("{0} wants to use your position."),
-            QWebEnginePage.MediaAudioCapture:
+            QWebEnginePage.Feature.MediaAudioCapture:
                 self.tr("{0} wants to use your microphone."),
-            QWebEnginePage.MediaVideoCapture:
+            QWebEnginePage.Feature.MediaVideoCapture:
                 self.tr("{0} wants to use your camera."),
-            QWebEnginePage.MediaAudioVideoCapture:
+            QWebEnginePage.Feature.MediaAudioVideoCapture:
                 self.tr("{0} wants to use your microphone and camera."),
-            QWebEnginePage.MouseLock:
+            QWebEnginePage.Feature.MouseLock:
                 self.tr("{0} wants to lock your mouse."),
         }
         try:
             # these are defined as of Qt 5.10.0/PyQt 5.10.0
             self.__permissionFeatureTexts.update({
-                QWebEnginePage.DesktopVideoCapture:
+                QWebEnginePage.Feature.DesktopVideoCapture:
                     self.tr("{0} wants to capture video of your screen."),
-                QWebEnginePage.DesktopAudioVideoCapture:
+                QWebEnginePage.Feature.DesktopAudioVideoCapture:
                     self.tr("{0} wants to capture audio and video of your"
                             " screen."),
             })
@@ -68,23 +68,24 @@
         try:
             # this was re-added in Qt 5.13.0
             self.__permissionFeatureTexts[
-                QWebEnginePage.Notifications] = self.tr(
+                QWebEnginePage.Feature.Notifications] = self.tr(
                 "{0} wants to use desktop notifications.")
         except AttributeError:
             pass
         
         self.__permissionFeatureIconNames = {
-            QWebEnginePage.Geolocation: "geolocation",
-            QWebEnginePage.MediaAudioCapture: "audiocapture",
-            QWebEnginePage.MediaVideoCapture: "camera",
-            QWebEnginePage.MediaAudioVideoCapture: "audio-video",
-            QWebEnginePage.MouseLock: "mouse",
+            QWebEnginePage.Feature.Geolocation: "geolocation",
+            QWebEnginePage.Feature.MediaAudioCapture: "audiocapture",
+            QWebEnginePage.Feature.MediaVideoCapture: "camera",
+            QWebEnginePage.Feature.MediaAudioVideoCapture: "audio-video",
+            QWebEnginePage.Feature.MouseLock: "mouse",
         }
         try:
             # these are defined as of Qt 5.10.0/PyQt 5.10.0
             self.__permissionFeatureIconNames.update({
-                QWebEnginePage.DesktopVideoCapture: "desktopVideoCapture",
-                QWebEnginePage.DesktopAudioVideoCapture:
+                QWebEnginePage.Feature.DesktopVideoCapture:
+                    "desktopVideoCapture",
+                QWebEnginePage.Feature.DesktopAudioVideoCapture:
                     "desktopAudioVideoCapture",
             })
         except AttributeError:
@@ -92,7 +93,7 @@
         try:
             # this was re-added in Qt 5.13.0
             self.__permissionFeatureIconNames[
-                QWebEnginePage.Notifications] = "notification"
+                QWebEnginePage.Feature.Notifications] = "notification"
         except AttributeError:
             pass
         
@@ -156,12 +157,12 @@
         
         self.__page.setFeaturePermission(
             self.__origin, self.__feature,
-            QWebEnginePage.PermissionDeniedByUser)
+            QWebEnginePage.PermissionPolicy.PermissionDeniedByUser)
         
         if self.__rememberButton.isChecked():
             self.__manager.rememberFeaturePermission(
                 self.__page.url().host(), self.__feature,
-                QWebEnginePage.PermissionDeniedByUser)
+                QWebEnginePage.PermissionPolicy.PermissionDeniedByUser)
         
         self.hide()
     
@@ -174,12 +175,12 @@
         
         self.__page.setFeaturePermission(
             self.__origin, self.__feature,
-            QWebEnginePage.PermissionGrantedByUser)
+            QWebEnginePage.PermissionPolicy.PermissionGrantedByUser)
         
         if self.__rememberButton.isChecked():
             self.__manager.rememberFeaturePermission(
                 self.__page.url().host(), self.__feature,
-                QWebEnginePage.PermissionGrantedByUser)
+                QWebEnginePage.PermissionPolicy.PermissionGrantedByUser)
         
         self.hide()
     
@@ -192,6 +193,6 @@
         
         self.__page.setFeaturePermission(
             self.__origin, self.__feature,
-            QWebEnginePage.PermissionUnknown)
+            QWebEnginePage.PermissionPolicy.PermissionUnknown)
         
         self.hide()