Merge lp:~thomas-moenicke/phablet-extras/maliit-plugins-pinyin into lp:phablet-extras/maliit-plugins

[Thomas Moenicke]

adding Chinese - pinyin support

adding Chinese - pinyin support

[Thomas Moenicke (thomas-moenicke)]

work in progress

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2132
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/65/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-moenicke/phablet-extras/maliit-plugins-pinyin]

2133. By Thomas Moenicke on 2013-06-14

switch wordengine backend according to language

2134. By Thomas Moenicke on 2013-06-14

typo

[Thomas Moenicke (thomas-moenicke)]

the head of /etc/xdg/maliit.org/server.conf should look like this:

[maliit]
onscreen\active=libmaliit-keyboard-plugin.so:zh_cn_pinyin

pluginsettings\libmaliit-keyboard-plugin.so\current_style = ubuntu
pluginsettings\libmaliit-keyboard-plugin.so\word_engine_enabled = true

...

[Thomas Moenicke (thomas-moenicke)]

these steps also should be done in order to set the phone to chinese:

1) sudo apt-get install fonts-droid
2) sudo locale-gen zh_CN.UTF-8
3) sudo vi /etc/default/local change LANG="en_US.UTF-8" to LANG="zh_CN.UTF-8"
4) sudo vi /etc/environment change LANG="zh_CN.UTF-8" and LANGUAGE="zh_CN"
5) reboot

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2134
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/66/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/66/rebuild

review: Needs Fixing (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

Logic::LanguageFeatures appends a space to every commit string, which is not correct for pinyin. Needs to be fixed

[lp:~thomas-moenicke/phablet-extras/maliit-plugins-pinyin]

2135. By Thomas Moenicke on 2013-06-17

added chinese language features: no space after word suggestion, no upper/lowercase

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2135
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/67/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/67/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-moenicke/phablet-extras/maliit-plugins-pinyin]

2136. By Thomas Moenicke on 2013-06-17

adding dependency to glib-2.0-dev

2137. By Thomas Moenicke on 2013-06-17

polished layout:
- removed uppercase, not needed for pinyin
- removed redundant return key
- fixed spacing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2136
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/68/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2137
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/69/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-06-06 10:29:18 +0000
+++ debian/control	2013-06-17 15:53:36 +0000
@@ -14,7 +14,9 @@
                maliit-framework-dev (>= 0.94.0-w03-springbok1phablet15), 
                libhunspell-dev, 
                libpresage-dev,
-               libubuntu-platform-api1-dev
+               libubuntu-platform-api1-dev,
+               libpinyin2-dev,
+               libglib2.0-dev
 Standards-Version: 3.9.3
 
 Package: nemo-keyboard
@@ -39,6 +41,7 @@
 Architecture: armhf
 Depends:  maliit-framework, 
           libpresage1, 
+          libpinyin2, 
           ${misc:Depends}, 
           ${shlibs:Depends}, 
           qtdeclarative5-window-plugin
 
=== modified file 'debian/rules'
--- debian/rules	2013-06-07 08:43:47 +0000
+++ debian/rules	2013-06-17 15:53:36 +0000
@@ -16,6 +16,7 @@
 	CONFIG+=enable-presage \
 	CONFIG+=enable-hunspell \
 	CONFIG+=enable-preedit \
+	CONFIG+=enable-pinyin \
 	CONFIG+=enable-qt-mobility \
 	CONFIG+=enable-maliit-keyboard \
 	CONFIG+=enable-nemo-keyboard
 
=== modified file 'maliit-keyboard/data/languages/de.xml'
--- maliit-keyboard/data/languages/de.xml	2013-04-26 13:05:20 +0000
+++ maliit-keyboard/data/languages/de.xml	2013-06-17 15:53:36 +0000
@@ -490,6 +490,9 @@
         </key>
       </row>
       <row>
+        <key id="actionKey" style="special" width="large">
+          <binding action="layout_menu" label="de" />
+        </key>
         <key style="special" width="large">
           <binding action="sym" label="?123" />
         </key>
 
=== modified file 'maliit-keyboard/data/languages/en_gb.xml'
--- maliit-keyboard/data/languages/en_gb.xml	2013-04-26 13:05:20 +0000
+++ maliit-keyboard/data/languages/en_gb.xml	2013-06-17 15:53:36 +0000
@@ -463,7 +463,10 @@
         </key>
       </row>
       <row>
-        <key style="special" width="x-large">
+        <key id="actionKey" style="special" width="large">
+          <binding action="layout_menu" label="en" />
+        </key>
+        <key style="special" width="large">
           <binding action="sym" label="?123" />
         </key>
         <spacer />
 
=== modified file 'maliit-keyboard/data/languages/en_us.xml'
--- maliit-keyboard/data/languages/en_us.xml	2013-04-26 13:05:20 +0000
+++ maliit-keyboard/data/languages/en_us.xml	2013-06-17 15:53:36 +0000
@@ -460,7 +460,10 @@
         </key>
       </row>
       <row>
-        <key style="special" width="x-large">
+        <key id="actionKey" style="special" width="large">
+          <binding action="layout_menu" label="en" />
+        </key>
+        <key style="special" width="large">
           <binding action="sym" label="?123" />
         </key>
         <spacer />
 
=== modified file 'maliit-keyboard/data/languages/es.xml'
--- maliit-keyboard/data/languages/es.xml	2012-08-17 12:00:21 +0000
+++ maliit-keyboard/data/languages/es.xml	2013-06-17 15:53:36 +0000
@@ -466,7 +466,10 @@
         </key>
       </row>
       <row>
-        <key style="special" width="x-large">
+        <key id="actionKey" style="special" width="large">
+          <binding action="layout_menu" label="es" />
+        </key>
+        <key style="special" width="large">
           <binding action="sym" label="?123" />
         </key>
         <key style="special">
@@ -475,7 +478,7 @@
         <key id="emailUrlKey">
           <binding label="," />
         </key>
-        <key width="stretched">
+        <key width="xx-large">
           <binding action="space" label="" />
         </key>
         <key>
 
=== modified file 'maliit-keyboard/data/languages/zh_cn_pinyin.xml'
--- maliit-keyboard/data/languages/zh_cn_pinyin.xml	2012-08-17 12:00:21 +0000
+++ maliit-keyboard/data/languages/zh_cn_pinyin.xml	2013-06-17 15:53:36 +0000
@@ -7,72 +7,42 @@
       <row>
         <key>
           <binding label="q">
-            <modifiers keys="shift">
-              <binding label="Q" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="w">
-            <modifiers keys="shift">
-              <binding label="W" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="e">
-            <modifiers keys="shift">
-              <binding label="E" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="r">
-            <modifiers keys="shift">
-              <binding label="R" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="t">
-            <modifiers keys="shift">
-              <binding label="T" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="y">
-            <modifiers keys="shift">
-              <binding label="Y" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="u">
-            <modifiers keys="shift">
-              <binding label="U" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="i">
-            <modifiers keys="shift">
-              <binding label="I" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="o">
-            <modifiers keys="shift">
-              <binding label="O" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="p">
-            <modifiers keys="shift">
-              <binding label="P" />
-            </modifiers>
           </binding>
         </key>
       </row>
@@ -80,143 +50,100 @@
         <spacer />
         <key>
           <binding label="a">
-            <modifiers keys="shift">
-              <binding label="A" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="s">
-            <modifiers keys="shift">
-              <binding label="S" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="d">
-            <modifiers keys="shift">
-              <binding label="D" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="f">
-            <modifiers keys="shift">
-              <binding label="F" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="g">
-            <modifiers keys="shift">
-              <binding label="G" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="h">
-            <modifiers keys="shift">
-              <binding label="H" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="j">
-            <modifiers keys="shift">
-              <binding label="J" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="k">
-            <modifiers keys="shift">
-              <binding label="K" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="l">
-            <modifiers keys="shift">
-              <binding label="L" />
-            </modifiers>
           </binding>
         </key>
         <spacer />
       </row>
       <row>
-        <key style="special" width="large">
+<!--        <key style="special" width="large">
           <binding action="shift" label="" />
-        </key>
+        </key>//-->
+        <spacer />
         <spacer />
         <key>
           <binding label="z">
-            <modifiers keys="shift">
-              <binding label="Z" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="x">
-            <modifiers keys="shift">
-              <binding label="X" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="c">
-            <modifiers keys="shift">
-              <binding label="C" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="v">
-            <modifiers keys="shift">
-              <binding label="V" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="b">
-            <modifiers keys="shift">
-              <binding label="B" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="n">
-            <modifiers keys="shift">
-              <binding label="N" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="m">
-            <modifiers keys="shift">
-              <binding label="M" />
-            </modifiers>
           </binding>
         </key>
         <spacer />
         <key style="special" width="large">
           <binding action="backspace" label="" />
         </key>
+        <spacer />
       </row>
       <row>
-        <key style="special" width="x-large">
+        <key id="actionKey" style="special" width="large">
+          <binding action="layout_menu" label="cn" />
+        </key>
+        <key style="special" width="large">
           <binding action="sym" label="符号" />
         </key>
-        <key id="emailUrlKey">
+        <key id="emailUrlKey" width="small">
           <binding label="，" />
         </key>
-        <key width="stretched">
+        <key width="xx-large">
           <binding action="space" label="" />
         </key>
-        <key id="emailUrlDotKey">
+        <key id="emailUrlDotKey" width="small">
           <binding label="。" />
         </key>
         <key id="actionKey" style="special" width="x-large">
-          <binding action="compose" label="输入" />
+          <binding action="return" label="输入" />
         </key>
       </row>
     </section>
@@ -226,72 +153,42 @@
       <row>
         <key>
           <binding label="q">
-            <modifiers keys="shift">
-              <binding label="Q" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="w">
-            <modifiers keys="shift">
-              <binding label="W" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="e">
-            <modifiers keys="shift">
-              <binding label="E" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="r">
-            <modifiers keys="shift">
-              <binding label="R" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="t">
-            <modifiers keys="shift">
-              <binding label="T" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="y">
-            <modifiers keys="shift">
-              <binding label="Y" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="u">
-            <modifiers keys="shift">
-              <binding label="U" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="i">
-            <modifiers keys="shift">
-              <binding label="I" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="o">
-            <modifiers keys="shift">
-              <binding label="O" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="p">
-            <modifiers keys="shift">
-              <binding label="P" />
-            </modifiers>
           </binding>
         </key>
       </row>
@@ -299,65 +196,38 @@
         <spacer />
         <key>
           <binding label="a">
-            <modifiers keys="shift">
-              <binding label="A" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="s">
-            <modifiers keys="shift">
-              <binding label="S" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="d">
-            <modifiers keys="shift">
-              <binding label="D" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="f">
-            <modifiers keys="shift">
-              <binding label="F" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="g">
-            <modifiers keys="shift">
-              <binding label="G" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="h">
-            <modifiers keys="shift">
-              <binding label="H" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="j">
-            <modifiers keys="shift">
-              <binding label="J" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="k">
-            <modifiers keys="shift">
-              <binding label="K" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="l">
-            <modifiers keys="shift">
-              <binding label="L" />
-            </modifiers>
           </binding>
         </key>
         <spacer />
@@ -369,73 +239,53 @@
         <spacer />
         <key>
           <binding label="z">
-            <modifiers keys="shift">
-              <binding label="Z" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="x">
-            <modifiers keys="shift">
-              <binding label="X" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="c">
-            <modifiers keys="shift">
-              <binding label="C" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="v">
-            <modifiers keys="shift">
-              <binding label="V" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="b">
-            <modifiers keys="shift">
-              <binding label="B" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="n">
-            <modifiers keys="shift">
-              <binding label="N" />
-            </modifiers>
           </binding>
         </key>
         <key>
           <binding label="m">
-            <modifiers keys="shift">
-              <binding label="M" />
-            </modifiers>
           </binding>
         </key>
         <spacer />
         <key style="special" width="large">
           <binding action="backspace" label="" />
         </key>
+        <spacer />
       </row>
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="符号" />
         </key>
-        <key id="emailUrlKey">
+        <key id="emailUrlKey" width="small">
           <binding label="，" />
         </key>
-        <key width="stretched">
+        <key width="xx-large">
           <binding action="space" label="" />
         </key>
-        <key id="emailUrlDotKey">
+        <key id="emailUrlDotKey" width="small">
           <binding label="。" />
         </key>
         <key id="actionKey" style="special" width="x-large">
-          <binding action="compose" label="输入" />
+          <binding action="return" label="输入" />
         </key>
       </row>
     </section>
 
=== modified file 'maliit-keyboard/lib/lib.pro'
--- maliit-keyboard/lib/lib.pro	2013-04-11 06:57:11 +0000
+++ maliit-keyboard/lib/lib.pro	2013-06-17 15:53:36 +0000
@@ -6,6 +6,11 @@
 QT += core gui quick
 CONFIG += staticlib
 
+CONFIG += link_pkgconfig
+PKGCONFIG += glib-2.0
+PKGCONFIG += libpinyin
+LIBS += libpinyin
+
 include(models/models.pri)
 include(logic/logic.pri)
 include(parser/parser.pri)
 
=== added file 'maliit-keyboard/lib/logic/chineselanguagefeatures.cpp'
--- maliit-keyboard/lib/logic/chineselanguagefeatures.cpp	1970-01-01 00:00:00 +0000
+++ maliit-keyboard/lib/logic/chineselanguagefeatures.cpp	2013-06-17 15:53:36 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "chineselanguagefeatures.h"
+
+namespace MaliitKeyboard {
+namespace Logic {
+
+ChineseLanguageFeatures::ChineseLanguageFeatures(QObject *parent) :
+    AbstractLanguageFeatures(parent)
+{
+}
+
+ChineseLanguageFeatures::~ChineseLanguageFeatures()
+{
+}
+
+bool ChineseLanguageFeatures::activateAutoCaps(const QString &preedit) const
+{
+    return false;
+}
+
+QString ChineseLanguageFeatures::appendixForReplacedPreedit(const QString &preedit) const
+{
+    return "";
+}
+
+} // namespace Logic
+} // namespace MaliitKeyboard
 
