Merge lp:~parnold-x/slingshot/switchboard-plugin into lp:~elementary-pantheon/slingshot/trunk

[Djax]

Get Switchboard plugs from Switchboard API instead of requiring .desktops

Add a slingshot synapse plugin that get the plugs from the Switchboard API and show these plugs in a new "Settings" category.

[Danielle Foré (danrabbit)]

Plugin works as expected here! So we will only need to stop shipping .desktops with plugs

=== modified file 'lib/synapse-plugins/CMakeLists.txt'
--- lib/synapse-plugins/CMakeLists.txt	2015-05-20 17:13:27 +0000
+++ lib/synapse-plugins/CMakeLists.txt	2015-06-03 19:12:20 +0000
@@ -6,6 +6,7 @@
     gio-unix-2.0
     gee-0.8
     gtk+-3.0
+    switchboard-2.0
 )
 
 pkg_check_modules(PLUGINS_DEPS REQUIRED ${PLUGINS_PKG})
@@ -14,6 +15,7 @@
     calculator-plugin.vala
     command-plugin.vala
     desktop-file-plugin.vala
+    switchboard-plugin.vala
     system-managment.vala
 )
 

=== added file 'lib/synapse-plugins/switchboard-plugin.vala'
--- lib/synapse-plugins/switchboard-plugin.vala	1970-01-01 00:00:00 +0000
+++ lib/synapse-plugins/switchboard-plugin.vala	2015-06-03 19:12:20 +0000
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2015 Peter Arnold
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ * Authored by Peter Arnold
+ *
+ */
+
+namespace Synapse {
+public class SwitchboardPlugin : Object, Activatable, ItemProvider {
+
+    public bool enabled { get; set; default = true; }
+
+    public SwitchboardPlugin() {
+
+    }
+
+    public void activate () {
+
+    }
+
+    public void deactivate () {
+
+    }
+
+    public class SwitchboardObject: Object, Match, ApplicationMatch {
+      // for Match interface
+      public string title { get; construct set; }
+      public string description { get; set; default = ""; }
+      public string icon_name { get; construct set; default = ""; }
+      public bool has_thumbnail { get; construct set; default = false; }
+      public string thumbnail_path { get; construct set; }
+      public MatchType match_type { get; construct set; }
+
+      // for ApplicationMatch
+      public AppInfo? app_info { get; set; default = null; }
+      public bool needs_terminal { get; set; default = false; }
+      public string? filename { get; construct set; default = null; }
+      public string plug { get; construct set; }
+
+      public SwitchboardObject (PlugInfo plug_info) {
+        Object (title: plug_info.title, description: _ ("Open %s settings").printf (plug_info.title),
+                plug: plug_info.code_name, icon_name: plug_info.icon, match_type: MatchType.APPLICATION);
+
+        try {
+            var cmd = "/usr/bin/switchboard -o %s".printf (plug_info.code_name);
+            app_info = AppInfo.create_from_commandline (cmd, null, 0);
+        } catch (Error err) {
+            warning ("%s", err.message);
+        }
+      }
+    }
+
+    static void register_plugin () {
+        DataSink.PluginRegistry.get_default ().register_plugin (
+          typeof (SwitchboardPlugin),
+          "Switchboard Search",
+          _ ("Find switchboard plugs and open them."),
+          "preferences-desktop",
+          register_plugin
+        );
+    }
+
+    static construct {
+        register_plugin ();
+    }
+    private Gee.ArrayList<PlugInfo> plugs;
+
+    construct {
+        plugs = new Gee.ArrayList<PlugInfo> ();
+        load_plugs.begin ();
+    }
+
+    public class PlugInfo : GLib.Object {
+        public string title { get; construct set; }
+        public string code_name { get; construct set; }
+        public string icon { get; construct set; }
+
+        public PlugInfo (string plug_title, string code_name, string icon) {
+          Object (title: plug_title, code_name: code_name, icon: icon);
+        }
+    }
+
+    private bool loading_in_progress = false;
+    public signal void load_complete ();
+
+    private async void load_plugs () {
+        loading_in_progress = true;
+        Idle.add_full (Priority.LOW, load_plugs.callback);
+        yield;
+
+        foreach (var plug in Switchboard.PlugsManager.get_default ().get_plugs ()) {
+            plugs.add (new PlugInfo (plug.display_name, plug.code_name, plug.icon));
+        }
+        loading_in_progress = false;
+        load_complete ();
+    }
+
+    public async ResultSet? search (Query q) throws SearchError {
+        if (loading_in_progress) {
+          // wait
+          ulong signal_id = this.load_complete.connect (() => {
+            search.callback ();
+          });
+          yield;
+          SignalHandler.disconnect (this, signal_id);
+        } else {
+          Idle.add_full (Priority.HIGH_IDLE, search.callback);
+          yield;
+        }
+
+        var result = new ResultSet ();
+        MatcherFlags flags;
+        if (q.query_string.length == 1) {
+            flags = MatcherFlags.NO_SUBSTRING | MatcherFlags.NO_PARTIAL |
+                        MatcherFlags.NO_FUZZY;
+        } else {
+            flags = 0;
+        }
+        var matchers = Query.get_matchers_for_query (q.query_string_folded, flags);
+
+        string stripped = q.query_string.strip ();
+        if (stripped == "") return null;
+
+        foreach (var plug in plugs) {
+            foreach (var matcher in matchers) {
+                MatchInfo info;
+                if (matcher.key.match (plug.title.down (), 0, out info)) {
+                  result.add (new SwitchboardObject (plug), Match.Score.AVERAGE + Match.Score.INCREMENT_MEDIUM);
+                  break;
+                }
+            }
+        }
+        q.check_cancellable ();
+
+        return result;
+    }
+}
+}
\ No newline at end of file

=== modified file 'po/slingshot.pot'
--- po/slingshot.pot	2015-05-29 01:01:19 +0000
+++ po/slingshot.pot	2015-06-03 19:12:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-28 20:01-0500\n"
+"POT-Creation-Date: 2015-06-03 20:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,58 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../src/Widgets/SearchView.vala:160
+msgid "Other"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:163
+msgid "Text"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:166
+msgid "Applications"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:169
+msgid "Files"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:172
+msgid "Actions"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:175
+msgid "Search"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:178
+msgid "Contacts"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:181
+msgid "Internet"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:184
+msgid "Settings"
+msgstr ""
+
+#: ../src/Widgets/AppEntry.vala:195
+msgid "Remove from _Dock"
+msgstr ""
+
+#: ../src/Widgets/AppEntry.vala:197
+msgid "Add to _Dock"
+msgstr ""
+
+#: ../src/Widgets/CategoryView.vala:27
+msgid "All Applications"
+msgstr ""
+
+#: ../src/Widgets/CategoryView.vala:28
+msgid "Create a new Filter"
+msgstr ""
+
 #: ../src/Backend/App.vala:108
 msgid "Run this command…"
 msgstr ""
@@ -33,52 +85,88 @@
 msgid "Search Apps"
 msgstr ""
 
-#: ../src/Widgets/CategoryView.vala:27
-msgid "All Applications"
-msgstr ""
-
-#: ../src/Widgets/CategoryView.vala:28
-msgid "Create a new Filter"
-msgstr ""
-
-#: ../src/Widgets/AppEntry.vala:195
-msgid "Remove from _Dock"
-msgstr ""
-
-#: ../src/Widgets/AppEntry.vala:197
-msgid "Add to _Dock"
-msgstr ""
-
-#: ../src/Widgets/SearchView.vala:156
-msgid "Other"
-msgstr ""
-
-#: ../src/Widgets/SearchView.vala:159
-msgid "Text"
-msgstr ""
-
-#: ../src/Widgets/SearchView.vala:162
-msgid "Applications"
-msgstr ""
-
-#: ../src/Widgets/SearchView.vala:165
-msgid "Files"
-msgstr ""
-
-#: ../src/Widgets/SearchView.vala:168
-msgid "Actions"
-msgstr ""
-
-#: ../src/Widgets/SearchView.vala:171
-msgid "Search"
-msgstr ""
-
-#: ../src/Widgets/SearchView.vala:174
-msgid "Contacts"
-msgstr ""
-
-#: ../src/Widgets/SearchView.vala:177
-msgid "Internet"
+#: ../lib/synapse-plugins/system-managment.vala:103
+msgid "Suspend"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:104
+msgid "Put your computer into suspend mode"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:203
+msgid "Hibernate"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:204
+msgid "Put your computer into hibernation mode"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:302
+msgid "Shut Down"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:303
+msgid "Turn your computer off"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:386
+msgid "Restart"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:387
+msgid "Restart your computer"
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:471
+msgid "Suspend, hibernate, restart or shutdown your computer."
+msgstr ""
+
+#: ../lib/synapse-plugins/system-managment.vala:476
+msgid "ConsoleKit wasn't found"
+msgstr ""
+
+#: ../lib/synapse-plugins/desktop-file-plugin.vala:94
+msgid "Search for and run applications on your computer."
+msgstr ""
+
+#: ../lib/synapse-plugins/desktop-file-plugin.vala:283
+msgid "Open with %s"
+msgstr ""
+
+#: ../lib/synapse-plugins/desktop-file-plugin.vala:285
+msgid "Opens current selection using %s"
+msgstr ""
+
+#: ../lib/synapse-plugins/command-plugin.vala:56
+msgid "Execute '%s'"
+msgstr ""
+
+#: ../lib/synapse-plugins/command-plugin.vala:56
+msgid "Run command"
+msgstr ""
+
+#: ../lib/synapse-plugins/command-plugin.vala:77
+msgid "Find and execute arbitrary commands."
+msgstr ""
+
+#: ../lib/synapse-plugins/calculator-plugin.vala:63
+msgid "Calculator"
+msgstr ""
+
+#: ../lib/synapse-plugins/calculator-plugin.vala:64
+msgid "Calculate basic expressions."
+msgstr ""
+
+#: ../lib/synapse-plugins/calculator-plugin.vala:68
+msgid "bc is not installed"
+msgstr ""
+
+#: ../lib/synapse-plugins/switchboard-plugin.vala:55
+msgid "Open %s settings"
+msgstr ""
+
+#: ../lib/synapse-plugins/switchboard-plugin.vala:71
+msgid "Find switchboard plugs and open them."
 msgstr ""
 
 #: ../lib/synapse-core/common-actions.vala:77
