Merge lp:~sil2100/ubuntu-keyboard/fix_autocap_after_newline into lp:ubuntu-keyboard

[Łukasz Zemczak]

Fix auto-capitalization after a newline. This adds checks for autocapitalization for enter/return key-presses and additional autocap case characters for western languages.

Fix auto-capitalization after a newline

* Are there any related MPs required for this MP to build/function as expected?
No

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes, rebased on trunk recently

* Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes, performed basic dogfooding on mako

* Did you successfully run all tests found in your component's Test Plan on device or emulator?
Yes

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

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

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/341/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/170
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/169

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, all working

review: Approve

=== modified file 'plugins/westernsupport/westernlanguagefeatures.cpp'
--- plugins/westernsupport/westernlanguagefeatures.cpp	2013-11-28 14:40:54 +0000
+++ plugins/westernsupport/westernlanguagefeatures.cpp	2014-03-11 12:14:31 +0000
@@ -44,7 +44,7 @@
 
 bool WesternLanguageFeatures::activateAutoCaps(const QString &preedit) const
 {
-    static const QString sentenceBreak = QString::fromUtf8("!.?:");
+    static const QString sentenceBreak = QString::fromUtf8("!.?:\r\n");
 
     if (preedit.isEmpty()) {
         return false;

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2013-11-21 13:26:12 +0000
+++ src/view/abstracttexteditor.cpp	2014-03-11 12:14:31 +0000
@@ -452,6 +452,10 @@
     case Key::ActionReturn: {
         event_key = Qt::Key_Return;
         keyText = QString("\r");
+
+        if (d->word_engine->languageFeature()->activateAutoCaps(keyText) && d->auto_caps_enabled) {
+            Q_EMIT autoCapsActivated();
+        }
     } break;
 
     case Key::ActionClose: