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

[Michael Sheldon]

Reset the keyboard when the language plugin changes.

Reset the keyboard when the language plugin changes.

[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

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, approved

review: Approve

=== modified file 'src/lib/logic/abstractwordengine.h'
--- src/lib/logic/abstractwordengine.h	2014-10-29 13:57:51 +0000
+++ src/lib/logic/abstractwordengine.h	2014-11-17 14:54:38 +0000
@@ -77,6 +77,7 @@
 signals:
     void preeditFaceChanged(Model::Text::PreeditFace face);
     void primaryCandidateChanged(QString candidate);
+    void pluginChanged();
 
 private:
     virtual void fetchCandidates(Model::Text *text) = 0;

=== modified file 'src/lib/logic/wordengine.cpp'
--- src/lib/logic/wordengine.cpp	2014-11-07 11:31:10 +0000
+++ src/lib/logic/wordengine.cpp	2014-11-17 14:54:38 +0000
@@ -412,6 +412,7 @@
 
     connect((AbstractLanguagePlugin *) d->languagePlugin, SIGNAL(newSpellingSuggestions(QString, QStringList)), this, SLOT(newSpellingSuggestions(QString, QStringList)));
     connect((AbstractLanguagePlugin *) d->languagePlugin, SIGNAL(newPredictionSuggestions(QString, QStringList)), this, SLOT(newPredictionSuggestions(QString, QStringList)));
+    Q_EMIT pluginChanged();
 }
 
 AbstractLanguageFeatures* WordEngine::languageFeature()

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-11-04 20:17:45 +0000
+++ src/plugin/inputmethod.cpp	2014-11-17 14:54:38 +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(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()));
     d->registerAudioFeedbackSoundSetting();
@@ -516,6 +517,12 @@
     Q_EMIT activeLanguageChanged(d->activeLanguage);
 }
 
+void InputMethod::onWordEnginePluginChanged()
+{
+    reset();
+    update();
+}
+
 const QString InputMethod::keyboardState() const
 {
     Q_D(const InputMethod);

=== modified file 'src/plugin/inputmethod.h'
--- src/plugin/inputmethod.h	2014-10-07 15:44:46 +0000
+++ src/plugin/inputmethod.h	2014-11-17 14:54:38 +0000
@@ -147,6 +147,8 @@
     Q_SLOT void onLayoutWidthChanged(int width);
     Q_SLOT void onLayoutHeightChanged(int height);
 
+    Q_SLOT void onWordEnginePluginChanged();
+
     void checkAutocaps();
 
     const QScopedPointer<InputMethodPrivate> d_ptr;