From 753e4c4c7bc079ab463ff2ce2dacaae1b60388da Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 12 Sep 2016 16:49:10 -0700 Subject: [PATCH] keyboard for avatar attachment model url dialog --- .../hifi/dialogs/attachments/Attachment.qml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml b/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml index 6d371741ea..730ab367fa 100644 --- a/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml +++ b/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml @@ -9,6 +9,7 @@ import ".." import "../../../styles-uit" import "../../../controls-uit" as HifiControls import "../../../windows" +import "../../../controls" as Controls Item { height: column.height + 2 * 8 @@ -34,6 +35,9 @@ Item { anchors { left: parent.left; right: parent.right; margins: 20 } spacing: 8 + property bool keyboardRaised: false + property bool punctuationMode: false + Item { height: modelChooserButton.height + urlLabel.height + 4 anchors { left: parent.left; right: parent.right;} @@ -71,6 +75,35 @@ Item { } } + // virtual keyboard, letters + Controls.Keyboard { + id: keyboard1 + // y: parent.keyboardRaised ? parent.height : 0 + 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 + // anchors.bottom: buttonRow.top + // anchors.bottomMargin: 2 * hifi.dimensions.contentSpacing.y + } + + Controls.KeyboardPunctuation { + id: keyboard2 + // y: parent.keyboardRaised ? parent.height : 0 + 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 + // anchors.bottom: buttonRow.top + // anchors.bottomMargin: 2 * hifi.dimensions.contentSpacing.y + } + Item { height: jointChooser.height + jointLabel.height + 4 anchors { left: parent.left; right: parent.right; }