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

[Michael Sheldon]

Allow Pinyin to be used in URL and email fields and fix text selection issues.

Allow Pinyin to be used in URL and email fields and fix text selection issues.

[Michael Sheldon (michael-sheldon)]

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

 * No (besides pre-requisite)

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/513/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/14

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

review: Approve (continuous-integration)

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

259. By Michael Sheldon on 2014-11-27

Update comment to reflect actual test actions

260. By Michael Sheldon on 2014-11-27

Remove unnecessary import

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:260
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/514/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/15

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'plugins/pinyin/src/chineselanguagefeatures.cpp'
--- plugins/pinyin/src/chineselanguagefeatures.cpp	2014-11-12 14:54:54 +0000
+++ plugins/pinyin/src/chineselanguagefeatures.cpp	2014-11-27 23:24:06 +0000
@@ -47,7 +47,7 @@
 
 QString ChineseLanguageFeatures::appendixForReplacedPreedit(const QString &preedit) const
 {
-    if (isSeparator(preedit.right(1))) {
+    if (isSeparator(preedit.right(1)) && contentType() != Maliit::EmailContentType && contentType() != Maliit::UrlContentType) {
         return QString(" ");
     }
 

=== modified file 'src/lib/logic/abstractlanguagefeatures.h'
--- src/lib/logic/abstractlanguagefeatures.h	2014-10-21 18:54:25 +0000
+++ src/lib/logic/abstractlanguagefeatures.h	2014-11-27 23:24:06 +0000
@@ -33,6 +33,7 @@
 #define MALIIT_KEYBOARD_ABSTRACTLANGUAGEFEATURES_H
 
 #include <QObject>
+#include <maliit/plugins/abstractinputmethod.h>
 
 class QObject;
 class AbstractLanguageFeatures
@@ -52,6 +53,12 @@
     // to the user's input. However for input methods such as pinyin this
     // can be disabled by implementing this method to return true.
     virtual bool ignoreSimilarity() const { return false; }
+
+    Maliit::TextContentType contentType() const { return m_contentType; }
+    void setContentType(Maliit::TextContentType contentType) { m_contentType = contentType; }
+
+private:
+    Maliit::TextContentType m_contentType;
 };
 
 #endif // MALIIT_KEYBOARD_ABSTRACTLANGUAGEFEATURES_H

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-11-19 15:39:41 +0000
+++ src/plugin/inputmethod.cpp	2014-11-27 23:24:06 +0000
@@ -103,6 +103,7 @@
 
     connect(this, SIGNAL(contentTypeChanged(TextContentType)), this, SLOT(setContentType(TextContentType)));
     connect(this, SIGNAL(activeLanguageChanged(QString)), d->editor.wordEngine(), SLOT(onLanguageChanged(QString)));
+    connect(this, SIGNAL(hasSelectionChanged(bool)), &d->editor, SLOT(onHasSelectionChanged(bool)));
     connect(d->editor.wordEngine(), SIGNAL(pluginChanged()), this, SLOT(onWordEnginePluginChanged()));
     connect(this, SIGNAL(keyboardStateChanged(QString)), &d->editor, SLOT(onKeyboardStateChanged(QString)));
     connect(d->m_geometry, SIGNAL(visibleRectChanged()), this, SLOT(onVisibleRectChanged()));
@@ -137,7 +138,6 @@
     d->m_geometry->setShown(true);
     update();
     d->view->setVisible(true);
-    d->editor.checkPreeditReentry(false);
 }
 
 //! \brief InputMethod::hide
@@ -345,6 +345,13 @@
     }
 
     bool valid;
+ 
+    bool hasSelection = d->host->hasSelection(valid);
+
+    if (valid && hasSelection != d->hasSelection) {
+        d->hasSelection = hasSelection;
+        Q_EMIT hasSelectionChanged(d->hasSelection);
+    }
 
     bool emitPredictionEnabled = false;
 
