Merge lp:~tombeckmann/switchboard/fixing into lp:~elementary-pantheon/switchboard/switchboard

[Tom Beckmann]

This will remove the animation and fix the startup-with-one-column-only. I think this is necessary to make switchboard work for now, we can add it later again when we've got more time to improve things. I also made the icons take up 48px.

[lp:~tombeckmann/switchboard/fixing]

287. By Tom Beckmann on 2012-08-18

Fix a show_all problem

[Cody Garver (codygarver)]

It's OK to return to 48px icons because that's what they were BEFORE Tom changed them.

I do not agree that expanding the window size fixes the "show all" issue because the window is already too big for 800x600 machines. See bug #1035714.

review: Approve

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-08-02 22:36:42 +0000
+++ Switchboard/switchboard-app.vala	2012-08-19 00:04:23 +0000
@@ -40,7 +40,6 @@
         }
 
         // Chrome widgets
-        Granite.Widgets.AppMenu app_menu;
         Gtk.ProgressBar progress_bar;
         Gtk.Label progress_label;
         Granite.Widgets.SearchBar search_box;
@@ -60,9 +59,6 @@
         Granite.Widgets.EmbeddedAlert alert_view;
         Switchboard.CategoryView category_view;
 
-        public GtkClutter.Embed clutter;
-        public GtkClutter.Actor overview;
-
         // Plug data
         bool socket_shown;
         Gee.HashMap<string, string> current_plug = new Gee.HashMap<string, string>();
@@ -80,18 +76,15 @@
             
             main_window = new Gtk.Window();
 
-            this.clutter = new GtkClutter.Embed ();
-
             // Set up defaults
             main_window.title = APP_TITLE;
             main_window.icon_name = APP_ICON;
 
             // Set up window
-            main_window.height_request = 500;
-            main_window.width_request = 810;
+            main_window.set_size_request (842, 468);
             main_window.window_position = Gtk.WindowPosition.CENTER;
-            main_window.destroy.connect(shut_down);
-            setup_toolbar();
+            main_window.destroy.connect (shut_down);
+            setup_toolbar ();
 
             // Set up socket
             socket = new Gtk.Socket ();
@@ -113,6 +106,10 @@
             current_plug["title"] = "";
             current_plug["executable"] = "";
 
+            category_view = new Switchboard.CategoryView();
+            category_view.plug_selected.connect((title, executable) => load_plug (title, executable));
+            category_view.margin_top = 12;
+
             // Set up UI
             vbox = new Gtk.VBox (false, 0);
             vbox.pack_start (toolbar, false, false);
@@ -121,35 +118,22 @@
             vbox.pack_end (alert_view);
 
             main_window.add (vbox);
-            vbox.pack_start (this.clutter);
+            vbox.pack_start (category_view);
 
             main_window.set_application (this);
             main_window.resizable = false;
             main_window.show_all ();
-    
+
+            foreach (var label in category_view.category_labels.values)
+                label.hide ();
+            foreach (var view in category_view.category_views.values)
+                view.hide ();
+
             alert_view.hide();
 
             vbox.pack_start (socket);
             socket.hide ();
-            
-            category_view = new Switchboard.CategoryView();
-            category_view.plug_selected.connect((title, executable) => load_plug (title, executable));
-            category_view.margin_top = 12;
-            
-            this.overview = new GtkClutter.Actor.with_contents (category_view);
-            this.overview.get_widget ().show ();
-            
-            this.clutter.get_stage ().add_child (this.overview);
-            (this.clutter.get_stage () as Clutter.Stage).use_alpha = true;
-            var bg_col = main_window.get_style_context ().get_background_color (Gtk.StateFlags.NORMAL);
-            (this.clutter.get_stage () as Clutter.Stage).color = 
-                {(uint8) (bg_col.red*255), (uint8) (bg_col.green*255), (uint8) (bg_col.blue * 255), 255};
-            
-            this.overview.add_constraint (new Clutter.BindConstraint (this.clutter.get_stage (), 
-                Clutter.BindCoordinate.WIDTH, 0));
-            this.overview.add_constraint (new Clutter.BindConstraint (this.clutter.get_stage (), 
-                Clutter.BindCoordinate.HEIGHT, 0));
-            
+
             var any_plugs = false;
 
             foreach (string place in plug_places)
