aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2018-08-17 10:40:58 +0300
committerMitch Curtis <mitch.curtis@qt.io>2018-08-17 13:32:58 +0000
commit7ea308c8520a11471f1207a27b6b3414d7250da7 (patch)
treef37b3ac04c808d3b88a1e306991be016295ab0b2
parent59a8156d8b8e09ddf026fea423562eb50a407e21 (diff)
Add Indonesian keyboard layout
[ChangeLog] Added Indonesian keyboard layout Change-Id: I22bc6eca017c5ae79783c68eaf992853ae77d4ec Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/config.pri1
-rw-r--r--src/plugins/lipi-toolkit/plugin/plugin.pro1
-rw-r--r--src/plugins/myscript/plugin/plugin.pro1
-rw-r--r--src/plugins/t9write/plugin/plugin.pro1
-rw-r--r--src/plugins/t9write/plugin/t9writeinputmethod.cpp2
-rw-r--r--src/virtualkeyboard/content/layouts/id_ID/dialpad.fallback0
-rw-r--r--src/virtualkeyboard/content/layouts/id_ID/digits.fallback0
-rw-r--r--src/virtualkeyboard/content/layouts/id_ID/handwriting.fallback0
-rw-r--r--src/virtualkeyboard/content/layouts/id_ID/main.fallback0
-rw-r--r--src/virtualkeyboard/content/layouts/id_ID/numbers.fallback0
-rw-r--r--src/virtualkeyboard/content/layouts/id_ID/symbols.fallback0
-rw-r--r--src/virtualkeyboard/doc/src/includes/layouts.qdocinc1
-rw-r--r--src/virtualkeyboard/doc/src/layouts.qdoc4
-rw-r--r--src/virtualkeyboard/virtualkeyboard.pro8
-rw-r--r--tests/auto/inputpanel/data/tst_inputpanel.qml1
15 files changed, 19 insertions, 1 deletions
diff --git a/src/config.pri b/src/config.pri
index b9a58a9b..aeb2361c 100644
--- a/src/config.pri
+++ b/src/config.pri
@@ -63,6 +63,7 @@ disable-layouts {
lang-hi_IN \
lang-hr_HR \
lang-hu_HU \
+ lang-id_ID \
lang-it_IT \
lang-ja_JP \
lang-ko_KR \
diff --git a/src/plugins/lipi-toolkit/plugin/plugin.pro b/src/plugins/lipi-toolkit/plugin/plugin.pro
index 42398833..5620b2a5 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-id.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/id_ID/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
diff --git a/src/plugins/myscript/plugin/plugin.pro b/src/plugins/myscript/plugin/plugin.pro
index 71ff7e40..17c36fab 100644
--- a/src/plugins/myscript/plugin/plugin.pro
+++ b/src/plugins/myscript/plugin/plugin.pro
@@ -64,6 +64,7 @@ contains(CONFIG, lang-he.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/he_I
contains(CONFIG, lang-hi.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/hi_IN/handwriting.qml
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-id.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/id_ID/handwriting.fallback
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
diff --git a/src/plugins/t9write/plugin/plugin.pro b/src/plugins/t9write/plugin/plugin.pro
index 8d7d7ef7..3a979783 100644
--- a/src/plugins/t9write/plugin/plugin.pro
+++ b/src/plugins/t9write/plugin/plugin.pro
@@ -39,6 +39,7 @@ t9write-alphabetic {
contains(CONFIG, lang-he.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/he_IL/handwriting.qml
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-id.*): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/id_ID/handwriting.fallback
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
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod.cpp b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
index adfaae54..891fe621 100644
--- a/src/plugins/t9write/plugin/t9writeinputmethod.cpp
+++ b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
@@ -755,7 +755,7 @@ public:
symbolCategories.append(DECUMA_CATEGORY_URL);
} else {
if (language == DECUMA_LANG_EN || language == DECUMA_LANG_NL ||
- language == DECUMA_LANG_MS)
+ language == DECUMA_LANG_MS || language == DECUMA_LANG_IN)
symbolCategories.append(DECUMA_CATEGORY_ANSI);
else
symbolCategories.append(DECUMA_CATEGORY_ISO8859_1);
diff --git a/src/virtualkeyboard/content/layouts/id_ID/dialpad.fallback b/src/virtualkeyboard/content/layouts/id_ID/dialpad.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/id_ID/dialpad.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/digits.fallback b/src/virtualkeyboard/content/layouts/id_ID/digits.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/id_ID/digits.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/handwriting.fallback b/src/virtualkeyboard/content/layouts/id_ID/handwriting.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/id_ID/handwriting.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/main.fallback b/src/virtualkeyboard/content/layouts/id_ID/main.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/id_ID/main.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/numbers.fallback b/src/virtualkeyboard/content/layouts/id_ID/numbers.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/id_ID/numbers.fallback
diff --git a/src/virtualkeyboard/content/layouts/id_ID/symbols.fallback b/src/virtualkeyboard/content/layouts/id_ID/symbols.fallback
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/virtualkeyboard/content/layouts/id_ID/symbols.fallback
diff --git a/src/virtualkeyboard/doc/src/includes/layouts.qdocinc b/src/virtualkeyboard/doc/src/includes/layouts.qdocinc
index 9f826e63..3d064b23 100644
--- a/src/virtualkeyboard/doc/src/includes/layouts.qdocinc
+++ b/src/virtualkeyboard/doc/src/includes/layouts.qdocinc
@@ -22,6 +22,7 @@ The Virtual Keyboard supports the following languages:
\li \l {Hebrew Layout (Latin)}{Hebrew (Latin)}
\li \l {Hindi Layout}{Hindi}
\li \l {Hungarian Layout}{Hungarian}
+ \li \l {Indonesian Layout}{Indonesian}
\li \l {Italian Layout}{Italian}
\li \l {Japanese Layout (Hiragana)}{Japanese (Hiragana)}
\li \l {Japanese Layout (Katakana)}{Japanese (Katakana)}
diff --git a/src/virtualkeyboard/doc/src/layouts.qdoc b/src/virtualkeyboard/doc/src/layouts.qdoc
index ba274b75..327c26e9 100644
--- a/src/virtualkeyboard/doc/src/layouts.qdoc
+++ b/src/virtualkeyboard/doc/src/layouts.qdoc
@@ -112,6 +112,10 @@ The next sections illustrate each layout.
\image layouts/qtvirtualkeyboard-layout-hu_HU.png
+\section2 Indonesian Layout
+
+\image layouts/qtvirtualkeyboard-layout-id_ID.png
+
\section2 Italian Layout
\image layouts/qtvirtualkeyboard-layout-it_IT.png
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro
index ba7a70ce..df40c9e6 100644
--- a/src/virtualkeyboard/virtualkeyboard.pro
+++ b/src/virtualkeyboard/virtualkeyboard.pro
@@ -205,6 +205,14 @@ contains(CONFIG, lang-hu.*) {
content/layouts/hu_HU/numbers.fallback \
content/layouts/hu_HU/symbols.fallback
}
+contains(CONFIG, lang-id.*) {
+ LAYOUT_FILES += \
+ content/layouts/id_ID/dialpad.fallback \
+ content/layouts/id_ID/digits.fallback \
+ content/layouts/id_ID/main.fallback \
+ content/layouts/id_ID/numbers.fallback \
+ content/layouts/id_ID/symbols.fallback
+}
contains(CONFIG, lang-it.*) {
LAYOUT_FILES += \
content/layouts/it_IT/dialpad.fallback \
diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml
index bdeb6c72..f28de423 100644
--- a/tests/auto/inputpanel/data/tst_inputpanel.qml
+++ b/tests/auto/inputpanel/data/tst_inputpanel.qml
@@ -338,6 +338,7 @@ Rectangle {
{ initLocale: "hu_HU", initInputMethodHints: Qt.ImhNoPredictiveText, inputSequence: "helló", outputText: "Helló" },
{ initLocale: "fi_FI", initInputMethodHints: Qt.ImhNoPredictiveText, inputSequence: "hei", outputText: "Hei" },
{ initLocale: "fr_FR", initInputMethodHints: Qt.ImhNoPredictiveText, inputSequence: "bonjour", outputText: "Bonjour" },
+ { initLocale: "id_ID", initInputMethodHints: Qt.ImhNoPredictiveText, inputSequence: "halo", outputText: "Halo" },
{ initLocale: "it_IT", initInputMethodHints: Qt.ImhNoPredictiveText, inputSequence: "ciao", outputText: "Ciao" },
{ initLocale: "ja_JP", initInputMethodHints: Qt.ImhNoPredictiveText, inputSequence: "watashi", outputText: "\u308F\u305F\u3057" },
{ initLocale: "ms_MY", initInputMethodHints: Qt.ImhNoPredictiveText, inputSequence: "hello", outputText: "Hello" },