Merge lp:~voluntatefaber/slingshot/bug1098429 into lp:~elementary-pantheon/slingshot/trunk

[Andrea Basso]

[Cody Garver (codygarver)]

review: Approve

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2012-12-22 16:00:44 +0000
+++ src/Backend/App.vala	2013-02-16 11:58:19 +0000
@@ -30,7 +30,6 @@
         public double popularity { get; set; }
         public double relevancy { get; set; }
         public string desktop_path { get; private set; }
-        public bool display { get; set; }
 
         private bool is_command = false;
 
@@ -46,7 +45,6 @@
             icon_name = entry.get_icon () ?? "application-default-icon";
             desktop_path = entry.get_desktop_file_path ();
             keywords = Unity.AppInfoManager.get_default ().get_keywords (desktop_id);
-            display = !(entry.get_is_nodisplay ());
 
             update_icon ();
             Slingshot.icon_theme.changed.connect (update_icon);

=== modified file 'src/Backend/AppSystem.vala'
--- src/Backend/AppSystem.vala	2013-01-13 16:41:55 +0000
+++ src/Backend/AppSystem.vala	2013-02-16 11:58:19 +0000
@@ -38,7 +38,7 @@
             rl_service = new RelevancyService ();
             rl_service.update_complete.connect (update_popularity);
 
-            apps_menu = GMenu.Tree.lookup ("pantheon-applications.menu", TreeFlags.INCLUDE_EXCLUDED | TreeFlags.INCLUDE_NODISPLAY);
+            apps_menu = GMenu.Tree.lookup ("pantheon-applications.menu", TreeFlags.INCLUDE_EXCLUDED);
             apps_menu.add_monitor ((menu) => {
 
                 debug ("Apps menu tree changed. Updating..");
@@ -137,7 +137,8 @@
         private bool is_entry (TreeEntry entry) {
 
             if (entry.get_launch_in_terminal () == false
-                && entry.get_is_excluded () == false) {
+                && entry.get_is_excluded () == false
+                && entry.get_is_nodisplay () == false) {
                 return true;
             } else {
                 return false;

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2013-02-11 22:48:50 +0000
+++ src/SlingshotView.vala	2013-02-16 11:58:19 +0000
@@ -268,8 +268,6 @@
 
                 populate_grid_view ();
                 category_view.setup_sidebar ();
-                category_view.connect_events ();
-
             });
 
             // position on the right monitor when settings changed
@@ -660,12 +658,9 @@
             foreach (App app in app_system.get_apps_by_name ()) {
 
                 var app_entry = new AppEntry (app);
-                if (app_entry.display) {
-                    app_entry.app_launched.connect (() => hide ());
-                    grid_view.append (app_entry);
-                    app_entry.show_all ();
-                }
-
+                app_entry.app_launched.connect (() => hide ());
+                grid_view.append (app_entry);
+                app_entry.show_all ();
             }
                             
             view_manager.move (grid_view, 0, 0);

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2012-12-22 16:00:44 +0000
+++ src/Widgets/AppEntry.vala	2013-02-16 11:58:19 +0000
@@ -33,7 +33,6 @@
         public string desktop_id;
         public int icon_size;
         public string desktop_path;
-        public bool display;
 
         public signal void app_launched ();
 
@@ -59,7 +58,6 @@
             exec_name = app.exec;
             icon_size = Slingshot.settings.icon_size;
             icon = app.icon;
-            display = app.display;
 
             get_style_context ().add_class ("app");
 

=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2013-02-06 20:36:45 +0000
+++ src/Widgets/CategoryView.vala	2013-02-16 11:58:19 +0000
@@ -106,10 +106,18 @@
             }
 
             container.attach (category_switcher, 0, 0, 1, 2);
+            category_switcher.selection_changed.connect ((name, nth) => {
+
+                view.reset_category_focus ();
+                string category = category_ids.get (nth);
+                show_filtered_apps (category);
+            });
+            category_switcher.selected = 0; //Must be after everything else
+
             category_switcher.show_all ();
         }
 
-        public void connect_events () {
+        private void connect_events () {
 
             layout.scroll_event.connect ((event) => {
                 switch (event.direction.to_string ()) {
@@ -144,15 +152,6 @@
                 move_page (switcher.active - switcher.old_active);
                 view.searchbar.grab_focus (); // this is because otherwise focus isn't the current page
             });
-
-            category_switcher.selection_changed.connect ((name, nth) => {
-
-                view.reset_category_focus ();
-                string category = category_ids.get (nth);
-                show_filtered_apps (category);
-            });
-            category_switcher.selected = 0; //Must be after everything else
-
         }
 
         private void add_app (App app) {
@@ -171,7 +170,6 @@
             
             layout.move (empty_cat_label, view.columns*130, view.rows*130 / 2);
             foreach (App app in view.apps[category])
-		        if (app.display)
 	            add_app (app);
             
             switcher.set_active (0);