Add Stroke and Romaji values to the InputMode enumeration

[ChangeLog] Added Stroke and Romaji values to the InputMode enumeration.

Pick-to: 6.1
Change-Id: I03d131c78fae7bf52b8778f7286267d5fc60af94
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

4 files changed, 12 insertions, 2 deletions

diff --git a/src/virtualkeyboard/content/components/InputModeKey.qml b/src/virtualkeyboard/content/components/InputModeKey.qml
index 4e2686f0..4d9d37af 100644
--- a/src/virtualkeyboard/content/components/InputModeKey.qml
+++ b/src/virtualkeyboard/content/components/InputModeKey.qml
@@ -77,6 +77,8 @@ Key {
         "日本語", // InputEngine.InputMode.JapaneseHandwriting
         "한국어", // InputEngine.InputMode.KoreanHandwriting
         "กขค",  // InputEngine.InputMode.Thai
+        "笔画",  // InputEngine.InputMode.Stroke
+        "ローマ字",  // InputEngine.InputMode.Romaji
     ]
 
     /*!
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
index 9c708004..19c5162b 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
@@ -807,6 +807,8 @@ void QVirtualKeyboardInputEngine::timerEvent(QTimerEvent *timerEvent)
         \li \c InputEngine.InputMode.JapaneseHandwriting Japanese handwriting.
         \li \c InputEngine.InputMode.KoreanHandwriting Korean handwriting.
         \li \c InputEngine.InputMode.Thai Thai input mode.
+        \li \c InputEngine.InputMode.Stroke Stroke input mode for Chinese.
+        \li \c InputEngine.InputMode.Romaji Romaji input mode for Japanese.
     \endlist
 */
 
@@ -890,6 +892,10 @@ void QVirtualKeyboardInputEngine::timerEvent(QTimerEvent *timerEvent)
            Korean handwriting input mode.
     \value Thai
            Thai input mode.
+    \value Stroke
+           Stroke input mode for Chinese.
+    \value Romaji
+           Romaji input mode for Japanese.
 */
 
 /*!
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.h b/src/virtualkeyboard/qvirtualkeyboardinputengine.h
index f3deb657..7fea0bb0 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputengine.h
+++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.h
@@ -85,7 +85,9 @@ public:
         ChineseHandwriting,
         JapaneseHandwriting,
         KoreanHandwriting,
-        Thai
+        Thai,
+        Stroke,
+        Romaji,
     };
     Q_ENUM(InputMode)
 
diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp
index 722aa4cd..695676ff 100644
--- a/src/virtualkeyboard/shifthandler.cpp
+++ b/src/virtualkeyboard/shifthandler.cpp
@@ -61,7 +61,7 @@ public:
         resetWhenVisible(false),
         manualShiftLanguageFilter(QSet<QLocale::Language>() << QLocale::Arabic << QLocale::Persian << QLocale::Hindi << QLocale::Korean << QLocale::Thai),
         manualCapsInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::InputMode::Cangjie << QVirtualKeyboardInputEngine::InputMode::Zhuyin << QVirtualKeyboardInputEngine::InputMode::Hebrew),
-        noAutoUppercaseInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::InputMode::FullwidthLatin << QVirtualKeyboardInputEngine::InputMode::Pinyin << QVirtualKeyboardInputEngine::InputMode::Cangjie << QVirtualKeyboardInputEngine::InputMode::Zhuyin << QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting << QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting << QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting),
+        noAutoUppercaseInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::InputMode::FullwidthLatin << QVirtualKeyboardInputEngine::InputMode::Pinyin << QVirtualKeyboardInputEngine::InputMode::Cangjie << QVirtualKeyboardInputEngine::InputMode::Zhuyin << QVirtualKeyboardInputEngine::InputMode::ChineseHandwriting << QVirtualKeyboardInputEngine::InputMode::JapaneseHandwriting << QVirtualKeyboardInputEngine::InputMode::KoreanHandwriting << QVirtualKeyboardInputEngine::InputMode::Romaji),
         allCapsInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::InputMode::Hiragana << QVirtualKeyboardInputEngine::InputMode::Katakana)
     {
     }