@@ -387,8 +394,11 @@
 {
     Q_D(InputMethod);
 
-    if (d->contentType != FreeTextContentType)
+    if (d->contentType != FreeTextContentType
+        && !(d->editor.wordEngine()->languageFeature()->alwaysShowSuggestions()
+             && (d->contentType == UrlContentType || d->contentType == EmailContentType))) {
         d->wordEngineEnabled = false;
+    }
 
     d->editor.clearPreedit();
     d->editor.wordEngine()->setEnabled( d->wordEngineEnabled );
@@ -413,6 +423,8 @@
 
     setActiveLanguage(d->activeLanguage);
 
+    d->editor.wordEngine()->languageFeature()->setContentType(static_cast<Maliit::TextContentType>(contentType));
+
     d->contentType = contentType;
     Q_EMIT contentTypeChanged(contentType);
 
@@ -542,6 +554,12 @@
     Q_EMIT keyboardStateChanged(d->keyboardState);
 }
 
+bool InputMethod::hasSelection() const
+{
+    Q_D(const InputMethod);
+    return d->hasSelection;
+}
+
 void InputMethod::onVisibleRectChanged()
 {
     Q_D(InputMethod);

=== modified file 'src/plugin/inputmethod.h'
--- src/plugin/inputmethod.h	2014-11-17 14:53:36 +0000
+++ src/plugin/inputmethod.h	2014-11-27 23:24:06 +0000
@@ -56,6 +56,7 @@
     Q_PROPERTY(QObject* actionKeyOverride READ actionKeyOverride NOTIFY actionKeyOverrideChanged)
     Q_PROPERTY(bool useHapticFeedback READ useHapticFeedback NOTIFY useHapticFeedbackChanged)
     Q_PROPERTY(QString keyboardState READ keyboardState WRITE setKeyboardState NOTIFY keyboardStateChanged)
+    Q_PROPERTY(bool hasSelection READ hasSelection NOTIFY hasSelectionChanged)
 
     Q_ENUMS(TextContentType)
 
@@ -116,6 +117,8 @@
     const QString keyboardState() const;
     Q_SLOT void setKeyboardState(const QString& state);
 
+    bool hasSelection() const;
+
     QObject* actionKeyOverride() const;
 
     Q_SLOT void close();
@@ -135,6 +138,7 @@
     void actionKeyOverrideChanged();
     void keyboardStateChanged(QString state);
     void keyboardReset();
+    void hasSelectionChanged(bool hasSelection);
 
 private:
     Q_SLOT void onAutoCorrectSettingChanged();

=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2014-09-15 09:39:19 +0000
+++ src/plugin/inputmethod_p.h	2014-11-27 23:24:06 +0000
@@ -58,6 +58,7 @@
     QStringList enabledLanguages;
     Qt::ScreenOrientation appsCurrentOrientation;
     QString keyboardState;
+    bool hasSelection;
 
     KeyboardGeometry *m_geometry;
     KeyboardSettings m_settings;
@@ -82,6 +83,7 @@
         , enabledLanguages(activeLanguage)
         , appsCurrentOrientation(qGuiApp->primaryScreen()->orientation())
         , keyboardState("CHARACTERS")
+        , hasSelection(false)
         , m_geometry(new KeyboardGeometry(q))
         , m_settings()
         , m_greeterStatus(new GreeterStatus())

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-11-04 20:17:35 +0000
+++ src/view/abstracttexteditor.cpp	2014-11-27 23:24:06 +0000
@@ -1060,13 +1060,12 @@
 }
 
 //! \brief AbstractTextEditor::checkPreeditReentry  Checks to see whether we should
-//! place a word back in to pre-edit after a character has been deleted or focus
-//! has changed
+//! place a word back in to pre-edit after a character has been deleted
 void AbstractTextEditor::checkPreeditReentry(bool uncommittedDelete)
 {
     Q_D(AbstractTextEditor);
 
-    if(!isPreeditEnabled()) {
+    if(!isPreeditEnabled() || m_hasSelection) {
         return;
     }
 
@@ -1115,5 +1114,8 @@
     d->word_engine->computeCandidates(d->text.data());
 }
 
+void AbstractTextEditor::onHasSelectionChanged(bool hasSelection) {
+    m_hasSelection = hasSelection;
+}
 
 } // namespace MaliitKeyboard

