From 38a1556716bf46d36e2daa5cc63339c66ad0f940 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 12 Sep 2016 13:28:46 -0700 Subject: [PATCH] qml keyboard for running-scripts window --- .../qml/hifi/dialogs/RunningScripts.qml | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/dialogs/RunningScripts.qml b/interface/resources/qml/hifi/dialogs/RunningScripts.qml index 3f05a140ae..e1db3bc02f 100644 --- a/interface/resources/qml/hifi/dialogs/RunningScripts.qml +++ b/interface/resources/qml/hifi/dialogs/RunningScripts.qml @@ -16,6 +16,7 @@ import Qt.labs.settings 1.0 import "../../styles-uit" import "../../controls-uit" as HifiControls import "../../windows" +import "../../controls" ScrollingWindow { id: root @@ -92,6 +93,9 @@ ScrollingWindow { } Column { + property bool keyboardRaised: false + property bool punctuationMode: false + width: pane.contentWidth HifiControls.ContentSection { @@ -353,6 +357,28 @@ ScrollingWindow { visible: !isHMD } } + + // virtual keyboard, letters + Keyboard { + id: keyboard1 + height: parent.keyboardRaised ? 200 : 0 + visible: parent.keyboardRaised && !parent.punctuationMode + enabled: parent.keyboardRaised && !parent.punctuationMode + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + } + + KeyboardPunctuation { + id: keyboard2 + height: parent.keyboardRaised ? 200 : 0 + visible: parent.keyboardRaised && parent.punctuationMode + enabled: parent.keyboardRaised && parent.punctuationMode + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + } } } -