Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1281384 into lp:ubuntu-keyboard

[Michael Sheldon]

Implement capital letters for Pinyin keyboard, ignore auto-capitalisation and always display word ribbon when using Pinyin regardless of input hints.

Implement capital letters for Pinyin keyboard, ignore auto-capitalisation and always display word ribbon when using Pinyin regardless of input hints.

[Michael Sheldon (michael-sheldon)]

Looking at this I think there might be a better way of handling the disabling of the capitalisation through the language features so it doesn't need a special case in the input method, so I'll take another look at this before it's ready for review.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:158
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/352/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/181
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/181/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/180

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/352/rebuild

review: Approve (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/fix-1281384]

159. By Michael Sheldon on 2014-04-15

Merge changes from trunk

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No changes

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No changes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/353/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/182/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/182
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/181

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/353/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'plugins/pinyin/qml/Keyboard_zh_cn_pinyin.qml'
--- plugins/pinyin/qml/Keyboard_zh_cn_pinyin.qml	2013-12-12 16:26:16 +0000
+++ plugins/pinyin/qml/Keyboard_zh_cn_pinyin.qml	2014-04-15 14:40:35 +0000
@@ -32,31 +32,31 @@
             anchors.horizontalCenter: parent.horizontalCenter;
             spacing: 0
 
-            CharKey { label: "q"; }
-            CharKey { label: "w"; }
-            CharKey { label: "e"; }
-            CharKey { label: "r"; }
-            CharKey { label: "t"; }
-            CharKey { label: "y"; }
-            CharKey { label: "u"; }
-            CharKey { label: "i"; }
-            CharKey { label: "o"; }
-            CharKey { label: "p"; }
+            CharKey { label: "q"; shifted: "Q"; }
+            CharKey { label: "w"; shifted: "W"; }
+            CharKey { label: "e"; shifted: "E"; }
+            CharKey { label: "r"; shifted: "R"; }
+            CharKey { label: "t"; shifted: "T"; }
+            CharKey { label: "y"; shifted: "Y"; }
+            CharKey { label: "u"; shifted: "U"; }
+            CharKey { label: "i"; shifted: "I"; }
+            CharKey { label: "o"; shifted: "O"; }
+            CharKey { label: "p"; shifted: "P"; }
         }
 
         Row {
             anchors.horizontalCenter: parent.horizontalCenter;
             spacing: 0
 
-            CharKey { label: "a"; }
-            CharKey { label: "s"; }
-            CharKey { label: "d"; }
-            CharKey { label: "f"; }
-            CharKey { label: "g"; }
-            CharKey { label: "h"; }
-            CharKey { label: "j"; }
-            CharKey { label: "k"; }
-            CharKey { label: "l"; }
+            CharKey { label: "a"; shifted: "A"; }
+            CharKey { label: "s"; shifted: "S"; }
+            CharKey { label: "d"; shifted: "D"; }
+            CharKey { label: "f"; shifted: "F"; }
+            CharKey { label: "g"; shifted: "G"; }
+            CharKey { label: "h"; shifted: "H"; }
+            CharKey { label: "j"; shifted: "J"; }
+            CharKey { label: "k"; shifted: "K"; }
+            CharKey { label: "l"; shifted: "L"; }
         }
 
         Row {
@@ -64,13 +64,13 @@
             spacing: 0
 
             ShiftKey {}
-            CharKey { label: "z"; }
-            CharKey { label: "x"; }
-            CharKey { label: "c"; }
-            CharKey { label: "v"; }
-            CharKey { label: "b"; }
-            CharKey { label: "n"; }
-            CharKey { label: "m"; }
+            CharKey { label: "z"; shifted: "Z"; }
+            CharKey { label: "x"; shifted: "X"; }
+            CharKey { label: "c"; shifted: "C"; }
+            CharKey { label: "v"; shifted: "V"; }
+            CharKey { label: "b"; shifted: "B"; }
+            CharKey { label: "n"; shifted: "N"; }
+            CharKey { label: "m"; shifted: "M"; }
             BackspaceKey {}
         }
 

=== modified file 'plugins/pinyin/src/chineselanguagefeatures.cpp'
--- plugins/pinyin/src/chineselanguagefeatures.cpp	2013-12-12 16:26:16 +0000
+++ plugins/pinyin/src/chineselanguagefeatures.cpp	2014-04-15 14:40:35 +0000
@@ -25,6 +25,20 @@
 {
 }
 
+bool ChineseLanguageFeatures::alwaysShowSuggestions() const
+{
+    // Pinyin characters can only be entered via suggestions, so we ignore
+    // hints that would otherwise disable them.
+    return true;
+}
+
+bool ChineseLanguageFeatures::autoCapsAvailable() const
+{
+    // Automatic switching to capital letters doen't make sense when 
+    // inputting Pinyin
+    return false;
+}
+
 bool ChineseLanguageFeatures::activateAutoCaps(const QString &preedit) const
 {
     Q_UNUSED(preedit)

=== modified file 'plugins/pinyin/src/chineselanguagefeatures.h'
--- plugins/pinyin/src/chineselanguagefeatures.h	2013-12-12 16:26:16 +0000
+++ plugins/pinyin/src/chineselanguagefeatures.h	2014-04-15 14:40:35 +0000
@@ -27,6 +27,8 @@
     explicit ChineseLanguageFeatures(QObject *parent = 0);
     virtual ~ChineseLanguageFeatures();
 
+    virtual bool alwaysShowSuggestions() const;
+    virtual bool autoCapsAvailable() const;
     virtual bool activateAutoCaps(const QString &preedit) const;
     virtual QString appendixForReplacedPreedit(const QString &preedit) const;
 };

