Merge lp:~michael-sheldon/ubuntu-system-settings/support-additional-keyboard-plugin-paths into lp:ubuntu-system-settings

[Michael Sheldon]

Allow system settings to find keyboard plugins in additional locations specified via gsettings.

Allow system settings to find keyboard plugins in additional locations specified via gsettings.

This depends on https://code.launchpad.net/~michael-sheldon/ubuntu-keyboard/custom-plugin-paths/+merge/256285 which adds the new setting to the schema.

It can be tested by installing the ubuntu-keyboard-tests package and adding "/usr/share/maliit/tests/ubuntu-keyboard/" to the plugin paths by running:

gsettings set com.canonical.keyboard.maliit plugin-paths "['/custom/share/maliit/plugins/com/ubuntu/lib', '/usr/share/maliit/tests/ubuntu-keyboard/']"

A layout called "Testlayout" should then be displayed in the settings panel.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1379
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2056/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/326
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1967
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2239
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19643

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2056/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Please look into the test failures, they look related to your branch.

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

The tests fail because the language plugin won't work without the corresponding keyboard branch (which makes required changes to the keyboard settings schema)

[Ken VanDine (ken-vandine)]

Looks fine and works as described

review: Approve

=== modified file 'plugins/language/language-plugin.cpp'
--- plugins/language/language-plugin.cpp	2014-09-02 15:44:19 +0000
+++ plugins/language/language-plugin.cpp	2015-04-15 10:45:02 +0000
@@ -28,6 +28,7 @@
 
 #define KEY_ENABLED_LAYOUTS "enabled-languages"
 #define KEY_CURRENT_LAYOUT  "active-language"
+#define KEY_PLUGIN_PATHS "plugin-paths"
 
 #define LANGUAGE2LOCALE "/usr/share/language-tools/language2locale"
 #define LAYOUTS_DIR "/usr/share/maliit/plugins/com/ubuntu/lib"
@@ -96,6 +97,9 @@
     m_user(nullptr),
     m_maliitSettings(g_settings_new(UBUNTU_KEYBOARD_SCHEMA_ID))
 {
+    GVariantIter *iter;
+    const gchar *path;
+
     if (m_manager != nullptr) {
         g_object_ref(m_manager);
 
@@ -109,6 +113,11 @@
                              G_CALLBACK(::managerLoaded), this);
     }
 
+    m_layoutPaths.append(LAYOUTS_DIR);
+    g_settings_get(m_maliitSettings, KEY_PLUGIN_PATHS, "as", &iter);
+    for (int i(0); g_variant_iter_next(iter, "&s", &path); i++) {
+        m_layoutPaths.append(path);
+    }
     updateLanguageNamesAndCodes();
     updateCurrentLanguage();
     updateEnabledLayouts();
@@ -353,13 +362,15 @@
 
             icu::Locale locale(qPrintable(formatsLocale));
             const char *code(locale.getLanguage());
-            QFileInfo fileInfo(QDir(LAYOUTS_DIR), code);
-
-            if (fileInfo.exists() && fileInfo.isDir()) {
-                g_settings_set_string(m_maliitSettings,
-                                      KEY_CURRENT_LAYOUT, code);
-
-                updateEnabledLayouts();
+            for (int i = 0; i < m_layoutPaths.count(); i++) {
+                QFileInfo fileInfo(QDir(m_layoutPaths.at(i)), code);
+
+                if (fileInfo.exists() && fileInfo.isDir()) {
+                    g_settings_set_string(m_maliitSettings,
+                                          KEY_CURRENT_LAYOUT, code);
+
+                    updateEnabledLayouts();
+                }
             }
         } else {
             QString formatsLocale(act_user_get_formats_locale(m_user));
@@ -415,20 +426,22 @@
 {
     m_keyboardLayouts.clear();
 
-    QDir layoutsDir(LAYOUTS_DIR);
-    layoutsDir.setFilter(QDir::Dirs);
-    layoutsDir.setSorting(QDir::Name);
-
-    QFileInfoList fileInfoList(layoutsDir.entryInfoList());
-
-    for (QFileInfoList::const_iterator
-         i(fileInfoList.begin()); i != fileInfoList.end(); ++i) {
-        KeyboardLayout *layout(new KeyboardLayout(*i));
-
-        if (!layout->language().isEmpty())
-            m_keyboardLayouts += layout;
-        else
-            delete layout;
+    for (int i = 0; i < m_layoutPaths.count(); i++) {
+        QDir layoutsDir(m_layoutPaths.at(i));
+        layoutsDir.setFilter(QDir::Dirs);
+        layoutsDir.setSorting(QDir::Name);
+
+        QFileInfoList fileInfoList(layoutsDir.entryInfoList());
+
+        for (QFileInfoList::const_iterator
+             i(fileInfoList.begin()); i != fileInfoList.end(); ++i) {
+            KeyboardLayout *layout(new KeyboardLayout(*i));
+
+            if (!layout->language().isEmpty())
+                m_keyboardLayouts += layout;
+            else
+                delete layout;
+        }
     }
 
     qSort(m_keyboardLayouts.begin(), m_keyboardLayouts.end(), compareLayouts);

=== modified file 'plugins/language/language-plugin.h'
--- plugins/language/language-plugin.h	2014-09-02 15:44:19 +0000
+++ plugins/language/language-plugin.h	2015-04-15 10:45:02 +0000
@@ -126,6 +126,7 @@
     SubsetModel m_keyboardLayoutsModel;
     SubsetModel m_spellCheckingModel;
     SessionService m_sessionService;
+    QStringList m_layoutPaths;
 };
 
 #endif // LANGUAGE_PLUGIN_H