diff options
author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-08-17 10:18:36 +0300 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-08-17 13:32:54 +0000 |
commit | 59a8156d8b8e09ddf026fea423562eb50a407e21 (patch) | |
tree | 36073b7226c72f1ab1f7a28e0d3884fa7a652088 /src | |
parent | 66d8b2371525c235f570c92046e1705548d62e2d (diff) |
Add Malay keyboard layout
[ChangeLog] Added Malay keyboard layout
Change-Id: I4c388f6d5a8ee3863e09e2319645ba4644abc9b7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/config.pri | 1 | ||||
-rw-r--r-- | src/plugins/lipi-toolkit/plugin/plugin.pro | 1 | ||||
-rw-r--r-- | src/plugins/myscript/plugin/plugin.pro | 1 | ||||
-rw-r--r-- | src/plugins/t9write/plugin/plugin.pro | 1 | ||||
-rw-r--r-- | src/plugins/t9write/plugin/t9writeinputmethod.cpp | 3 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts/ms_MY/dialpad.fallback | 0 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts/ms_MY/digits.fallback | 0 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts/ms_MY/handwriting.fallback | 0 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts/ms_MY/main.fallback | 0 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts/ms_MY/numbers.fallback | 0 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts/ms_MY/symbols.fallback | 0 | ||||
-rw-r--r-- | src/virtualkeyboard/doc/src/includes/layouts.qdocinc | 1 | ||||
-rw-r--r-- | src/virtualkeyboard/doc/src/layouts.qdoc | 4 | ||||
-rw-r--r-- | src/virtualkeyboard/virtualkeyboard.pro | 8 |
14 files changed, 19 insertions, 1 deletions
diff --git a/src/config.pri b/src/config.pri index beb0dce1..b9a58a9b 100644 --- a/src/config.pri +++ b/src/config.pri @@ -66,6 +66,7 @@ disable-layouts { lang-it_IT \ lang-ja_JP \ lang-ko_KR \ + lang-ms_MY \ lang-nb_NO \ lang-nl_NL \ lang-pl_PL \ diff --git a/src/plugins/lipi-toolkit/plugin/plugin.pro b/src/plugins/lipi-toolkit/plugin/plugin.pro index 8e92b175..42398833 100644 --- a/src/plugins/lipi-toolkit/plugin/plugin.pro +++ b/src/plugins/lipi-toolkit/plugin/plugin.pro @@ -37,6 +37,7 @@ INSTALLS += ltk_projects LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/fallback/handwriting.qml contains(CONFIG, lang-en.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/en_GB/handwriting.fallback +contains(CONFIG, lang-ms.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/ms_MY/handwriting.fallback contains(CONFIG, lang-nl.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/nl_NL/handwriting.fallback !isEmpty(LAYOUT_FILES) { diff --git a/src/plugins/myscript/plugin/plugin.pro b/src/plugins/myscript/plugin/plugin.pro index e2482e49..71ff7e40 100644 --- a/src/plugins/myscript/plugin/plugin.pro +++ b/src/plugins/myscript/plugin/plugin.pro @@ -67,6 +67,7 @@ contains(CONFIG, lang-hu.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/hu_H contains(CONFIG, lang-it.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/it_IT/handwriting.fallback contains(CONFIG, lang-ja.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/ja_JP/handwriting.qml contains(CONFIG, lang-ko.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/ko_KR/handwriting.qml +contains(CONFIG, lang-ms.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/ms_MY/handwriting.fallback contains(CONFIG, lang-nb.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/nb_NO/handwriting.fallback contains(CONFIG, lang-nl.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/nl_NL/handwriting.fallback contains(CONFIG, lang-pl.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/pl_PL/handwriting.fallback diff --git a/src/plugins/t9write/plugin/plugin.pro b/src/plugins/t9write/plugin/plugin.pro index c31774a1..8d7d7ef7 100644 --- a/src/plugins/t9write/plugin/plugin.pro +++ b/src/plugins/t9write/plugin/plugin.pro @@ -40,6 +40,7 @@ t9write-alphabetic { contains(CONFIG, lang-hr.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/hr_HR/handwriting.qml contains(CONFIG, lang-hu.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/hu_HU/handwriting.qml contains(CONFIG, lang-it.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/it_IT/handwriting.fallback + contains(CONFIG, lang-ms.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/ms_MY/handwriting.fallback contains(CONFIG, lang-nb.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/nb_NO/handwriting.fallback contains(CONFIG, lang-nl.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/nl_NL/handwriting.fallback contains(CONFIG, lang-pl.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/pl_PL/handwriting.fallback diff --git a/src/plugins/t9write/plugin/t9writeinputmethod.cpp b/src/plugins/t9write/plugin/t9writeinputmethod.cpp index 7c8927fc..adfaae54 100644 --- a/src/plugins/t9write/plugin/t9writeinputmethod.cpp +++ b/src/plugins/t9write/plugin/t9writeinputmethod.cpp @@ -754,7 +754,8 @@ public: } else if (inputMethodHints.testFlag(Qt::ImhUrlCharactersOnly)) { symbolCategories.append(DECUMA_CATEGORY_URL); } else { - if (language == DECUMA_LANG_EN || language == DECUMA_LANG_NL) + if (language == DECUMA_LANG_EN || language == DECUMA_LANG_NL || + language == DECUMA_LANG_MS) symbolCategories.append(DECUMA_CATEGORY_ANSI); else symbolCategories.append(DECUMA_CATEGORY_ISO8859_1); diff --git a/src/virtualkeyboard/content/layouts/ms_MY/dialpad.fallback b/src/virtualkeyboard/content/layouts/ms_MY/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/ms_MY/digits.fallback b/src/virtualkeyboard/content/layouts/ms_MY/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/ms_MY/handwriting.fallback b/src/virtualkeyboard/content/layouts/ms_MY/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/ms_MY/main.fallback b/src/virtualkeyboard/content/layouts/ms_MY/main.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/main.fallback diff --git a/src/virtualkeyboard/content/layouts/ms_MY/numbers.fallback b/src/virtualkeyboard/content/layouts/ms_MY/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/ms_MY/symbols.fallback b/src/virtualkeyboard/content/layouts/ms_MY/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/symbols.fallback diff --git a/src/virtualkeyboard/doc/src/includes/layouts.qdocinc b/src/virtualkeyboard/doc/src/includes/layouts.qdocinc index b9c7a182..9f826e63 100644 --- a/src/virtualkeyboard/doc/src/includes/layouts.qdocinc +++ b/src/virtualkeyboard/doc/src/includes/layouts.qdocinc @@ -28,6 +28,7 @@ The Virtual Keyboard supports the following languages: \li \l {Japanese Layout (Full Width Latin)}{Japanese (Full Width Latin)} \li \l {Japanese Layout (Latin)}{Japanese (Latin)} \li \l {Korean Layout}{Korean} + \li \l {Malay Layout}{Malay} \li \l {Norwegian Layout}{Norwegian} \li \l {Persian/Farsi Layout}{Persian/Farsi} \li \l {Polish Layout}{Polish} diff --git a/src/virtualkeyboard/doc/src/layouts.qdoc b/src/virtualkeyboard/doc/src/layouts.qdoc index 07afe505..ba274b75 100644 --- a/src/virtualkeyboard/doc/src/layouts.qdoc +++ b/src/virtualkeyboard/doc/src/layouts.qdoc @@ -136,6 +136,10 @@ The next sections illustrate each layout. \image layouts/qtvirtualkeyboard-layout-ko_KR.png +\section2 Malay Layout + +\image layouts/qtvirtualkeyboard-layout-ms_MY.png + \section2 Norwegian Layout \image layouts/qtvirtualkeyboard-layout-nb_NO.png diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index 5b3d2872..ba7a70ce 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -221,6 +221,14 @@ contains(CONFIG, lang-nb.*) { content/layouts/nb_NO/numbers.fallback \ content/layouts/nb_NO/symbols.fallback } +contains(CONFIG, lang-ms.*) { + LAYOUT_FILES += \ + content/layouts/ms_MY/dialpad.fallback \ + content/layouts/ms_MY/digits.fallback \ + content/layouts/ms_MY/main.fallback \ + content/layouts/ms_MY/numbers.fallback \ + content/layouts/ms_MY/symbols.fallback +} contains(CONFIG, lang-nl.*) { LAYOUT_FILES += \ content/layouts/nl_NL/dialpad.fallback \ |