=== modified file 'src/view/abstracttexteditor.h'
--- src/view/abstracttexteditor.h	2014-09-10 14:57:52 +0000
+++ src/view/abstracttexteditor.h	2014-11-27 23:24:06 +0000
@@ -118,6 +118,7 @@
     Q_SLOT void onCursorPositionChanged(int cursor_position,
                                         const QString &surrounding_text);
     Q_SLOT void onKeyboardStateChanged(QString state);
+    Q_SLOT void onHasSelectionChanged(bool hasSelection);
     Q_SLOT void replacePreedit(const QString &replacement);
     Q_SLOT void replaceTextWithPreedit(const QString &replacement, int start, int len, int pos);
     Q_SLOT void replaceAndCommitPreedit(const QString &replacement);
@@ -174,6 +175,8 @@
 
     void sendKeyPressAndReleaseEvents(int key, Qt::KeyboardModifiers modifiers,
                                       const QString& text = QString());
+
+    bool m_hasSelection;
 };
 
 } // namespace MaliitKeyboard

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2014-11-27 23:24:05 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2014-11-27 23:24:06 +0000
@@ -458,3 +458,136 @@
             Eventually(Equals(expected))
         )
 
+
+class UbuntuKeyboardPinyin(UbuntuKeyboardTests):
+
+    scenarios = [
+        (   
+            "Url",
+            dict(
+                label="Url",
+                hints=['Qt.ImhUrlCharactersOnly'],
+                expected_activeview="url"
+            )
+        ),
+        (   
+            "Email",
+            dict(
+                label="Email",
+                hints=['Qt.ImhEmailCharactersOnly'],
+                expected_activeview="email"
+            )
+        ),
+        (
+            "FreeText",
+            dict(
+                label="FreeText",
+                hints=None,
+                expected_activeview="freetext"
+            )
+        ),
+        (
+            "NoPredictiveText",
+            dict(
+                label="NoPredictiveText",
+                hints=['Qt.ImhNoPredictveText'],
+                expected_activeview="freetext"
+            )
+        ),
+    ]
+
+    def set_test_settings(self):
+        gsettings = Gio.Settings.new("com.canonical.keyboard.maliit")
+        gsettings.set_string("active-language", "zh")
+        gsettings.set_boolean("auto-capitalization", True)
+        gsettings.set_boolean("auto-completion", True)
+        gsettings.set_boolean("predictive-text", True)
+        gsettings.set_boolean("spell-checking", True)
+        gsettings.set_boolean("double-space-full-stop", True)
+
+    def test_pinyin(self):
+        """Switching to Chinese should result in pinyin characters being entered
+           via autocomplete regardless of layout or prediction being disabled.
+
+        """
+        text_area = self.launch_test_input_area(self.label, self.hints)
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.type('pinyin ')
+
+        expected = "品以"
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
+    def test_fullstop(self):
+        """Full stop shouldn't have space added after it in pinyin mode.
+
+        """
+        text_area = self.launch_test_input_area(self.label, self.hints)
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.type('pinyin.cn ')
+
+        expected = "品以.cn"
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
+
+class UbuntuKeyboardSelection(UbuntuKeyboardTests):
+
+    def test_delete_selection(self):
+        """Selecting a word and then pressing backspace should delete the world.
+        
+        """
+        text_area = self.launch_test_input_area()
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.type('Testing selection deletion')
+
+        # Double tap to select a word
+        self.pointer.click_object(text_area)
+        self.pointer.click_object(text_area)
+
+        keyboard.type('\b')
+
+        expected = 'Testing  deletion'
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
+    def test_selection_focus(self):
+        """Focusing on a field with selected text should leave the text unchanged.
+
+        """
+        text_area = self.launch_test_input_area()
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.type('This is a test')
+
+        # Double tap to select a word
+        self.pointer.click_object(text_area)
+        self.pointer.click_object(text_area)
+
+        keyboard.dismiss()
+
+        self.ensure_focus_on_input(text_area)
+
+        expected = 'This is a test'
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+