=== added file 'maliit-keyboard/lib/logic/chineselanguagefeatures.h'
--- maliit-keyboard/lib/logic/chineselanguagefeatures.h	1970-01-01 00:00:00 +0000
+++ maliit-keyboard/lib/logic/chineselanguagefeatures.h	2013-06-17 15:53:36 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CHINESELANGUAGEFEATURES_H
+#define CHINESELANGUAGEFEATURES_H
+
+#include "abstractlanguagefeatures.h"
+
+namespace MaliitKeyboard {
+namespace Logic {
+
+class ChineseLanguageFeatures : public AbstractLanguageFeatures
+{
+    Q_OBJECT
+public:
+    explicit ChineseLanguageFeatures(QObject *parent = 0);
+    virtual ~ChineseLanguageFeatures();
+
+    virtual bool activateAutoCaps(const QString &preedit) const;
+    virtual QString appendixForReplacedPreedit(const QString &preedit) const;
+};
+
+} // namespace Logic
+} // namespace MaliitKeyboard
+
+#endif // CHINESELANGUAGEFEATURES_H
 
=== modified file 'maliit-keyboard/lib/logic/dynamiclayout.cpp'
--- maliit-keyboard/lib/logic/dynamiclayout.cpp	2013-06-05 13:00:26 +0000
+++ maliit-keyboard/lib/logic/dynamiclayout.cpp	2013-06-17 15:53:36 +0000
@@ -1,4 +1,18 @@
-
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "dynamiclayout.h"
 #include "dynamiclayout_p.h"
 
=== modified file 'maliit-keyboard/lib/logic/dynamiclayout.h'
--- maliit-keyboard/lib/logic/dynamiclayout.h	2013-06-05 13:00:26 +0000
+++ maliit-keyboard/lib/logic/dynamiclayout.h	2013-06-17 15:53:36 +0000
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef DYNAMICLAYOUT_H
 #define DYNAMICLAYOUT_H
 
 
=== modified file 'maliit-keyboard/lib/logic/eventhandler.cpp'
--- maliit-keyboard/lib/logic/eventhandler.cpp	2013-05-29 09:54:04 +0000
+++ maliit-keyboard/lib/logic/eventhandler.cpp	2013-06-17 15:53:36 +0000
@@ -206,4 +206,11 @@
     Q_EMIT wordCandidateReleased(candidate);
 }
 
+void EventHandler::onLanguageChangeRequested(QString languageId)
+{
+    Q_D(EventHandler);
+
+    d->updater->setActiveKeyboardId(languageId);
+}
+
 }} // namespace Logic, MaliitKeyboard
 
=== modified file 'maliit-keyboard/lib/logic/eventhandler.h'
--- maliit-keyboard/lib/logic/eventhandler.h	2013-05-24 11:16:27 +0000
+++ maliit-keyboard/lib/logic/eventhandler.h	2013-06-17 15:53:36 +0000
@@ -73,6 +73,7 @@
 
     Q_INVOKABLE void onWordCandidatePressed(QString word);
     Q_INVOKABLE void onWordCandidateReleased(QString word);
+    Q_INVOKABLE void onLanguageChangeRequested(QString languageId);
 
     // Key signals:
     Q_SIGNAL void keyPressed(const Key &key);
@@ -84,6 +85,8 @@
     Q_SIGNAL void wordCandidatePressed(const WordCandidate &candidate);
     Q_SIGNAL void wordCandidateReleased(const WordCandidate &candidate);
 
+    Q_SIGNAL void languageChangeRequested(QString languageId);
+
 private:
     const QScopedPointer<EventHandlerPrivate> d_ptr;
 };
 
=== modified file 'maliit-keyboard/lib/logic/layoutupdater.cpp'
--- maliit-keyboard/lib/logic/layoutupdater.cpp	2013-05-29 15:51:40 +0000
+++ maliit-keyboard/lib/logic/layoutupdater.cpp	2013-06-17 15:53:36 +0000
@@ -301,6 +301,7 @@
 {
     Q_D(LayoutUpdater);
     d->loader.setActiveId(id);
+    Q_EMIT languageChanged(id);
 }
 
 QString LayoutUpdater::keyboardTitle(const QString &id) const
 
=== modified file 'maliit-keyboard/lib/logic/layoutupdater.h'
--- maliit-keyboard/lib/logic/layoutupdater.h	2013-03-22 16:40:29 +0000
+++ maliit-keyboard/lib/logic/layoutupdater.h	2013-06-17 15:53:36 +0000
@@ -104,6 +104,7 @@
     Q_SIGNAL void addToUserDictionary();
 
     Q_SIGNAL void keyboardTitleChanged(const QString &title);
+    Q_SIGNAL void languageChanged(const QString& languageId);
 
 private:
     Q_SIGNAL void shiftPressed();
 
=== modified file 'maliit-keyboard/lib/logic/logic.pri'
--- maliit-keyboard/lib/logic/logic.pri	2013-06-03 12:20:12 +0000
+++ maliit-keyboard/lib/logic/logic.pri	2013-06-17 15:53:36 +0000
@@ -13,7 +13,9 @@
     logic/abstractlanguagefeatures.h \
     logic/languagefeatures.h \
     logic/eventhandler.h \
-    logic/dynamiclayout.h
+    logic/dynamiclayout.h \
+    logic/pinyinadapter.h \
+    logic/chineselanguagefeatures.h
 
 SOURCES += \
     logic/hitlogic.cpp \