=== modified file 'plugins/westernsupport/westernlanguagefeatures.cpp'
--- plugins/westernsupport/westernlanguagefeatures.cpp	2014-03-11 12:14:10 +0000
+++ plugins/westernsupport/westernlanguagefeatures.cpp	2014-04-15 14:40:35 +0000
@@ -42,6 +42,16 @@
 {
 }
 
+bool WesternLanguageFeatures::alwaysShowSuggestions() const
+{
+    return false;
+}
+
+bool WesternLanguageFeatures::autoCapsAvailable() const
+{
+    return true;
+}
+
 bool WesternLanguageFeatures::activateAutoCaps(const QString &preedit) const
 {
     static const QString sentenceBreak = QString::fromUtf8("!.?:\r\n");

=== modified file 'plugins/westernsupport/westernlanguagefeatures.h'
--- plugins/westernsupport/westernlanguagefeatures.h	2013-11-28 14:40:54 +0000
+++ plugins/westernsupport/westernlanguagefeatures.h	2014-04-15 14:40:35 +0000
@@ -42,6 +42,8 @@
     explicit WesternLanguageFeatures(QObject *parent = 0);
     virtual ~WesternLanguageFeatures();
 
+    virtual bool alwaysShowSuggestions() const;
+    virtual bool autoCapsAvailable() const;
     virtual bool activateAutoCaps(const QString &preedit) const;
     virtual QString appendixForReplacedPreedit(const QString &preedit) const;
 };

=== modified file 'src/lib/logic/abstractlanguagefeatures.h'
--- src/lib/logic/abstractlanguagefeatures.h	2013-11-21 13:26:12 +0000
+++ src/lib/logic/abstractlanguagefeatures.h	2014-04-15 14:40:35 +0000
@@ -41,6 +41,8 @@
 public:
     virtual ~AbstractLanguageFeatures() {}
     
+    virtual bool alwaysShowSuggestions() const = 0;
+    virtual bool autoCapsAvailable() const = 0;
     virtual bool activateAutoCaps(const QString &preedit) const = 0;
     virtual QString appendixForReplacedPreedit(const QString &preedit) const = 0;
 };

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-03-12 18:04:55 +0000
+++ src/plugin/inputmethod.cpp	2014-04-15 14:40:35 +0000
@@ -37,6 +37,7 @@
 #include "models/wordribbon.h"
 #include "models/layout.h"
 
+#include "logic/abstractlanguagefeatures.h"
 // #include "logic/layouthelper.h"
 //#include "logic/style.h"
 
@@ -245,7 +246,7 @@
     bool enabled = d->m_settings.autoCapitalization();
     enabled &= d->contentType == FreeTextContentType;
     bool valid = true;
-    bool autocap = d->host->autoCapitalizationEnabled(valid);
+    bool autocap = d->host->autoCapitalizationEnabled(valid) && d->editor.wordEngine()->languageFeature()->autoCapsAvailable();
     enabled &= autocap;
 
     if (enabled != d->autocapsEnabled) {
@@ -341,7 +342,8 @@
 
     bool emitPredictionEnabled = false;
 
-    bool newPredictionEnabled = inputMethodHost()->predictionEnabled(valid);
+    bool newPredictionEnabled = inputMethodHost()->predictionEnabled(valid) 
+                                || d->editor.wordEngine()->languageFeature()->alwaysShowSuggestions();
 
     if (!valid)
         newPredictionEnabled = true;

=== modified file 'tests/unittests/common/wordengineprobe.h'
--- tests/unittests/common/wordengineprobe.h	2013-11-21 18:46:54 +0000
+++ tests/unittests/common/wordengineprobe.h	2014-04-15 14:40:35 +0000
@@ -43,6 +43,8 @@
     explicit MockLanguageFeatures() {}
     virtual ~MockLanguageFeatures() {}
 
+    virtual bool alwaysShowSuggestions() const { return false; }
+    virtual bool autoCapsAvailable() const { return false; }
     virtual bool activateAutoCaps(const QString &preedit) const { Q_UNUSED(preedit); return false; }
     virtual QString appendixForReplacedPreedit(const QString &preedit) const { Q_UNUSED(preedit); return ""; }
 };

=== modified file 'tests/unittests/ut_editor/wordengineprobe.h'
--- tests/unittests/ut_editor/wordengineprobe.h	2013-11-21 18:46:54 +0000
+++ tests/unittests/ut_editor/wordengineprobe.h	2014-04-15 14:40:35 +0000
@@ -43,6 +43,8 @@
     explicit MockLanguageFeatures() {}
     virtual ~MockLanguageFeatures() {}
 
+    virtual bool alwaysShowSuggestions() const { return false; }
+    virtual bool autoCapsAvailable() const { return false; }
     virtual bool activateAutoCaps(const QString &preedit) const { Q_UNUSED(preedit); return false; }
     virtual QString appendixForReplacedPreedit(const QString &preedit) const { Q_UNUSED(preedit); return ""; }
 };

=== modified file 'tests/unittests/ut_word-candidates/wordengineprobe.h'
--- tests/unittests/ut_word-candidates/wordengineprobe.h	2013-11-21 18:46:54 +0000
+++ tests/unittests/ut_word-candidates/wordengineprobe.h	2014-04-15 14:40:35 +0000
@@ -43,6 +43,8 @@
     explicit MockLanguageFeatures() {}
     virtual ~MockLanguageFeatures() {}
 
+    virtual bool alwaysShowSuggestions() const { return false; }
+    virtual bool autoCapsAvailable() const { return false; }
     virtual bool activateAutoCaps(const QString &preedit) const { Q_UNUSED(preedit); return false; }
     virtual QString appendixForReplacedPreedit(const QString &preedit) const { Q_UNUSED(preedit); return ""; }
 };