Merge lp:~parnold-x/slingshot/fix-1457597 into lp:~elementary-pantheon/slingshot/trunk

[Djax]

Show switchboard plug .desktop files in a new settings search category

Show switchboard plug .desktop files in a new settings search category.

[Danielle Foré (danrabbit)]

Maybe instead of looking for a prefix, we should be looking for categories. Most notably "X-PANTHEON-Switchboard-Plugs"

[Djax (parnold-x)]

Also possible. But not all have this category. For example the sound plug .desktop file.

We could also add a switchboard plugin that get's the plugs from the api so we don't must manage all those .desktop files?

[Danielle Foré (danrabbit)]

Rejecting in favor of the Switchboard API approach https://code.launchpad.net/~parnold-x/slingshot/switchboard-plugin

Unmerged revisions

546. By Djax on 2015-06-03

Show settings in a new search category

=== modified file 'po/slingshot.pot'
--- po/slingshot.pot	2015-05-29 01:01:19 +0000
+++ po/slingshot.pot	2015-06-03 18:26:54 +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:23+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:165
+msgid "Other"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:168
+msgid "Text"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:171
+msgid "Applications"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:174
+msgid "Files"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:177
+msgid "Actions"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:180
+msgid "Search"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:183
+msgid "Contacts"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:186
+msgid "Internet"
+msgstr ""
+
+#: ../src/Widgets/SearchView.vala:189
+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,80 @@
 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-core/common-actions.vala:77
@@ -120,79 +200,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/Widgets/SearchView.vala'
--- src/Widgets/SearchView.vala	2015-05-29 00:40:47 +0000
+++ src/Widgets/SearchView.vala	2015-06-03 18:26:54 +0000
@@ -128,6 +128,15 @@
                         || uri.has_prefix ("https://"))
                         type = 8;
                 }
+                // we're cheating again and assign switchboard plugs .desktop files to a separate category.
+                // We assign 9 as the id for settings results
+                if (match.get_type ().name () == "SynapseDesktopFilePluginDesktopFileMatch") {
+                    Value val = Value (typeof (string));
+                    match.get_property ("exec", ref val);
+                    if (val.get_string ().has_prefix ("switchboard -o"))
+                        type = 9;
+                    val.unset ();
+                }
 
                 if ((list = categories.get (type)) == null) {
                     list = new Gee.LinkedList<Synapse.Match> ();
@@ -176,6 +185,9 @@
                     case 8:
                         label = _("Internet");
                         break;
+                    case 9:
+                        label = _("Settings");
+                        break;
                 }
 
                 var header = new Gtk.Label (label);