@@ -120,79 +208,3 @@
 #: ../lib/synapse-core/common-actions.vala:294
 msgid "Copy selection to clipboard"
 msgstr ""
-
-#: ../lib/synapse-plugins/desktop-file-plugin.vala:94
-msgid "Search for and run applications on your computer."
-msgstr ""
-
-#: ../lib/synapse-plugins/desktop-file-plugin.vala:283
-msgid "Open with %s"
-msgstr ""
-
-#: ../lib/synapse-plugins/desktop-file-plugin.vala:285
-msgid "Opens current selection using %s"
-msgstr ""
-
-#: ../lib/synapse-plugins/command-plugin.vala:56
-msgid "Execute '%s'"
-msgstr ""
-
-#: ../lib/synapse-plugins/command-plugin.vala:56
-msgid "Run command"
-msgstr ""
-
-#: ../lib/synapse-plugins/command-plugin.vala:77
-msgid "Find and execute arbitrary commands."
-msgstr ""
-
-#: ../lib/synapse-plugins/calculator-plugin.vala:63
-msgid "Calculator"
-msgstr ""
-
-#: ../lib/synapse-plugins/calculator-plugin.vala:64
-msgid "Calculate basic expressions."
-msgstr ""
-
-#: ../lib/synapse-plugins/calculator-plugin.vala:68
-msgid "bc is not installed"
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:103
-msgid "Suspend"
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:104
-msgid "Put your computer into suspend mode"
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:203
-msgid "Hibernate"
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:204
-msgid "Put your computer into hibernation mode"
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:302
-msgid "Shut Down"
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:303
-msgid "Turn your computer off"
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:386
-msgid "Restart"
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:387
-msgid "Restart your computer"
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:471
-msgid "Suspend, hibernate, restart or shutdown your computer."
-msgstr ""
-
-#: ../lib/synapse-plugins/system-managment.vala:476
-msgid "ConsoleKit wasn't found"
-msgstr ""

=== modified file 'src/Backend/SynapseSearch.vala'
--- src/Backend/SynapseSearch.vala	2015-05-20 17:13:27 +0000
+++ src/Backend/SynapseSearch.vala	2015-06-03 19:12:20 +0000
@@ -24,6 +24,7 @@
             typeof (Synapse.CalculatorPlugin),
             typeof (Synapse.CommandPlugin),
             typeof (Synapse.DesktopFilePlugin),
+            typeof (Synapse.SwitchboardPlugin),
             typeof (Synapse.SystemManagementPlugin)
         };
 

=== modified file 'src/Widgets/SearchView.vala'
--- src/Widgets/SearchView.vala	2015-05-29 00:40:47 +0000
+++ src/Widgets/SearchView.vala	2015-06-03 19:12:20 +0000
@@ -128,6 +128,10 @@
                         || uri.has_prefix ("https://"))
                         type = 8;
                 }
+                // we're cheating again and assign switchboard plugs to a separate category.
+                // We assign 9 as the id for settings results
+                if (match is Synapse.SwitchboardPlugin.SwitchboardObject)
+                    type = 9;
 
                 if ((list = categories.get (type)) == null) {
                     list = new Gee.LinkedList<Synapse.Match> ();
@@ -176,6 +180,9 @@
                     case 8:
                         label = _("Internet");
                         break;
+                    case 9:
+                        label = _("Settings");
+                        break;
                 }
 
                 var header = new Gtk.Label (label);