Merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-commit-predictive-text-on-close into lp:ubuntu-keyboard

[Thomas Moenicke]

commit predictive tetx on close

commit predictive tetx on close

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-commit-predictive-text-on-close]

123. By Thomas Moenicke on 2013-12-18

commit preedit on focus loss rather than keyboard close

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/125
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/124

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

doesn't seem to work tried the following: enabled predictive-text and spell-checking and auto-completion
1) create a new contact in address book
- type Bill in first name field
- tap in last name field
- Word Ribbon still shows suggestions from Bill which it shouldn't - it should be cleared
- now type Filler, but field shows BillFiller

review: Needs Fixing

Unmerged revisions

123. By Thomas Moenicke on 2013-12-18

commit preedit on focus loss rather than keyboard close

122. By Thomas Moenicke on 2013-12-18

commit predictive text when closing the keyboard (e.g. when send button is hit)
The predictive text in this case is purple in the input field. Closing the osk without committing
predictive text (which is text that has actually been typed by the user) is confusing.

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2013-11-15 14:19:50 +0000
+++ qml/Keyboard.qml	2013-12-18 19:02:51 +0000
@@ -234,6 +234,7 @@
                 keypad.activeKeypadState = "NORMAL";
                 keypad.state = "CHARACTERS";
                 maliit_input_method.hide();
+                event_handler.onKeyReleased("", "close");
             }
             when: maliit_geometry.shown === false
         }

=== modified file 'src/lib/logic/eventhandler.cpp'
--- src/lib/logic/eventhandler.cpp	2013-11-07 17:43:22 +0000
+++ src/lib/logic/eventhandler.cpp	2013-12-18 19:02:51 +0000
@@ -237,6 +237,8 @@
         key.setAction(Key::ActionSpace);
     else if (action == "shift")
         key.setAction(Key::ActionShift);
+    else if (action == "close")
+        key.setAction(Key::ActionClose);
     else
         key.setAction(Key::ActionInsert);
 

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2013-11-21 13:26:12 +0000
+++ src/plugin/inputmethod.cpp	2013-12-18 19:02:51 +0000
@@ -183,9 +183,12 @@
 
 void InputMethod::handleFocusChange(bool focusIn)
 {
+    Q_D(InputMethod);
+
     if (focusIn) {
         checkInitialAutocaps();
     } else {
+        d->editor.commitPreedit();
         hide();
     }
 }

=== modified file 'src/view/abstracttexteditor.h'
--- src/view/abstracttexteditor.h	2013-11-21 13:26:12 +0000
+++ src/view/abstracttexteditor.h	2013-12-18 19:02:51 +0000
@@ -138,6 +138,8 @@
     Q_SIGNAL void leftLayoutSelected();
     Q_SIGNAL void rightLayoutSelected();
 
+    Q_SLOT void commitPreedit();
+
 private:
     const QScopedPointer<AbstractTextEditorPrivate> d_ptr;
 
@@ -153,7 +155,6 @@
 
     virtual void singleBackspace();
 
-    void commitPreedit();
     Q_SLOT void autoRepeatBackspace();
     void autoRepeatWordBackspace();
     QString wordLeftOfCursor() const;