@@ -165,7 +149,7 @@
             if (plug_to_open != null) {
                 foreach (var plug in plugs) {
                     if (plug["id"] == plug_to_open) {
-                        load_plug (plug["title"], plug["exec"], true);
+                        load_plug (plug["title"], plug["exec"]);
                         found = true;
                     }
                 }
@@ -174,39 +158,34 @@
                 }
             }
             
-            Timeout.add (50, () => {
-                foreach (var store in category_view.category_store.values) {
-                    // FIXME: workaround for misplaced icons
-                    store.foreach((model, path, iter) => {
-                        store.set_value (iter, 3, true);
-                        return false;
-                    });
-                }
-                return false;
-            });
+            foreach (var store in category_view.category_store.values) {
+                store.foreach ((model, path, iter) => {
+                    store.set_value (iter, 3, true);
+                    return false;
+                });
+            }
         }
         
         void shut_down () {
-            plug_closed();
-            Gtk.main_quit();
+            plug_closed ();
         }
 
         public void hide_alert () {
-            alert_view.hide();
-            this.clutter.show();
+            alert_view.hide ();
+            category_view.show ();
         }
 
         public void show_alert (string primary_text, string secondary_text, Gtk.MessageType type) {
-            alert_view.set_alert(primary_text, secondary_text, null, true, type);
-            alert_view.show();
-            this.clutter.hide();
+            alert_view.set_alert (primary_text, secondary_text, null, true, type);
+            alert_view.show ();
+            category_view.hide ();
         }
 
