Add new component InputModeKey

Toggles between available input modes.

[ChangeLog] Added new component (InputModeKey) for input mode switch.

Change-Id: Ie7c53b177264e8c8f8004bb953da9e8568631fab
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

17 files changed, 142 insertions, 179 deletions

diff --git a/src/virtualkeyboard/content/components/InputModeKey.qml b/src/virtualkeyboard/content/components/InputModeKey.qml
new file mode 100644
index 00000000..dcc10d54
--- /dev/null
+++ b/src/virtualkeyboard/content/components/InputModeKey.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.VirtualKeyboard 2.3
+
+/*!
+    \qmltype InputModeKey
+    \inqmlmodule QtQuick.VirtualKeyboard
+    \ingroup qtvirtualkeyboard-qml
+    \inherits Key
+    \since QtQuick.VirtualKeyboard 2.3
+
+    \brief Input mode key for keyboard layouts.
+
+    This key toggles between available \l {InputEngine::inputModes} {InputEngine.inputModes}.
+*/
+
+Key {
+    key: Qt.Key_Mode_switch
+    noKeyEvent: true
+    functionKey: true
+    text: InputContext.inputEngine.inputMode < inputModeNameList.length ?
+              inputModeNameList[InputContext.inputEngine.inputMode] : "ABC"
+    onClicked: InputContext.inputEngine.inputMode = __nextInputMode(InputContext.inputEngine.inputMode)
+    keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
+    enabled: InputContext.inputEngine.inputModes.length > 1
+
+    /*!
+        List of input mode names.
+
+        The default list contains all known input modes for \l {InputEngine::inputMode} {InputEngine.inputMode}.
+    */
+    property var inputModeNameList: [
+        "ABC",  // InputEngine.Latin
+        "123",  // InputEngine.Numeric
+        "123",  // InputEngine.Dialable
+        "拼音",  // InputEngine.Pinyin
+        "倉頡",  // InputEngine.Cangjie
+        "注音",  // InputEngine.Zhuyin
+        "한글",  // InputEngine.Hangul
+        "あ",    // InputEngine.Hiragana
+        "カ",    // InputEngine.Katakana
+        "全角",  // InputEngine.FullwidthLatin
+    ]
+
+    function __nextInputMode(inputMode) {
+        var inputModes = InputContext.inputEngine.inputModes
+        if (inputModes.length < 2)
+            return inputMode
+        var inputModeIndex = inputModes.indexOf(inputMode) + 1
+        if (inputModeIndex >= inputModes.length)
+            inputModeIndex = 0
+        return inputModes[inputModeIndex]
+    }
+}
diff --git a/src/virtualkeyboard/content/content.qrc b/src/virtualkeyboard/content/content.qrc
index 431e4205..d29dbe33 100644
--- a/src/virtualkeyboard/content/content.qrc
+++ b/src/virtualkeyboard/content/content.qrc
@@ -30,5 +30,6 @@
         <file>components/LanguagePopupList.qml</file>
         <file>components/SelectionControl.qml</file>
         <file>components/ShadowInputControl.qml</file>
+        <file>components/InputModeKey.qml</file>
     </qresource>
 </RCC>
diff --git a/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml b/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml
index 29d34dad..0de55c64 100644
--- a/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml b/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml
index 29d34dad..0de55c64 100644
--- a/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml b/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml
index bc84e4da..b5baceb3 100644
--- a/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -66,15 +66,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml
index 16b9ab57..162079d6 100644
--- a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml b/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml
index 29d34dad..0de55c64 100644
--- a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml b/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml
index 29d34dad..0de55c64 100644
--- a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml b/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml
index 29d34dad..0de55c64 100644
--- a/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/ja_JP/main.qml b/src/virtualkeyboard/content/layouts/ja_JP/main.qml
index 84baba97..772702af 100644
--- a/src/virtualkeyboard/content/layouts/ja_JP/main.qml
+++ b/src/virtualkeyboard/content/layouts/ja_JP/main.qml
@@ -28,11 +28,11 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; JapaneseInputMethod {}', parent, "japaneseInputMethod")
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; JapaneseInputMethod {}', parent, "japaneseInputMethod")
     }
     sharedLayouts: ['symbols']
     sourceComponent: InputContext.inputEngine.inputMode === InputEngine.FullwidthLatin ? page2 : page1
