MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2956 from AIIX/web_enable_request_feature 

Add feature request functionality to webviews
pull/2967/head
Kris Gesling 2021-08-04 11:42:45 +09:30 committed by GitHub
parent c21e74d4d4 45d5d9e478
commit 7c413de32c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 185 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
mycroft/res/ui/FeatureRequest.qml Normal file
View File

@ -0,0 +1,123 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtWebEngine 1.7
import QtWebChannel 1.0
import QtQuick.Layouts 1.12
import org.kde.kirigami 2.11 as Kirigami
Item {
property var requestedFeature;
property url securityOrigin;
width: parent.width
height: parent.height
onRequestedFeatureChanged: {
message.text = securityOrigin + " has requested access to your "
+ message.textForFeature(requestedFeature);
}
RowLayout {
anchors.fill: parent
Label {
id: message
Layout.fillWidth: true
Layout.leftMargin: Kirigami.Units.largeSpacing
wrapMode: Text.WordWrap
maximumLineCount: 2
elide: Text.ElideRight
function textForFeature(feature) {
if (feature === WebEngineView.MediaAudioCapture)
return "microphone"
if (feature === WebEngineView.MediaVideoCapture)
return "camera"
if (feature === WebEngineView.MediaAudioVideoCapture)
return "camera and microphone"
if (feature === WebEngineView.Geolocation)
return "location"
}
}
Button {
id: acceptButton
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: parent.width * 0.18
background: Rectangle {
color: acceptButton.activeFocus ? Kirigami.Theme.highlightColor : Qt.lighter(Kirigami.Theme.backgroundColor, 1.2)
border.color: Kirigami.Theme.disabledTextColor
radius: 20
}
contentItem: Item {
Kirigami.Heading {
level: 3
font.pixelSize: parent.width * 0.075
anchors.centerIn: parent
text: "Accept"
}
}
onClicked: {
webview.grantFeaturePermission(securityOrigin,
requestedFeature, true);
interactionBar.isRequested = false;
}
}
Button {
id: denyButton
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: parent.width * 0.18
background: Rectangle {
color: denyButton.activeFocus ? Kirigami.Theme.highlightColor : Qt.lighter(Kirigami.Theme.backgroundColor, 1.2)
border.color: Kirigami.Theme.disabledTextColor
radius: 20
}
contentItem: Item {
Kirigami.Heading {
level: 3
font.pixelSize: parent.width * 0.075
anchors.centerIn: parent
text: "Deny"
}
}
onClicked: {
webview.grantFeaturePermission(securityOrigin,
requestedFeature, false);
interactionBar.isRequested = false
}
}
Button {
id: closeButton
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: Kirigami.Units.iconSizes.large - (Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing)
Layout.preferredHeight: Kirigami.Units.iconSizes.large - (Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing)
Layout.leftMargin: Kirigami.Units.largeSpacing
Layout.rightMargin: Kirigami.Units.largeSpacing
background: Rectangle {
color: denyButton.activeFocus ? Kirigami.Theme.highlightColor : Qt.lighter(Kirigami.Theme.backgroundColor, 1.2)
border.color: Kirigami.Theme.disabledTextColor
radius: 200
}
Kirigami.Icon {
anchors.centerIn: parent
width: Kirigami.Units.iconSizes.medium
height: Kirigami.Units.iconSizes.medium
source: "window-close"
}
onClicked: {
interactionBar.isRequested = false
}
}
}
}

35
mycroft/res/ui/RequestHandler.qml Normal file
View File

@ -0,0 +1,35 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtWebEngine 1.7
import QtWebChannel 1.0
import QtQuick.Layouts 1.12
import org.kde.kirigami 2.11 as Kirigami
Rectangle {
property bool isRequested: false
property alias source: interactionLoader.source
property alias interactionItem: interactionLoader.item
visible: isRequested
enabled: isRequested
width: parent.width
height: isRequested ? Kirigami.Units.gridUnit * 6 : 0
color: Kirigami.Theme.backgroundColor
function setSource(interactionSource){
interactionLoader.setSource(interactionSource)
}
Keys.onEscapePressed: {
isRequested = false;
}
Keys.onBackPressed: {
isRequested = false;
}
Loader {
id: interactionLoader
anchors.fill: parent
}
}

14
mycroft/res/ui/WebViewHtmlFrame.qml
View File

@ -19,6 +19,12 @@ Item {
}
}
RequestHandler {
id: interactionBar
anchors.top: parent.top
z: 1001
}
WebEngineView {
id: webview
anchors.fill: parent
@ -47,6 +53,14 @@ Item {
onJavaScriptDialogRequested: function(request) {
request.accepted = true;
}
onFeaturePermissionRequested: {
interactionBar.setSource("FeatureRequest.qml")
interactionBar.interactionItem.securityOrigin = securityOrigin;
interactionBar.interactionItem.requestedFeature = feature;
interactionBar.isRequested = true;
}
}
Popup {

13
mycroft/res/ui/WebViewUrlFrame.qml
View File

@ -14,6 +14,12 @@ Item {
}
}
RequestHandler {
id: interactionBar
anchors.top: parent.top
z: 1001
}
WebEngineView {
id: webview
anchors.fill: parent
@ -42,6 +48,13 @@ Item {
onJavaScriptDialogRequested: function(request) {
request.accepted = true;
}
onFeaturePermissionRequested: {
interactionBar.setSource("FeatureRequest.qml")
interactionBar.interactionItem.securityOrigin = securityOrigin;
interactionBar.interactionItem.requestedFeature = feature;
interactionBar.isRequested = true;
}
}
Popup {