From 189809dc2ce6308c642d79df54b959e7a5efa3ee Mon Sep 17 00:00:00 2001 From: milad Date: Wed, 24 Jul 2019 11:33:32 -0700 Subject: [PATCH] Fixed undefined error when displaying from the dictionary --- .../+webengine/FlickableWebViewCore.qml | 4 +-- .../qml/controlsUit/PermissionPopup.qml | 32 +++++++------------ .../controlsUit/PermissionPopupBackground.qml | 29 +++++++---------- 3 files changed, 24 insertions(+), 41 deletions(-) diff --git a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml index e1bb0b9372..f8343db807 100644 --- a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml +++ b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml @@ -146,8 +146,8 @@ Item { } onFeaturePermissionRequested: { - permissionPopupBackground.permissionsOptions.securityOrigin = securityOrigin; - permissionPopupBackground.permissionsOptions.feature = feature; + permissionPopupBackground.securityOrigin = securityOrigin; + permissionPopupBackground.feature = feature; permissionPopupBackground.visible = true; } diff --git a/interface/resources/qml/controlsUit/PermissionPopup.qml b/interface/resources/qml/controlsUit/PermissionPopup.qml index 9fadd91ffd..f1f8b50a6e 100644 --- a/interface/resources/qml/controlsUit/PermissionPopup.qml +++ b/interface/resources/qml/controlsUit/PermissionPopup.qml @@ -9,31 +9,25 @@ Item { id: root width: 600 height: 200 + z:100 anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - z:100 - property var permissionLanguage: { - "test": "test" - } - property int currentRequestedPermission + readonly property var permissionLanguage: ({ + [WebEngineView.MediaAudioCapture]: "access an audio input device", + [WebEngineView.MediaVideoCapture]: "access a video device, like your webcam", + [WebEngineView.MediaAudioVideoCapture]: "access an audio input device and video device", + [WebEngineView.Geolocation]: "access your location", + [WebEngineView.DesktopVideoCapture]: "capture video from your desktop", + [WebEngineView.DesktopAudioVideoCapture]: "capture audio and video from your desktop" + }) + property string currentRequestedPermission signal permissionButtonPressed(real buttonNumber) Component.onCompleted: { - console.log("loaded component"); - // console.log("\n\n TESTING!! \n\n") - console.log("WebEngineView.MediaAudioCapture", WebEngineView.MediaAudioCapture) - // root.permissionLanguage["test"] = "test" - root.permissionLanguage[WebEngineView.MediaAudioCapture] = "access an audio input device"; - root.permissionLanguage[WebEngineView.MediaVideoCapture] = "access a video device, like your webcam"; - root.permissionLanguage[WebEngineView.MediaAudioVideoCapture] = "access an audio input device and video device"; - root.permissionLanguage[WebEngineView.Geolocation] = "access your location"; - root.permissionLanguage[WebEngineView.DesktopVideoCapture] = "capture video from your desktop"; - root.permissionLanguage[WebEngineView.DesktopAudioVideoCapture] = "capture audio and video from your desktop"; console.log(JSON.stringify(root.permissionLanguage)) - + console.log("\n\n\n\n\n current permission:" + root.currentRequestedPermission); } - // anchors.top: buttons.bottom Rectangle { id: mainContainer width: root.width @@ -86,11 +80,9 @@ Item { text: "Yes allow access" color: hifi.buttons.blue - // colorScheme: root.colorScheme enabled: true width: 155 onClicked: { - console.log("\n\n JUST CLICKED BUTTON 0, GOING TO SEND SIGNAL!") root.permissionButtonPressed(0) } } @@ -100,10 +92,8 @@ Item { anchors.leftMargin: permissionsButtonRow.space text: "Don't Allow" color: hifi.buttons.red - // colorScheme: root.colorScheme enabled: true onClicked: { - console.log("\n\n JUST CLICKED BUTTON 1, GOING TO SEND SIGNAL!") root.permissionButtonPressed(1) } } diff --git a/interface/resources/qml/controlsUit/PermissionPopupBackground.qml b/interface/resources/qml/controlsUit/PermissionPopupBackground.qml index a6d300beb1..74170d2e33 100644 --- a/interface/resources/qml/controlsUit/PermissionPopupBackground.qml +++ b/interface/resources/qml/controlsUit/PermissionPopupBackground.qml @@ -8,34 +8,27 @@ Rectangle { id: root anchors.fill: parent color: Qt.rgba(0, 0, 0, 0.5); - HifiConstants { id: hifi } visible: false - property variant permissionsOptions: {'securityOrigin':'none','feature': -1} - signal sendPermission(string securityOrigin, int feature, bool shouldGivePermission) - - Component.onCompleted: { - console.log("loaded component"); - // console.log("\n\n TESTING!! \n\n") + property var permissionsOptions: ({'securityOrigin':'none','feature': 'none'}) + property string securityOrigin: 'none' + property string feature: 'none' + signal sendPermission(string securityOrigin, string feature, bool shouldGivePermission) + + onFeatureChanged: { + permissionPopupItem.currentRequestedPermission = feature; } PermissionPopup { id: permissionPopupItem - Component.onCompleted: { - permissionPopupItem.currentRequestedPermission = permissionsOptions.feature; - console.log("test"); - // console.log("\n\n TESTING!! \n\n") - } onPermissionButtonPressed: { - console.log("JUST MADE IT TO ON PERMISSIONS PRESSEED!"); - console.log(buttonNumber); if (buttonNumber === 0) { - root.sendPermission(permissionsOptions.securityOrigin, permissionsOptions.feature, true) + root.sendPermission(securityOrigin, feature, true) } else { - root.sendPermission(permissionsOptions.securityOrigin, permissionsOptions.feature, false) + root.sendPermission(securityOrigin, feature, false) } root.visible = false; - permissionsOptions.securityOrigin = "none"; - permissionsOptions.feature = -1; + securityOrigin = 'none'; + feature = 'none'; } } }