-        public void load_plug (string title, string executable, bool suppress_animation = false) {
+        public void load_plug (string title, string executable) {
             debug ("Selected plug: title %s | executable %s", title, executable);
 
             // Launch plug's executable
-            switch_to_socket (suppress_animation);
+            switch_to_socket ();
             main_window.title = @"$APP_TITLE - $title";
             if (current_plug["title"] != title) {
                 try {
@@ -249,28 +228,19 @@
         }
 
         // Switches to the socket view
-        void switch_to_socket (bool suppress_animation = false) {
+        void switch_to_socket () {
 
             socket_shown = true;
             search_box.sensitive = false;
 
-            if (!suppress_animation) {
-                this.overview.animate (Clutter.AnimationMode.EASE_IN_QUAD, 400, x:-clutter.get_stage ().width, 
-                    opacity:0).completed.connect ( () => {
-                    clutter.hide ();
-                    socket.show_all ();
-                });
-            } else {
-                clutter.hide ();
-                socket.show_all ();
-            }
+            category_view.hide ();
+            socket.show_all ();
         }
         
         // Switches back to the icons
         bool switch_to_icons () {
             socket.hide ();
-            clutter.show_all ();
-            this.overview.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, x:0.0f, opacity:255);
+            category_view.show ();
             
             current_plug["title"] = "";
             socket_shown = false;
@@ -314,10 +284,11 @@
                     try {
                         plug["title"] = kf.get_locale_string (head, "title");
                         string? textdomain = null;
-                        foreach (var domain_key in SUPPORTED_GETTEXT_DOMAINS_KEYS)
+                        foreach (var domain_key in SUPPORTED_GETTEXT_DOMAINS_KEYS) {
                             if (kf.has_key (head, domain_key)) {
-                            textdomain = kf.get_string (head, domain_key);
-                            break;
+                                textdomain = kf.get_string (head, domain_key);
+                                break;
+                            }
                         }
                         if (textdomain != null)
                             plug["title"] = GLib.dgettext (textdomain, plug["title"]).dup ();
@@ -442,8 +413,6 @@
             toolbar = new Gtk.Toolbar ();
             toolbar.get_style_context ().add_class ("primary-toolbar");
 
-            var menu = new Gtk.Menu ();
-            app_menu = create_appmenu(menu);
             // Spacing
             lspace.set_expand(true);
             rspace.set_expand(true);
@@ -477,18 +446,17 @@
             navigation_button.set_sensitive(false);
 
             // Add everything to the toolbar
-            toolbar.insert(navigation_button, 0);
-            toolbar.insert(lspace, 1);
-            toolbar.insert(progress_toolitem, 2);
-            toolbar.insert(rspace, 3);
-            toolbar.insert(find_toolitem, 4);
-            toolbar.insert(app_menu, 5);
-            toolbar.show_all();
+            toolbar.insert (navigation_button, -1);
+            toolbar.insert (lspace, -1);
+            toolbar.insert (progress_toolitem, -1);
+            toolbar.insert (rspace, -1);
+            toolbar.insert (find_toolitem, -1);
+            toolbar.insert (create_appmenu (new Gtk.Menu ()), -1);
         }
         
         public override void activate () {}
     }
-    
+
     static const OptionEntry[] entries = {
             { "open-plug", 'o', 0, OptionArg.STRING, ref plug_to_open, N_("Open a plug"), "PLUG_NAME" },
             { null }

=== modified file 'Switchboard/switchboard-categoryview.vala'
--- Switchboard/switchboard-categoryview.vala	2012-07-22 22:18:03 +0000
+++ Switchboard/switchboard-categoryview.vala	2012-08-19 00:04:23 +0000
@@ -19,7 +19,7 @@
 
     public class CategoryView : Gtk.VBox {
 
-        Gee.HashMap<string, Gtk.VBox> category_labels = new Gee.HashMap<string, Gtk.VBox> ();
+        public Gee.HashMap<string, Gtk.VBox> category_labels = new Gee.HashMap<string, Gtk.VBox> ();
         public Gee.HashMap<string, Gtk.ListStore> category_store = new Gee.HashMap<string, Gtk.ListStore> ();
         public Gee.HashMap<string, Gtk.IconView> category_views = new Gee.HashMap<string, Gtk.IconView> ();
         Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
@@ -41,13 +41,12 @@
                 
                 var category_plugs = new Gtk.IconView.with_model (filtered);
                 // category_plugs.
+                category_plugs.column_spacing = -20;
                 category_plugs.set_text_column (0);
                 category_plugs.set_pixbuf_column (1);
                 category_plugs.selection_changed.connect(() => on_selection_changed(category_plugs, filtered));
                 
                 (category_plugs.get_cells ().nth_data (0) as Gtk.CellRendererText).wrap_mode = Pango.WrapMode.WORD;
-                // (category_plugs.get_cells ().nth_data (0) as Gtk.CellRendererText).ellipsize = 
-                    // Pango.EllipsizeMode.END;
                 
                 var bg_css = new Gtk.CssProvider ();
                 try {
@@ -89,7 +88,7 @@
             
             Gdk.Pixbuf icon_pixbuf = null;
             try {
-                icon_pixbuf = theme.load_icon (plug["icon"], 32, Gtk.IconLookupFlags.GENERIC_FALLBACK);
+                icon_pixbuf = theme.load_icon (plug["icon"], 48, Gtk.IconLookupFlags.GENERIC_FALLBACK);
             } catch {
                 warning(_("Unable to load plug %s's icon: %s"), plug["title"], plug["icon"]);
                 return; // FIXME: if we get no icon, we probably dont want that one..
@@ -97,8 +96,9 @@
             category_store[plug_down].append(out root);
             
             category_store[plug_down].set(root, 0, plug["title"], 1, icon_pixbuf, 2, plug["exec"], 
-                3, false);
-            category_labels[plug_down].show_all();
+                3, true);
+            category_labels[plug_down].show_all ();
+            category_views[plug_down].show_all ();
         }
 
         public void filter_plugs (string filter, SwitchboardApp switchboard) {