Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use temporary copy of keyboard QML file while refactoring

Browse source
This commit is contained in:
David Rowe 2016-10-08 15:23:11 +13:00
parent d8242f02a5
commit b954852ba9
8 changed files with 406 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/AddressBarDialog.qml
View file

@ -276,7 +276,7 @@ Window {
} }
// virtual keyboard, letters // virtual keyboard, letters
HifiControls.Keyboard { HifiControls.KeyboardAlpha {
id: keyboard1 id: keyboard1
y: parent.keyboardRaised ? parent.height : 0 y: parent.keyboardRaised ? parent.height : 0
height: parent.keyboardRaised ? 200 : 0 height: parent.keyboardRaised ? 200 : 0

10
interface/resources/qml/controls-uit/Keyboard.qml
View file

@ -1,3 +1,13 @@
//
// FileDialog.qml
//
// Created by Anthony Thibault on 31 Oct 2016
// Copyright 2016 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.0 import QtQuick 2.0
Item { Item {

390
interface/resources/qml/controls-uit/KeyboardAlpha.qml Normal file
View file

@ -0,0 +1,390 @@
import QtQuick 2.0
Item {
id: keyboardBase
height: 200
property alias shiftKey: key27
property bool shiftMode: false
function resetShiftMode(mode) {
shiftMode = mode;
shiftKey.resetToggledMode(mode);
}
function toUpper(str) {
if (str === ",") {
return "<";
} else if (str === ".") {
return ">";
} else if (str === "/") {
return "?";
} else {
return str.toUpperCase(str);
}
}
function toLower(str) {
if (str === "<") {
return ",";
} else if (str === ">") {
return ".";
} else if (str === "?") {
return "/";
} else {
return str.toLowerCase(str);
}
}
function forEachKey(func) {
var i, j;
for (i = 0; i < column1.children.length; i++) {
var row = column1.children[i];
for (j = 0; j < row.children.length; j++) {
var key = row.children[j];
func(key);
}
}
}
onShiftModeChanged: {
forEachKey(function (key) {
if (shiftMode) {
key.glyph = keyboardBase.toUpper(key.glyph);
} else {
key.glyph = keyboardBase.toLower(key.glyph);
}
});
}
function alphaKeyClickedHandler(mouseArea) {
// reset shift mode to false after first keypress
if (shiftMode) {
resetShiftMode(false);
}
}
Component.onCompleted: {
// hook up callbacks to every ascii key
forEachKey(function (key) {
if (/^[a-z]+$/i.test(key.glyph)) {
key.mouseArea.onClicked.connect(alphaKeyClickedHandler);
}
});
}
Rectangle {
id: leftRect
y: 0
height: 200
color: "#252525"
anchors.right: keyboardRect.left
anchors.rightMargin: 0
anchors.bottom: parent.bottom
anchors.bottomMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
}
Rectangle {
id: keyboardRect
x: 206
y: 0
width: 480
height: 200
color: "#252525"
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
anchors.bottomMargin: 0
Column {
id: column1
width: 480
height: 200
Row {
id: row1
width: 480
height: 50
anchors.left: parent.left
anchors.leftMargin: 0
Key {
id: key1
width: 44
glyph: "q"
}
Key {
id: key2
width: 44
glyph: "w"
}
Key {
id: key3
width: 44
glyph: "e"
}
Key {
id: key4
width: 43
glyph: "r"
}
Key {
id: key5
width: 43
glyph: "t"
}
Key {
id: key6
width: 44
glyph: "y"
}
Key {
id: key7
width: 44
glyph: "u"
}
Key {
id: key8
width: 43
glyph: "i"
}
Key {
id: key9
width: 42
glyph: "o"
}
Key {
id: key10
width: 44
glyph: "p"
}
Key {
id: key28
width: 45
glyph: "←"
}
}
Row {
id: row2
width: 480
height: 50
anchors.left: parent.left
anchors.leftMargin: 18
Key {
id: key11
width: 43
}
Key {
id: key12
width: 43
glyph: "s"
}
Key {
id: key13
width: 43
glyph: "d"
}
Key {
id: key14
width: 43
glyph: "f"
}
Key {
id: key15
width: 43
glyph: "g"
}
Key {
id: key16
width: 43
glyph: "h"
}
Key {
id: key17
width: 43
glyph: "j"
}
Key {
id: key18
width: 43
glyph: "k"
}
Key {
id: key19
width: 43
glyph: "l"
}
Key {
id: key32
width: 75
glyph: "⏎"
}
}
Row {
id: row3
width: 480
height: 50
anchors.left: parent.left
anchors.leftMargin: 0
Key {
id: key27
width: 46
glyph: "⇪"
toggle: true
onToggledChanged: {
shiftMode = toggled;
}
}
Key {
id: key20
width: 43
glyph: "z"
}
Key {
id: key21
width: 43
glyph: "x"
}
Key {
id: key22
width: 43
glyph: "c"
}
Key {
id: key23
width: 43
glyph: "v"
}
Key {
id: key24
width: 43
glyph: "b"
}
Key {
id: key25
width: 43
glyph: "n"
}
Key {
id: key26
width: 44
glyph: "m"
}
Key {
id: key31
width: 43
glyph: "_"
}
Key {
id: key33
width: 43
glyph: "?"
}
Key {
id: key36
width: 46
glyph: "/"
}
}
Row {
id: row4
width: 480
height: 50
anchors.left: parent.left
anchors.leftMargin: 19
Key {
id: key30
width: 89
glyph: "&123"
mouseArea.onClicked: {
keyboardBase.parent.punctuationMode = true;
}
}
Key {
id: key29
width: 285
glyph: " "
}
Key {
id: key34
width: 43
glyph: "⇦"
}
Key {
id: key35
x: 343
width: 43
glyph: "⇨"
}
}
}
}
Rectangle {
id: rightRect
y: 280
height: 200
color: "#252525"
border.width: 0
anchors.left: keyboardRect.right
anchors.leftMargin: 0
anchors.right: parent.right
anchors.rightMargin: 0
anchors.bottom: parent.bottom
anchors.bottomMargin: 0
}
Rectangle {
id: rectangle1
color: "#ffffff"
anchors.bottom: keyboardRect.top
anchors.bottomMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
anchors.right: parent.right
anchors.rightMargin: 0
anchors.top: parent.top
anchors.topMargin: 0
}
}

2
interface/resources/qml/controls/WebView.qml
View file

@ -106,7 +106,7 @@ Item {
} }
// virtual keyboard, letters // virtual keyboard, letters
HiFiControls.Keyboard { HiFiControls.KeyboardAlpha {
id: keyboard1 id: keyboard1
y: keyboardRaised ? parent.height : 0 y: keyboardRaised ? parent.height : 0
height: keyboardRaised ? 200 : 0 height: keyboardRaised ? 200 : 0

2
interface/resources/qml/dialogs/CustomQueryDialog.qml
View file

@ -165,7 +165,7 @@ ModalWindow {
bottomMargin: keyboardRaised ? hifi.dimensions.contentSpacing.y : 0 bottomMargin: keyboardRaised ? hifi.dimensions.contentSpacing.y : 0
} }
Keyboard { KeyboardAlpha {
id: keyboard1 id: keyboard1
visible: keyboardRaised && !punctuationMode visible: keyboardRaised && !punctuationMode
enabled: keyboardRaised && !punctuationMode enabled: keyboardRaised && !punctuationMode

2
interface/resources/qml/dialogs/FileDialog.qml
View file

@ -647,7 +647,7 @@ ModalWindow {
KeyNavigation.right: openButton KeyNavigation.right: openButton
} }
Keyboard { KeyboardAlpha {
id: keyboard1 id: keyboard1
height: parent.keyboardRaised ? 200 : 0 height: parent.keyboardRaised ? 200 : 0
visible: parent.keyboardRaised && !parent.punctuationMode visible: parent.keyboardRaised && !parent.punctuationMode

2
interface/resources/qml/dialogs/QueryDialog.qml
View file

@ -117,7 +117,7 @@ ModalWindow {
} }
// virtual keyboard, letters // virtual keyboard, letters
Keyboard { KeyboardAlpha {
id: keyboard1 id: keyboard1
y: parent.keyboardRaised ? parent.height : 0 y: parent.keyboardRaised ? parent.height : 0
height: parent.keyboardRaised ? 200 : 0 height: parent.keyboardRaised ? 200 : 0

2
interface/resources/qml/windows/ScrollingWindow.qml
View file

@ -180,7 +180,7 @@ Window {
children: [ footer ] children: [ footer ]
} }
HiFiControls.Keyboard { HiFiControls.KeyboardAlpha {
id: keyboard1 id: keyboard1
height: parent.keyboardEnabled && parent.keyboardRaised ? 200 : 0 height: parent.keyboardEnabled && parent.keyboardRaised ? 200 : 0
visible: parent.keyboardEnabled && parent.keyboardRaised && !parent.punctuationMode visible: parent.keyboardEnabled && parent.keyboardRaised && !parent.punctuationMode