@@ -28,7 +30,9 @@
     logic/abstractlanguagefeatures.cpp \
     logic/languagefeatures.cpp \
     logic/eventhandler.cpp \
-    logic/dynamiclayout.cpp
+    logic/dynamiclayout.cpp \
+    logic/pinyinadapter.cpp \
+    logic/chineselanguagefeatures.cpp
 
 DEFINES += HUNSPELL_DICT_PATH=\\\"$$HUNSPELL_DICT_PATH\\\"
 
 
=== added file 'maliit-keyboard/lib/logic/pinyinadapter.cpp'
--- maliit-keyboard/lib/logic/pinyinadapter.cpp	1970-01-01 00:00:00 +0000
+++ maliit-keyboard/lib/logic/pinyinadapter.cpp	2013-06-17 15:53:36 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_PINYIN
+
+#include "pinyinadapter.h"
+
+#include <iostream>
+
+#include <iconv.h>
+#include <string>
+#include <string.h>
+
+#include <QDebug>
+
+PinyinAdapter::PinyinAdapter(QObject *parent) :
+    QObject(parent)
+{
+    m_context = pinyin_init("/usr/lib/arm-linux-gnueabihf/libpinyin/data/", ".");
+    m_instance = pinyin_alloc_instance(m_context);
+
+    pinyin_set_options(m_context, IS_PINYIN | USE_DIVIDED_TABLE | USE_RESPLIT_TABLE);
+}
+
+PinyinAdapter::~PinyinAdapter()
+{
+    g_array_free(m_array, TRUE);
+    pinyin_free_instance(m_instance);
+    pinyin_fini(m_context);
+}
+
+QString PinyinAdapter::parse(const QString& string)
+{
+    pinyin_parse_more_full_pinyins(m_instance, string.toLatin1().data());
+
+    int cursor = 0;
+
+#ifdef PINYIN_DEBUG
+    for (int i = 0; i < m_instance->m_pinyin_keys->len; i ++)
+    {
+        PinyinKey* pykey = &g_array_index(m_instance->m_pinyin_keys, PinyinKey, i);
+        gchar* py = pykey->get_pinyin_string();
+        std::cout << py << " ";
+        g_free(py);
+    }
+    std::cout << std::endl;
+#endif
+
+    m_array = g_array_new(FALSE, FALSE, sizeof(lookup_candidate_t));
+    pinyin_get_candidates(m_instance, 0, m_array);
+
+    pinyin_guess_sentence(m_instance);
+
+    char* sentence = NULL;
+    pinyin_get_sentence(m_instance, &sentence);
+
+    candidates.clear();
+    for (int i = 0 ; i < m_array->len; i ++ )
+    {
+        lookup_candidate_t token = g_array_index(m_array, lookup_candidate_t, i);
+        char* word = NULL;
+        // Translate the token to utf-8 phrase.
+        pinyin_translate_token(m_instance, token.m_token, &word);
+        if (word) {
+            candidates.append(QString(word));
+        }
+        g_free(word);
+    }
+
+    QString unicode(sentence);
+    g_free(sentence);
+    return unicode;
+}
+
+QStringList PinyinAdapter::getWordCandidates() const
+{
+    return candidates;
+}
+
+void PinyinAdapter::wordCandidateSelected(const QString& word)
+{
+    pinyin_choose_candidate(m_instance, 0, &g_array_index(m_array, lookup_candidate_t, 1));
+}
+
+void PinyinAdapter::reset()
+{
+    pinyin_reset(m_instance);
+}
+
+#endif
 
=== added file 'maliit-keyboard/lib/logic/pinyinadapter.h'
--- maliit-keyboard/lib/logic/pinyinadapter.h	1970-01-01 00:00:00 +0000
+++ maliit-keyboard/lib/logic/pinyinadapter.h	2013-06-17 15:53:36 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PINYINADAPTER_H
+#define PINYINADAPTER_H
+
+#ifdef HAVE_PINYIN
+
+#include <QObject>
+#include <QStringList>
+
+#include "pinyin.h"
+
+class PinyinAdapter : public QObject
+{
+    Q_OBJECT
+
+    QStringList candidates;
+
+    pinyin_context_t*  m_context;
+    pinyin_instance_t* m_instance;
+
+    GArray* m_array;
+
+public:
+    explicit PinyinAdapter(QObject *parent = 0);
+    ~PinyinAdapter();
+
+    QString parse(const QString& string);
+    QStringList getWordCandidates() const;
+    void wordCandidateSelected(const QString& word);
+    void reset();
+};
+
+#endif
+
+#endif // PINYINADAPTER_H
 
=== modified file 'maliit-keyboard/lib/logic/wordengine.cpp'
--- maliit-keyboard/lib/logic/wordengine.cpp	2012-07-25 09:49:30 +0000
+++ maliit-keyboard/lib/logic/wordengine.cpp	2013-06-17 15:53:36 +0000
@@ -36,6 +36,11 @@
 #include <presage.h>
 #endif
 
