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

[Michael Sheldon]

Deactivate autocaps if re-entering a field that already has text in it.

Deactivate autocaps if re-entering a field that already has text in it.

[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 change

If you changed UI labels, did you update the pot file?

 * No change

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

 * No change

[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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/468/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/93

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

review: Approve (continuous-integration)

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2014-08-29 12:08:49 +0000
+++ qml/Keyboard.qml	2014-09-10 13:48:54 +0000
@@ -256,6 +256,12 @@
                     keypad.activeKeypadState = "SHIFTED";
                     keypad.autoCapsTriggered = true;
                 }
+                onDeactivateAutocaps: {
+                    if(keypad.autoCapsTriggered) {
+                        keypad.activeKeypadState = "NORMAL";
+                        keypad.autoCapsTriggered = false;
+                    }
+                }
             }
 
         } // canvas
 
=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-08-12 22:51:44 +0000
+++ src/plugin/inputmethod.cpp	2014-09-10 13:48:54 +0000
@@ -99,6 +99,7 @@
     // FIXME: Reconnect feedback instance.
     Setup::connectAll(&d->event_handler, &d->editor);
     connect(&d->editor,  SIGNAL(autoCapsActivated()), this, SIGNAL(activateAutocaps()));
+    connect(&d->editor,  SIGNAL(autoCapsDeactivated()), this, SIGNAL(deactivateAutocaps()));
 
     connect(this, SIGNAL(contentTypeChanged(TextContentType)), this, SLOT(setContentType(TextContentType)));
     connect(this, SIGNAL(activeLanguageChanged(QString)), d->editor.wordEngine(), SLOT(onLanguageChanged(QString)));
@@ -367,12 +368,7 @@
         d->editor.text()->setSurroundingOffset(position);
 
         updateAutoCaps();
-
-        // If we're at the beginning of a text field (e.g. because it's been cleared,
-        // or the cursor has been moved) then re-evaluate initial autocaps
-        if (position == 0 && position != d->previous_position) {
-            checkInitialAutocaps();
-        }
+        checkInitialAutocaps();
         d->previous_position = position;
     }
 }
@@ -424,8 +420,13 @@
         QString text;
         int position;
         bool ok = d->host->surroundingText(text, position);
-        if (ok && text.isEmpty() && position == 0)
+        if (ok && text.isEmpty() && d->editor.text()->preedit().isEmpty() && position == 0) {
             Q_EMIT activateAutocaps();
+        } else {
+            // Clear autocaps if it has been set by us previously being in an
+            // empty field
+            Q_EMIT deactivateAutocaps();
+        }
     }
 }
 
 
=== modified file 'src/plugin/inputmethod.h'
--- src/plugin/inputmethod.h	2014-08-26 11:26:35 +0000
+++ src/plugin/inputmethod.h	2014-09-10 13:48:54 +0000
@@ -119,6 +119,7 @@
 Q_SIGNALS:
     void contentTypeChanged(TextContentType contentType);
     void activateAutocaps();
+    void deactivateAutocaps();
     void enabledLanguagesChanged(QStringList languages);
     void activeLanguageChanged(QString language);
     void useAudioFeedbackChanged();
 
=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-08-11 13:46:41 +0000
+++ src/view/abstracttexteditor.cpp	2014-09-10 13:48:54 +0000
@@ -667,8 +667,12 @@
     }
     commitPreedit();
 
-    if (auto_caps_activated && d->auto_caps_enabled) {
-        Q_EMIT autoCapsActivated();
+    if (d->auto_caps_enabled) {
+        if (auto_caps_activated) {
+            Q_EMIT autoCapsActivated();
+        } else {
+            Q_EMIT autoCapsDeactivated();
+        }
     }
 }
 
@@ -920,8 +924,12 @@
     textOnLeft = textOnLeft.trimmed();
 
     const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
-    if (auto_caps_activated && d->auto_caps_enabled) {
-        Q_EMIT autoCapsActivated();
+    if (d->auto_caps_enabled) {
+        if (auto_caps_activated) {
+            Q_EMIT autoCapsActivated();
+        } else {
+            Q_EMIT autoCapsDeactivated();
+        }
     }
 
     d->backspace_sent = true;
 
=== modified file 'src/view/abstracttexteditor.h'
--- src/view/abstracttexteditor.h	2014-07-25 09:43:43 +0000
+++ src/view/abstracttexteditor.h	2014-09-10 13:48:54 +0000
@@ -143,6 +143,7 @@
     Q_SIGNAL void keyboardClosed();
     Q_SIGNAL void wordCandidatesChanged(const WordCandidateList &word_candidates);
     Q_SIGNAL void autoCapsActivated();
+    Q_SIGNAL void autoCapsDeactivated();
     Q_SIGNAL void leftLayoutSelected();
     Q_SIGNAL void rightLayoutSelected();