Merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-language-menu-3 into lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-language-menu-2

[Thomas Moenicke]

lm3

lm3

Unmerged revisions

98. By Thomas Moenicke on 2013-10-25

legacy code gets original id from maliit-server, so it loads xml files that exist (fails to start osk otherwise)
fixed typo in English that prevented loading of regular layout after url layout

=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml	2013-10-23 14:40:05 +0000
+++ qml/KeyboardContainer.qml	2013-10-25 13:02:13 +0000
@@ -54,7 +54,7 @@
         if (layoutId === "url")
             if (localeIsSupported(locale))
                 characterKeypadSource = "languages/"+locale+"/Keyboard_"+locale+"_url_search.qml";
-        if (layoutId === "en_us")
+        if (layoutId === "en")
             characterKeypadSource = "languages/en/Keyboard_en.qml";
         if (layoutId === "es")
             characterKeypadSource = "languages/es/Keyboard_es.qml";

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2013-10-24 13:10:38 +0000
+++ src/plugin/inputmethod.cpp	2013-10-25 13:02:13 +0000
@@ -192,9 +192,14 @@
     Q_UNUSED(id);
     Q_D(InputMethod);
 
+    // FIXME: Perhaps better to let both LayoutUpdater share the same KeyboardLoader instance?
+    d->layout.updater.setActiveKeyboardId(id);
+    d->layout.model.setActiveView(id);
+
     QString locale = QString(getenv("LANGUAGE"));
     locale.truncate(2);
     d->activeLanguage = locale;
+    Q_EMIT activeLanguageChanged(d->activeLanguage);
     d->setActiveKeyboardId(locale);
 }
 

=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2013-10-24 12:55:54 +0000
+++ src/plugin/inputmethod_p.h	2013-10-25 13:02:13 +0000
@@ -257,10 +257,6 @@
 
     void setActiveKeyboardId(const QString& id)
     {
-        // FIXME: Perhaps better to let both LayoutUpdater share the same KeyboardLoader instance?
-        layout.updater.setActiveKeyboardId(id);
-        layout.model.setActiveView(id);
-
         qmlRootItem->setProperty("layoutId", id);
     }