+#ifdef HAVE_PINYIN
+#include "pinyinadapter.h"
+#include <iostream>
+#endif
+
 namespace MaliitKeyboard {
 namespace Logic {
 
@@ -105,6 +110,14 @@
 class WordEnginePrivate
 {
 public:
+
+    enum PredictiveBackend {
+        PresageBackend = 1,
+        PinyinBackend
+    };
+
+    PredictiveBackend predictiveBackend;
+
     SpellChecker spell_checker;
 #ifdef HAVE_PRESAGE
     std::string candidates_context;
@@ -112,11 +125,16 @@
     Presage presage;
 #endif
 
+    // TODO there is too many ifdef in this class
+#ifdef HAVE_PINYIN
+    PinyinAdapter* pinyinAdapter;
+#endif
     explicit WordEnginePrivate();
 };
 
 WordEnginePrivate::WordEnginePrivate()
-    : spell_checker()
+    : predictiveBackend(PresageBackend)
+    , spell_checker()
 #ifdef HAVE_PRESAGE
     , candidates_context()
     , presage_candidates(CandidatesCallback(candidates_context))
@@ -128,6 +146,10 @@
     presage.config("Presage.Selector.SUGGESTIONS", "6");
     presage.config("Presage.Selector.REPEAT_SUGGESTIONS", "yes");
 #endif
+
+#ifdef HAVE_PINYIN
+    pinyinAdapter = new PinyinAdapter;
+#endif
 }
 
 
@@ -159,6 +181,15 @@
     AbstractWordEngine::setEnabled(enabled);
 }
 
+void WordEngine::onWordCandidateSelected(QString word)
+{
+    Q_D(WordEngine);
+
+#ifdef HAVE_PINYIN
+    if (d->predictiveBackend == WordEnginePrivate::PinyinBackend)
+        d->pinyinAdapter->wordCandidateSelected(word);
+#endif
+}
 
 WordCandidateList WordEngine::fetchCandidates(Model::Text *text)
 {
@@ -168,19 +199,33 @@
     const QString &preedit(text->preedit());
     const bool is_preedit_capitalized(not preedit.isEmpty() && preedit.at(0).isUpper());
 
+#ifdef HAVE_PINYIN
+    if (d->predictiveBackend == WordEnginePrivate::PinyinBackend) {
+        QString sentence = d->pinyinAdapter->parse(preedit);
+
+        QStringList suggestions = d->pinyinAdapter->getWordCandidates();
+
+        Q_FOREACH(const QString &suggestion, suggestions) {
+            appendToCandidates(&candidates, WordCandidate::SourcePrediction, suggestion, is_preedit_capitalized);
+        }
+    }
+#endif
+
 #ifdef HAVE_PRESAGE
-    const QString &context = (text->surroundingLeft() + preedit);
-    d->candidates_context = context.toStdString();
-    const std::vector<std::string> predictions = d->presage.predict();
+    if (d->predictiveBackend == WordEnginePrivate::PresageBackend) {
+        const QString &context = (text->surroundingLeft() + preedit);
+        d->candidates_context = context.toStdString();
+        const std::vector<std::string> predictions = d->presage.predict();
 
-    // TODO: Fine-tune presage behaviour to also perform error correction, not just word prediction.
-    if (not context.isEmpty()) {
-        // FIXME: max_candidates should come from style, too:
-        const static unsigned int max_candidates = 7;
-        const int count(qMin<int>(predictions.size(), max_candidates));
-        for (int index = 0; index < count; ++index) {
-            appendToCandidates(&candidates, WordCandidate::SourcePrediction, QString::fromStdString(predictions.at(index)),
-                               is_preedit_capitalized);
+        // TODO: Fine-tune presage behaviour to also perform error correction, not just word prediction.
+        if (not context.isEmpty()) {
+            // FIXME: max_candidates should come from style, too:
+            const static unsigned int max_candidates = 7;
+            const int count(qMin<int>(predictions.size(), max_candidates));
+            for (int index = 0; index < count; ++index) {
+                appendToCandidates(&candidates, WordCandidate::SourcePrediction, QString::fromStdString(predictions.at(index)),
+                                   is_preedit_capitalized);
+            }
         }
     }
 #endif
@@ -210,4 +255,14 @@
     d->spell_checker.addToUserWordlist(word);
 }
 
+void WordEngine::onLanguageChanged(const QString &languageId)
+{
+    Q_D(WordEngine);
+
+    if (languageId == "zh_cn_pinyin")
+        d->predictiveBackend = WordEnginePrivate::PinyinBackend;
+    else
+        d->predictiveBackend = WordEnginePrivate::PresageBackend;
+}
+
 }} // namespace Logic, MaliitKeyboard
 
=== modified file 'maliit-keyboard/lib/logic/wordengine.h'
--- maliit-keyboard/lib/logic/wordengine.h	2012-07-25 09:49:30 +0000
+++ maliit-keyboard/lib/logic/wordengine.h	2013-06-17 15:53:36 +0000
@@ -59,6 +59,9 @@
     virtual void addToUserDictionary(const QString &word);
     //! \reimp_end
 
+    Q_SLOT void onWordCandidateSelected(QString word);
+    Q_SLOT void onLanguageChanged(const QString& languageId);
+
 private:
     //! \reimp
     virtual WordCandidateList fetchCandidates(Model::Text *text);
 
=== modified file 'maliit-keyboard/plugin/editor.cpp'
--- maliit-keyboard/plugin/editor.cpp	2012-08-06 12:58:44 +0000
+++ maliit-keyboard/plugin/editor.cpp	2013-06-17 15:53:36 +0000
@@ -36,6 +36,8 @@
 #include <QTimer>
 #include <maliit/namespace.h>
 
+#include "logic/abstractlanguagefeatures.h"
+
 namespace MaliitKeyboard {
 
 Editor::Editor(const EditorOptions &options,
 
=== modified file 'maliit-keyboard/plugin/inputmethod.cpp'
--- maliit-keyboard/plugin/inputmethod.cpp	2013-06-06 16:47:16 +0000
+++ maliit-keyboard/plugin/inputmethod.cpp	2013-06-17 15:53:36 +0000
@@ -225,6 +225,15 @@
     QObject::connect(&editor,  SIGNAL(preeditEnabledChanged(bool)),
                      &layout.updater, SLOT(setWordRibbonVisible(bool)));
 
+    QObject::connect(&layout.updater, SIGNAL(wordCandidateSelected(QString)),
+                     editor.wordEngine(),  SLOT(onWordCandidateSelected(QString)));
+
+    QObject::connect(&layout.updater, SIGNAL(languageChanged(QString)),
+                     editor.wordEngine(),  SLOT(onLanguageChanged(QString)));
+
+    QObject::connect(&layout.updater, SIGNAL(languageChanged(QString)),
+                     &editor,  SLOT(onLanguageChanged(const QString&)));
+
     // just for now
     layout.updater.setWordRibbonVisible(true);
 
@@ -441,6 +450,9 @@
     connect(d->surface_factory, SIGNAL(screenSizeChanged(QSize)),
             this,               SLOT(onScreenSizeChange(QSize)));
 
+    connect(&d->editor, SIGNAL(layoutMenuRequested()),
+            this,       SLOT(onLayoutMenuRequested()));
+
     connect(this, SIGNAL(wordEngineEnabledChanged(bool)), uiConst, SLOT(onWordEngineSettingsChanged(bool)));
 
     registerStyleSetting(host);
@@ -913,4 +925,10 @@
     d->updateKeyboardOrientation();
 }
 
+void InputMethod::onLayoutMenuRequested()
+{
+    Q_D(InputMethod);
+    d->qmlRootItem->setProperty("languageMenuVisible", true);
+}
+
 } // namespace MaliitKeyboard
 
=== modified file 'maliit-keyboard/plugin/inputmethod.h'
--- maliit-keyboard/plugin/inputmethod.h	2013-06-03 15:41:05 +0000
+++ maliit-keyboard/plugin/inputmethod.h	2013-06-17 15:53:36 +0000
@@ -104,6 +104,8 @@
     Q_SLOT void onMagnifierLayoutOriginChanged(const QPoint &origin);
 #endif
 
+    Q_SLOT void onLayoutMenuRequested();
+
     Q_SLOT void onHideAnimationFinished();
     Q_SIGNAL void wordEngineEnabledChanged(bool wordEngineEnabled);
 
 
=== modified file 'maliit-keyboard/qml/Keyboard.qml'
--- maliit-keyboard/qml/Keyboard.qml	2013-06-06 16:47:16 +0000
+++ maliit-keyboard/qml/Keyboard.qml	2013-06-17 15:53:36 +0000
@@ -45,6 +45,8 @@
     property int pressedKeyIndex: -1;
     property Item pressedKey;
 
+    property bool languageMenuVisible: false
+
     RotationHelper {
 
     Connections {
@@ -55,6 +57,17 @@
         }
     }
 
