diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2014-04-30 15:41:02 +0300 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2014-05-06 15:43:14 +0300 |
| commit | 945669c989c8204745b30c1ee6d3a10513ff2a70 (patch) | |
| tree | 2a4d42518e27a9623fe4cdc91e833b6da9ec5c8f /examples | |
| parent | 41e47a682ea558e3500155d683c389158c79b367 (diff) | |
Add predefined ids for EnterKeyAction
A predefined action id replaces the label in the enter key with an icon.
Balanced all icons to use the same aspect ratio. Removed all custom
margins used for icon positioning and sizing.
Task-number: QTRD-2900
Change-Id: I159bcb4d53e8ceb8f51f4a8be24504e20262f37a
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Diffstat (limited to 'examples')
4 files changed, 9 insertions, 4 deletions
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml index 5c557a0e..a6eb4701 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml @@ -17,6 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQuick.Enterprise.VirtualKeyboard 1.0 import "content" Rectangle { @@ -59,7 +60,7 @@ Rectangle { TextField { width: parent.width previewText: "One line field" - enterKeyText: "Next" + enterKeyAction: EnterKeyAction.Next onEnterKeyClicked: passwordField.focus = true } TextField { @@ -69,7 +70,7 @@ Rectangle { echoMode: TextInput.Password previewText: "Password field" inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase | Qt.ImhSensitiveData | Qt.ImhNoPredictiveText - enterKeyText: "Next" + enterKeyAction: EnterKeyAction.Next onEnterKeyClicked: numberField.focus = true } TextField { @@ -79,7 +80,7 @@ Rectangle { width: parent.width previewText: "Phone number field" inputMethodHints: Qt.ImhDialableCharactersOnly - enterKeyText: "Next" + enterKeyAction: EnterKeyAction.Next onEnterKeyClicked: textArea.focus = true } TextArea { diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml index 9729997f..7fc744b2 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml @@ -42,6 +42,7 @@ TextBase { TextEdit { id: textEdit + EnterKeyAction.actionId: textArea.enterKeyAction EnterKeyAction.label: textArea.enterKeyText EnterKeyAction.enabled: textArea.enterKeyEnabled diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml index 46172d2f..41b62aca 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml @@ -17,6 +17,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQuick.Enterprise.VirtualKeyboard 1.0 FocusScope { id: textBase @@ -25,8 +26,9 @@ FocusScope { property bool previewTextActive: !editor.activeFocus && text.length === 0 property int fontPixelSize: 32 property string previewText + property int enterKeyAction: EnterKeyAction.None property string enterKeyText - property bool enterKeyEnabled: enterKeyText.length === 0 || editor.text.length > 0 || editor.inputMethodComposing + property bool enterKeyEnabled: enterKeyAction === EnterKeyAction.None || editor.text.length > 0 || editor.inputMethodComposing property alias mouseParent: mouseArea.parent implicitHeight: editor.height + 12 diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml index 5ce6c7db..08245431 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml @@ -49,6 +49,7 @@ TextBase { TextInput { id: textInput + EnterKeyAction.actionId: textField.enterKeyAction EnterKeyAction.label: textField.enterKeyText EnterKeyAction.enabled: textField.enterKeyEnabled |