Merge lp:~nonamenoname/slingshot/fix-1084101 into lp:~elementary-pantheon/slingshot/trunk

[No Name]

Allows plugs to display in Slingshot search

Allows plugs display in slingshot. Only available in serach and category view. Part of #1084101

[Corentin Noël (tintou)]

This should take the OnlyShowIn parameter in account, here the gnome-region-panel.desktop is shown even if
OnlyShowIn=GNOME;

review: Needs Fixing

[Corentin Noël (tintou)]

Okay after talking, this is a problem from other packages that ships desktop files with NotShowIn

review: Approve

[David Gomes (davidgomes)]

Add newline after diff line 75.

review: Needs Fixing

[Corentin Noël (tintou)]

The elementary UX team has to review this, I'm not sure the System Settings section was the aim of this bug

[Danielle Foré (danrabbit)]

After some discussion with Corentin, let's please remove the entry from the category view. We want these to show up in search but since they aren't apps we don't want them mixed in with apps.

review: Needs Fixing

[No Name (nonamenoname)]

Removed application menu, are we good to go?

[Danielle Foré (danrabbit)]

Yep, let's do this!

review: Approve

[Danielle Foré (danrabbit)]

Wait, actually, they still show in "Other" any way around that?

[No Name (nonamenoname)]

> Wait, actually, they still show in "Other" any way around that?

When not having the items in a category GMenu won't load them. I think i revert the change and then hide the "System Settings" category in the UI only.

[lp:~nonamenoname/slingshot/fix-1084101]

420. By No Name on 2014-04-27

hide Switchboard Plugs in category view

[No Name (nonamenoname)]

I think i achieved the correct behaviour. On my fresh install there is no system settings category and also no "Other". Corentin can you verify and then approve?

[lp:~nonamenoname/slingshot/fix-1084101]

421. By No Name on 2014-04-27

forgot removing debug output

[Corentin Noël (tintou)]

That's the intended behavior indeed !

review: Approve

=== modified file 'data/pantheon-applications.menu'
--- data/pantheon-applications.menu	2013-10-05 11:42:23 +0000
+++ data/pantheon-applications.menu	2014-04-27 21:12:14 +0000
@@ -220,4 +220,18 @@
     <Directory>Debian.directory</Directory>
   </Menu>
 
+  <!-- Switchboard menu -->
+  <Menu>
+    <Name>switchboard</Name>
+    <Directory>Switchboard.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+          <Category>X-PANTHEON-Switchboard-Plugs</Category>
+          <Category>X-GNOME-Settings-Panel</Category>
+        </Or>
+      </And>
+    </Include>
+  </Menu>
+
 </Menu> <!-- End Applications -->

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2013-01-10 16:53:50 +0000
+++ src/Backend/App.vala	2014-04-27 21:12:14 +0000
@@ -28,6 +28,7 @@
     public double popularity { get; set; }
     public double relevancy { get; set; }
     public string desktop_path { get; private set; }
+    public string categories { get; private set; }
     public string generic_name { get; private set; default = ""; }
 
     private bool is_command = false;
@@ -45,6 +46,7 @@
 #if HAVE_UNITY
         keywords = Unity.AppInfoManager.get_default ().get_keywords (desktop_id);
 #endif
+        categories = info.get_categories ();
         generic_name = info.get_generic_name ();
 
         if (info.get_icon () is ThemedIcon) {

=== modified file 'src/Backend/AppSystem.vala'
--- src/Backend/AppSystem.vala	2014-03-01 15:19:12 +0000
+++ src/Backend/AppSystem.vala	2014-04-27 21:12:14 +0000
@@ -18,6 +18,9 @@
 
 public class Slingshot.Backend.AppSystem : Object {
 
+    const string GCC_PANEL_CATEGORY = "X-GNOME-Settings-Panel";
+    const string SWITCHBOARD_PLUG_CATEGORY = "X-PANTHEON-Switchboard-Plug";
+
     private Gee.ArrayList<GMenu.TreeDirectory> categories = null;
     private Gee.HashMap<string, Gee.ArrayList<App>> apps = null;
     private GMenu.Tree apps_menu = null;
@@ -93,8 +96,9 @@
 
         apps.clear ();
 
-        foreach (var cat in categories)
+        foreach (var cat in categories) {
             apps.set (cat.get_name (), get_apps_by_category (cat));
+        }
 
     }
 
@@ -156,6 +160,11 @@
 
         foreach (Gee.ArrayList<App> category in apps.values) {
             foreach (App app in category) {
+
+                if (GCC_PANEL_CATEGORY in app.categories || SWITCHBOARD_PLUG_CATEGORY in app.categories)
+                    continue;
+                
+
                 if (!(app.exec in sorted_apps_execs)) {
                     sorted_apps.insert_sorted_with_data (app, Utils.sort_apps_by_name);
                     sorted_apps_execs += app.exec;

=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2014-03-01 15:19:12 +0000
+++ src/Widgets/CategoryView.vala	2014-04-27 21:12:14 +0000
@@ -28,6 +28,8 @@
 
     private const string ALL_APPLICATIONS = _("All Applications");
     private const string NEW_FILTER = _("Create a new Filter");
+    private const string SWITCHBOARD_CATEGORY = "switchboard";
+
     private int current_position = 0;
 
     public Gee.HashMap<int, string> category_ids = new Gee.HashMap<int, string> ();
@@ -71,6 +73,9 @@
         int n = 0;
 
         foreach (string cat_name in view.apps.keys) {
+            if (cat_name == SWITCHBOARD_CATEGORY)
+                continue;
+
             category_ids.set (n, cat_name);
             category_switcher.add_category (GLib.dgettext ("gnome-menus-3.0", cat_name).dup ());
             n++;