+    LanguageMenu {
+        id: languageMenu
+
+        visible: languageMenuVisible
+        anchors.centerIn: parent
+        width: 500
+        height: 600
+
+        z: 20
+    }
+
     MouseArea {
         id: keyboardSurface
         property int jumpBackThreshold: 170
 
=== added file 'maliit-keyboard/qml/LanguageMenu.qml'
--- maliit-keyboard/qml/LanguageMenu.qml	1970-01-01 00:00:00 +0000
+++ maliit-keyboard/qml/LanguageMenu.qml	2013-06-17 15:53:36 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Item {
+
+    Rectangle {
+        anchors.fill: parent
+        color: "lightGray"
+    }
+
+    // tempor., will come from settings
+    ListModel {
+        id: availableLanguagesModel
+        ListElement { language: "English - US"; languageId: "en_us"; }
+        ListElement { language: "English - UK"; languageId: "en_gb"; }
+        ListElement { language: "Chinese - Pinyin"; languageId: "zh_cn_pinyin"; }
+        ListElement { language: "Spanish"; languageId: "es"; }
+        ListElement { language: "German"; languageId: "de"; }
+    }
+
+    ListView {
+        id: menuList
+        anchors.fill: parent
+        interactive: false
+
+        model: availableLanguagesModel
+
+        delegate: ListItem.Standard {
+            text: language
+            onClicked: {
+                event_handler.onLanguageChangeRequested(languageId);
+                canvas.languageMenuVisible = false;
+            }
+         }
+    }
+}
 
=== modified file 'maliit-keyboard/qml/qml.pro'
--- maliit-keyboard/qml/qml.pro	2013-06-05 14:58:50 +0000
+++ maliit-keyboard/qml/qml.pro	2013-06-17 15:53:36 +0000
@@ -14,6 +14,7 @@
     Keyboard.qml \
     maliit-ui-constants.qml \
     RotationHelper.qml \
-    WordRibbon.qml
+    WordRibbon.qml \
+    LanguageMenu.qml
     Popper.qml
 
 
=== modified file 'maliit-keyboard/view/abstracttexteditor.cpp'
--- maliit-keyboard/view/abstracttexteditor.cpp	2012-11-21 15:19:50 +0000
+++ maliit-keyboard/view/abstracttexteditor.cpp	2013-06-17 15:53:36 +0000
@@ -32,6 +32,9 @@
 #include "abstracttexteditor.h"
 #include "models/wordribbon.h"
 
+#include "logic/chineselanguagefeatures.h"
+#include "logic/languagefeatures.h"
+
 namespace MaliitKeyboard {
 
 //! \class EditorOptions
@@ -490,6 +493,10 @@
         Q_EMIT rightLayoutSelected();
         break;
 
+    case Key::ActionLayoutMenu:
+        Q_EMIT layoutMenuRequested();
+        break;
+
     default:
         break;
     }
@@ -752,4 +759,17 @@
     }
 }
 
+//! \brief sets language features
+//! \param language id as string (as found in settings file)
+//!
+void AbstractTextEditor::onLanguageChanged(const QString& languageId)
+{
+    Q_D(AbstractTextEditor);
+
+    if (languageId == "zh_cn_pinyin")
+        d->language_features.reset(new Logic::ChineseLanguageFeatures);
+    else
+        d->language_features.reset(new Logic::LanguageFeatures);
+}
+
 } // namespace MaliitKeyboard
 
=== modified file 'maliit-keyboard/view/abstracttexteditor.h'
--- maliit-keyboard/view/abstracttexteditor.h	2012-11-21 15:19:50 +0000
+++ maliit-keyboard/view/abstracttexteditor.h	2013-06-17 15:53:36 +0000
@@ -138,6 +138,9 @@
     Q_SIGNAL void autoCapsActivated();
     Q_SIGNAL void leftLayoutSelected();
     Q_SIGNAL void rightLayoutSelected();
+    Q_SIGNAL void layoutMenuRequested();
+
+    Q_SLOT virtual void onLanguageChanged(const QString& languageId);
 
 private:
     const QScopedPointer<AbstractTextEditorPrivate> d_ptr;
 
=== modified file 'maliit-keyboard/word-prediction.pri'
--- maliit-keyboard/word-prediction.pri	2012-07-23 09:40:25 +0000
+++ maliit-keyboard/word-prediction.pri	2013-06-17 15:53:36 +0000
@@ -13,3 +13,10 @@
 disable-preedit|!enable-presage:!enable-hunspell {
     DEFINES += DISABLE_PREEDIT
 }
+
+enable-pinyin {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += glib-2.0
+    PKGCONFIG += libpinyin
+    DEFINES += HAVE_PINYIN
+}
 
=== modified file 'maliit-plugins.pro'
--- maliit-plugins.pro	2013-01-30 19:53:34 +0000
+++ maliit-plugins.pro	2013-06-17 15:53:36 +0000
@@ -13,6 +13,7 @@
         \\n\\t enable-presage: Use presage to calculate word candidates (maliit-keyboard-plugin only) \
         \\n\\t enable-hunspell: Use hunspell for error correction (maliit-keyboard-plugin only) \
         \\n\\t disable-preedit: Always commit characters and never use preedit (maliit-keyboard-plugin only) \
+        \\n\\t enable-pinyin: Use libpinyin as chinese input method \
         \\n\\t enable-qt-mobility: Enable use of QtMobility (enables sound and haptic feedback) \
         \\n\\t notests: Do not attempt to build tests \
         \\n\\t nodoc: Do not build documentation \
@@ -68,6 +69,10 @@
     COVERAGE_CONFIG_STRING += CONFIG+=disable-preedit
 }
 
+enable-pinyin {
+    COVERAGE_CONFIG_STRING += CONFIG+=enable-pinyin
+}
+
 enable-qt-mobility {
     COVERAGE_CONFIG_STRING += CONFIG+=enable-qt-mobility
 }