diff -r 27f636beebad -r 2c730d5fd177 eric6/WebBrowser/FeaturePermissions/FeaturePermissionManager.py
--- a/eric6/WebBrowser/FeaturePermissions/FeaturePermissionManager.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/FeaturePermissions/FeaturePermissionManager.py Tue Mar 02 17:17:09 2021 +0100
@@ -31,96 +31,100 @@
super(FeaturePermissionManager, self).__init__(parent)
self.__featurePermissions = {
- QWebEnginePage.Geolocation: {
- QWebEnginePage.PermissionGrantedByUser: [],
- QWebEnginePage.PermissionDeniedByUser: [],
+ QWebEnginePage.Feature.Geolocation: {
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser: [],
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser: [],
},
- QWebEnginePage.MediaAudioCapture: {
- QWebEnginePage.PermissionGrantedByUser: [],
- QWebEnginePage.PermissionDeniedByUser: [],
+ QWebEnginePage.Feature.MediaAudioCapture: {
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser: [],
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser: [],
},
- QWebEnginePage.MediaVideoCapture: {
- QWebEnginePage.PermissionGrantedByUser: [],
- QWebEnginePage.PermissionDeniedByUser: [],
+ QWebEnginePage.Feature.MediaVideoCapture: {
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser: [],
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser: [],
},
- QWebEnginePage.MediaAudioVideoCapture: {
- QWebEnginePage.PermissionGrantedByUser: [],
- QWebEnginePage.PermissionDeniedByUser: [],
+ QWebEnginePage.Feature.MediaAudioVideoCapture: {
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser: [],
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser: [],
},
- QWebEnginePage.MouseLock: {
- QWebEnginePage.PermissionGrantedByUser: [],
- QWebEnginePage.PermissionDeniedByUser: [],
+ QWebEnginePage.Feature.MouseLock: {
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser: [],
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser: [],
},
}
try:
# these are defined as of Qt 5.10.0/PyQt 5.10.0
self.__featurePermissions.update({
- QWebEnginePage.DesktopVideoCapture: {
- QWebEnginePage.PermissionGrantedByUser: [],
- QWebEnginePage.PermissionDeniedByUser: [],
+ QWebEnginePage.Feature.DesktopVideoCapture: {
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser:
+ [],
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser:
+ [],
},
- QWebEnginePage.DesktopAudioVideoCapture: {
- QWebEnginePage.PermissionGrantedByUser: [],
- QWebEnginePage.PermissionDeniedByUser: [],
+ QWebEnginePage.Feature.DesktopAudioVideoCapture: {
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser:
+ [],
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser:
+ [],
},
})
except AttributeError:
pass
try:
# this was re-added in Qt 5.13.0
- self.__featurePermissions[QWebEnginePage.Notifications] = {
- QWebEnginePage.PermissionGrantedByUser: [],
- QWebEnginePage.PermissionDeniedByUser: [],
+ self.__featurePermissions[QWebEnginePage.Feature.Notifications] = {
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser: [],
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser: [],
}
except AttributeError:
pass
self.__featurePermissionsKeys = {
- (QWebEnginePage.Geolocation,
- QWebEnginePage.PermissionGrantedByUser):
+ (QWebEnginePage.Feature.Geolocation,
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser):
"GeolocationGranted",
- (QWebEnginePage.Geolocation,
- QWebEnginePage.PermissionDeniedByUser):
+ (QWebEnginePage.Feature.Geolocation,
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser):
"GeolocationDenied",
- (QWebEnginePage.MediaAudioCapture,
- QWebEnginePage.PermissionGrantedByUser):
+ (QWebEnginePage.Feature.MediaAudioCapture,
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser):
"MediaAudioCaptureGranted",
- (QWebEnginePage.MediaAudioCapture,
- QWebEnginePage.PermissionDeniedByUser):
+ (QWebEnginePage.Feature.MediaAudioCapture,
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser):
"MediaAudioCaptureDenied",
- (QWebEnginePage.MediaVideoCapture,
- QWebEnginePage.PermissionGrantedByUser):
+ (QWebEnginePage.Feature.MediaVideoCapture,
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser):
"MediaVideoCaptureGranted",
- (QWebEnginePage.MediaVideoCapture,
- QWebEnginePage.PermissionDeniedByUser):
+ (QWebEnginePage.Feature.MediaVideoCapture,
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser):
"MediaVideoCaptureDenied",
- (QWebEnginePage.MediaAudioVideoCapture,
- QWebEnginePage.PermissionGrantedByUser):
+ (QWebEnginePage.Feature.MediaAudioVideoCapture,
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser):
"MediaAudioVideoCaptureGranted",
- (QWebEnginePage.MediaAudioVideoCapture,
- QWebEnginePage.PermissionDeniedByUser):
+ (QWebEnginePage.Feature.MediaAudioVideoCapture,
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser):
"MediaAudioVideoCaptureDenied",
- (QWebEnginePage.MouseLock,
- QWebEnginePage.PermissionGrantedByUser):
+ (QWebEnginePage.Feature.MouseLock,
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser):
"MouseLockGranted",
- (QWebEnginePage.MouseLock,
- QWebEnginePage.PermissionDeniedByUser):
+ (QWebEnginePage.Feature.MouseLock,
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser):
"MouseLockDenied",
}
try:
# these are defined as of Qt 5.10.0/PyQt 5.10.0
self.__featurePermissionsKeys.update({
- (QWebEnginePage.DesktopVideoCapture,
- QWebEnginePage.PermissionGrantedByUser):
+ (QWebEnginePage.Feature.DesktopVideoCapture,
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser):
"DesktopVideoCaptureGranted",
- (QWebEnginePage.DesktopVideoCapture,
- QWebEnginePage.PermissionDeniedByUser):
+ (QWebEnginePage.Feature.DesktopVideoCapture,
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser):
"DesktopVideoCaptureDenied",
- (QWebEnginePage.DesktopAudioVideoCapture,
- QWebEnginePage.PermissionGrantedByUser):
+ (QWebEnginePage.Feature.DesktopAudioVideoCapture,
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser):
"DesktopAudioVideoCaptureGranted",
- (QWebEnginePage.DesktopAudioVideoCapture,
- QWebEnginePage.PermissionDeniedByUser):
+ (QWebEnginePage.Feature.DesktopAudioVideoCapture,
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser):
"DesktopAudioVideoCaptureDenied",
})
except AttributeError:
@@ -128,11 +132,11 @@
try:
# this was re-added in Qt 5.13.0
self.__featurePermissionsKeys.update({
- (QWebEnginePage.Notifications,
- QWebEnginePage.PermissionGrantedByUser):
+ (QWebEnginePage.Feature.Notifications,
+ QWebEnginePage.PermissionPolicy.PermissionGrantedByUser):
"NotificationsGranted",
- (QWebEnginePage.Notifications,
- QWebEnginePage.PermissionDeniedByUser):
+ (QWebEnginePage.Feature.Notifications,
+ QWebEnginePage.PermissionPolicy.PermissionDeniedByUser):
"NotificationsDenied",
})
except AttributeError:
@@ -233,7 +237,7 @@
from .FeaturePermissionsDialog import FeaturePermissionsDialog
dlg = FeaturePermissionsDialog(self.__featurePermissions)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
newFeaturePermissions = dlg.getData()
self.__featurePermissions = newFeaturePermissions
self.__saveSettings()