@@ -129,38 +129,20 @@ KeyboardLayoutLoader {
             }
             KeyboardRow {
                 keyWeight: 156
-                Key {
-                    key: Qt.Key_Mode_switch
-                    noKeyEvent: true
-                    functionKey: true
+                InputModeKey {
                     enabled: !(InputContext.inputMethodHints & Qt.ImhLatinOnly)
-                    displayText: {
-                        switch (InputContext.inputEngine.inputMode) {
-                        case InputEngine.Latin:
-                            return "\u534A\u89D2"
-                        case InputEngine.Hiragana:
-                            return "\u3042"
-                        case InputEngine.Katakana:
-                            return "\u30AB"
-                        default:
-                            return ""
-                        }
-                    }
-                    onClicked: {
-                        switch (InputContext.inputEngine.inputMode) {
-                        case InputEngine.Latin:
-                            InputContext.inputEngine.inputMode = InputEngine.FullwidthLatin
-                            break
-                        case InputEngine.Hiragana:
-                            InputContext.inputEngine.inputMode = InputEngine.Katakana
-                            break
-                        case InputEngine.Katakana:
-                            InputContext.inputEngine.inputMode = InputEngine.Latin
-                            break
-                        default:
-                            break
-                        }
-                    }
+                    inputModeNameList: [
+                        "半角",  // InputEngine.Latin
+                        "",     // InputEngine.Numeric
+                        "",     // InputEngine.Dialable
+                        "",     // InputEngine.Pinyin
+                        "",     // InputEngine.Cangjie
+                        "",     // InputEngine.Zhuyin
+                        "",     // InputEngine.Hangul
+                        "あ",    // InputEngine.Hiragana
+                        "カ",    // InputEngine.Katakana
+                        "全角",  // InputEngine.FullwidthLatin
+                    ]
                 }
                 Key {
                     key: Qt.Key_Z
@@ -349,12 +331,7 @@ KeyboardLayoutLoader {
             }
             KeyboardRow {
                 keyWeight: 156
-                Key {
-                    key: Qt.Key_Mode_switch
-                    noKeyEvent: true
-                    functionKey: true
-                    displayText: "\u5168\u89D2"
-                    onClicked: InputContext.inputEngine.inputMode = InputEngine.Hiragana
+                InputModeKey {
                 }
                 Key {
                     key: Qt.Key_Z
diff --git a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml b/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml
index 29d34dad..0de55c64 100644
--- a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml b/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml
index 29d34dad..0de55c64 100644
--- a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml b/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml
index 29d34dad..0de55c64 100644
--- a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml b/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml
index ab2600f5..7826b542 100644
--- a/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -66,15 +66,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml b/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml
index 29d34dad..0de55c64 100644
--- a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml b/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml
index 29d34dad..0de55c64 100644
--- a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml
+++ b/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml
@@ -21,11 +21,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayout {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent)
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent)
     }
     sharedLayouts: ['symbols']
     inputMode: InputEngine.Latin
@@ -58,15 +58,8 @@ KeyboardLayout {
         id: bottomRow
         Layout.preferredHeight: 1
         keyWeight: 154
-        Key {
+        InputModeKey {
             weight: 217
-            key: Qt.Key_Mode_switch
-            noKeyEvent: true
-            functionKey: true
-            text: InputContext.inputEngine.inputMode === InputEngine.Latin ? "123" : "ABC"
-            onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.Latin ? InputEngine.Numeric : InputEngine.Latin
-            enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly))
-            keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined
         }
         ChangeLanguageKey {
             weight: 154
diff --git a/src/virtualkeyboard/content/layouts/zh_TW/main.qml b/src/virtualkeyboard/content/layouts/zh_TW/main.qml
index a71a27c5..25108389 100644
--- a/src/virtualkeyboard/content/layouts/zh_TW/main.qml
+++ b/src/virtualkeyboard/content/layouts/zh_TW/main.qml
@@ -29,11 +29,11 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
     function createInputMethod() {
-        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; TCInputMethod {}', parent, "tcInputMethod")
+        return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; TCInputMethod {}', parent, "tcInputMethod")
     }
     sharedLayouts: ['symbols']
     sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cangjie ? pageCangjie : pageZhuyin
@@ -197,11 +197,8 @@ KeyboardLayoutLoader {
                 ChangeLanguageKey {
                     weight: 154
                 }
-                ModeKey {
+                InputModeKey {
                     visible: InputContext.inputEngine.inputModes.indexOf(InputEngine.Zhuyin) !== -1
-                    // Cangjie
-                    displayText: "\u5009\u9821"
-                    onClicked: InputContext.inputEngine.inputMode = InputEngine.Zhuyin
                 }
                 SpaceKey {
                     weight: 864
@@ -423,11 +420,8 @@ KeyboardLayoutLoader {
                 ChangeLanguageKey {
                     weight: 154
                 }
-                ModeKey {
+                InputModeKey {
                     visible: InputContext.inputEngine.inputModes.indexOf(InputEngine.Cangjie) !== -1
-                    // Zhuyin
-                    displayText: "\u6CE8\u97F3"
-                    onClicked: InputContext.inputEngine.inputMode = InputEngine.Cangjie
                 }
                 SpaceKey {
                     weight: 864