Merge lp:~tintou/switchboard/fix-1016155 into lp:~elementary-pantheon/switchboard/switchboard

[Corentin Noël]

[lp:~tintou/switchboard/fix-1016155]

310. By Corentin Noël on 2012-09-22

Removed redundant copyright, avi romanoff is already listed as developer

311. By Corentin Noël on 2012-09-22

Reverse to 32px Icons

312. By Corentin Noël on 2012-09-22

Forgotted to change the sorting column

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-06-18 04:21:47 +0000
+++ CMakeLists.txt	2012-09-22 17:35:24 +0000
@@ -61,7 +61,7 @@
 #
 
 find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED granite gio-2.0 gee-1.0 clutter-gtk-1.0 unity)
+pkg_check_modules(DEPS REQUIRED granite gio-2.0 gee-1.0 unity)
 add_definitions(${DEPS_CFLAGS})
 link_directories(${DEPS_LIBRARY_DIRS})
 find_package(Vala REQUIRED)
@@ -76,7 +76,6 @@
     Switchboard/granite-embedded-alert.vala
 PACKAGES
     granite
-    clutter-gtk-1.0
     gee-1.0
     gio-2.0
     unity

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-09-13 21:21:13 +0000
+++ Switchboard/switchboard-app.vala	2012-09-22 17:35:24 +0000
@@ -37,7 +37,6 @@
             translate_url = TRANSLATE_URL;
             about_authors = AUTHORS;
 
-            about_comments = COPYRIGHT;
             about_license_type = Gtk.License.GPL_3_0;
         }
 
@@ -59,8 +58,9 @@
 
         // Content area widgets
         Gtk.Socket socket;
-        Gtk.VBox vbox;
+        Gtk.Grid grid;
         Granite.Widgets.EmbeddedAlert alert_view;
+        Gtk.ScrolledWindow scrollable_view;
         Switchboard.CategoryView category_view;
 
         // Plug data
@@ -93,6 +93,8 @@
             // Set up socket
             socket = new Gtk.Socket ();
             socket.plug_removed.connect(switch_to_icons);
+            socket.set_hexpand(true);
+            socket.set_vexpand(true);
 
             // Set up accelerators (hotkeys)
             var accel_group = new Gtk.AccelGroup ();
@@ -110,19 +112,26 @@
             current_plug["title"] = "";
             current_plug["executable"] = "";
 
-            category_view = new Switchboard.CategoryView();
-            category_view.plug_selected.connect((title, executable, @extern) => load_plug (title, executable, @extern));
+            category_view = new Switchboard.CategoryView ();
+            category_view.plug_selected.connect ((title, executable, @extern) => load_plug (title, executable, @extern));
             category_view.margin_top = 12;
 
+            scrollable_view = new Gtk.ScrolledWindow (null, null);
+
             // Set up UI
-            vbox = new Gtk.VBox (false, 0);
-            vbox.pack_start (toolbar, false, false);
+            grid = new Gtk.Grid ();
+            grid.set_hexpand (true);
+            grid.set_vexpand (true);
+            grid.attach (toolbar, 0, 0, 1, 1);
+            toolbar.set_hexpand (true);
 
             alert_view = new Granite.Widgets.EmbeddedAlert ();
-            vbox.pack_end (alert_view);
+            grid.attach (alert_view, 0, 2, 1, 1);
 
-            main_window.add (vbox);
-            vbox.pack_start (category_view);
+            main_window.add (grid);
+            scrollable_view.add_with_viewport (category_view);
+            scrollable_view.set_vexpand (true);
+            grid.attach (scrollable_view, 0, 1, 1, 1);
 
             main_window.set_application (this);
             main_window.resizable = false;
@@ -136,15 +145,16 @@
             alert_view.hide();
 
             loading = new Gtk.Spinner ();
+            loading.set_vexpand(true);
             loading.halign = Gtk.Align.CENTER;
             loading.valign = Gtk.Align.CENTER;
             loading.width_request = 72;
             loading.height_request = 72;
             loading.start ();
 
-            vbox.pack_start (socket);
+            grid.attach (socket, 0, 1, 1, 1);
             socket.hide ();
-            vbox.pack_start (loading);
+            grid.attach (loading, 0, 1, 1, 1);
             loading.hide ();
 
             var any_plugs = false;
@@ -217,11 +227,11 @@
                     
                     // ensure the button is sensitive; it might be the first plug loaded
                     if (!@extern) {
-		                navigation_button.set_sensitive(true);
-		                navigation_button.stock_id = Gtk.Stock.HOME;
-		                current_plug["title"] = title;
-                    	current_plug["executable"] = executable;
-	                }
+                        navigation_button.set_sensitive(true);
+                        navigation_button.stock_id = Gtk.Stock.HOME;
+                        current_plug["title"] = title;
+                        current_plug["executable"] = executable;
+                    }
                 } catch {  warning(_("Failed to launch plug: title %s | executable %s"), title, executable); }
             } else {
                 navigation_button.set_sensitive(true);
@@ -229,9 +239,9 @@
             }
             
             if (!@extern) {
-            	switch_to_socket ();
-            	main_window.title = @"$APP_TITLE - $title";
-        	}
+                switch_to_socket ();
+                main_window.title = @"$APP_TITLE - $title";
+            }
         }
 
         // Change Switchboard title back to "Switchboard"
@@ -303,17 +313,17 @@
                     } catch (Error e) { warning("Couldn't load this keyfile, %s (path: %s)", e.message, keyfile); }
                     plug["id"] = kf.get_start_group();
                     try {
-                    	var exec = kf.get_string (head, "exec");
-                    	//if a path starts with a double slash, we take it as an absolute path
-                    	if (exec.substring (0, 2) == "//") {
-                    		exec = exec.substring (1);
-                    		plug["extern"] = "1";
-                		} else {
-                			exec = Path.build_filename(parent, exec);
-                			plug["extern"] = "0";
-                    	}
-                    	
-                    	plug["exec"] = exec;
+                        var exec = kf.get_string (head, "exec");
+                        //if a path starts with a double slash, we take it as an absolute path
+                        if (exec.substring (0, 2) == "//") {
+                            exec = exec.substring (1);
+                            plug["extern"] = "1";
+                        } else {
+                            exec = Path.build_filename(parent, exec);
+                            plug["extern"] = "0";
+                        }
+                        
+                        plug["exec"] = exec;
                     } catch (Error e) { warning("Couldn't read exec field in file %s, %s", keyfile, e.message); }
                     try { plug["icon"] = kf.get_string (head, "icon");
                     } catch (Error e) { warning("Couldn't read icon field in file %s, %s", keyfile, e.message); }

=== modified file 'Switchboard/switchboard-categoryview.vala'
--- Switchboard/switchboard-categoryview.vala	2012-09-05 14:54:07 +0000
+++ Switchboard/switchboard-categoryview.vala	2012-09-22 17:35:24 +0000
@@ -17,9 +17,9 @@
 
 namespace Switchboard {
 
-    public class CategoryView : Gtk.VBox {
+    public class CategoryView : Gtk.Grid {
 
-        public Gee.HashMap<string, Gtk.VBox> category_labels = new Gee.HashMap<string, Gtk.VBox> ();
+        public Gee.HashMap<string, Gtk.Grid> category_labels = new Gee.HashMap<string, Gtk.Grid> ();
         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 ();
@@ -30,76 +30,77 @@
 
         public CategoryView () {
             for (int i = 0; i < category_ids.length; i++) {
-                var store = new Gtk.ListStore (5, typeof (string), typeof (Gdk.Pixbuf), 
+                var store = new Gtk.ListStore (5, typeof (Gdk.Pixbuf), typeof (string), 
                     typeof(string), typeof(bool), typeof(string));
+                store.set_sort_column_id (1, Gtk.SortType.ASCENDING);
                 
-                var label = new Gtk.Label ("<big><b>" + _(category_names[i]) + "</b></big>");
-                label.margin_left = 12;
+                var category_label = new Gtk.Label ("<big><b>" + _(category_names[i]) + "</b></big>");
+                category_label.margin_left = 12;
                 var filtered = new Gtk.TreeModelFilter(store, null);
                 filtered.set_visible_column(3);
                 filtered.refilter();
                 
                 var category_plugs = new Gtk.IconView.with_model (filtered);
-                // category_plugs.
-                category_plugs.column_spacing = -5;
-                category_plugs.item_width = 72;
-                category_plugs.set_text_column (0);
-                category_plugs.set_pixbuf_column (1);
+                category_plugs.set_item_width(96);
+                category_plugs.set_text_column (1);
+                category_plugs.set_pixbuf_column (0);
+                category_plugs.set_hexpand (true);
                 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_set = true;
                 
                 var bg_css = new Gtk.CssProvider ();
                 try {
                     bg_css.load_from_data ("*{background-color:@background_color;}", -1);
                 } catch (Error e) { warning (e.message); }
                 category_plugs.get_style_context ().add_provider (bg_css, 20000);
-                label.xalign = (float) 0.02;
+                category_label.xalign = (float) 0.02;
                 
-                var vbox = new Gtk.VBox (false, 0); // not homogeneous, 0 spacing
-                var headbox = new Gtk.HBox (false, 0);
-                label.use_markup = true;
+                var grid = new Gtk.Grid ();
+                category_label.use_markup = true;
                 
                 // Always add a Seperator
-                var hsep = new Gtk.HSeparator ();
-                headbox.pack_end(hsep, true, true); // expand, fill, padding´
-                headbox.pack_start(label, false, false, 0);
-                
-                vbox.pack_start(headbox, false, true, 0);
-                vbox.pack_end(category_plugs, true, true);
-                
-                category_labels[category_ids[i]] = vbox;
+                var h_separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
+                h_separator.set_hexpand (true);
+                grid.attach (category_label, 0, 0, 1, 1);
+                grid.attach (h_separator, 1, 0, 1, 1); // expand, fill, padding´
+                
+                grid.attach(category_plugs, 0, 1, 2, 1);
+                
+                category_labels[category_ids[i]] = grid;
                 category_store[category_ids[i]] = store;
                 category_views[category_ids[i]] = category_plugs;
                 
-                pack_start(vbox);
+                attach (grid, 0, i, 1, 1);
             }
         }
 
         public void add_plug (Gee.HashMap<string, string> plug) {
 
-            Gtk.TreeIter root;
-            string plug_down = plug["category"].down();
-            
-            if (!(plug_down in category_ids)) {
-                warning (_("Keyfile \"%s\" contains an invalid category: \"%s\", and will not be added"), 
-                    plug["title"], plug["category"]);
-                return;
-            }
-            
-            Gdk.Pixbuf icon_pixbuf = null;
-            try {
-                icon_pixbuf = theme.load_icon (plug["icon"], 32, 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..
-            }
-            category_store[plug_down].append(out root);
-            
-            category_store[plug_down].set(root, 0, plug["title"], 1, icon_pixbuf, 2, plug["exec"], 
-                3, true, 4, plug["extern"]);
-            category_labels[plug_down].show_all ();
-            category_views[plug_down].show_all ();
+                            Gtk.TreeIter root;
+                string plug_down = plug["category"].down();
+                
+                if (!(plug_down in category_ids)) {
+                    warning (_("Keyfile \"%s\" contains an invalid category: \"%s\", and will not be added"), 
+                        plug["title"], plug["category"]);
+                    return;
+                }
+                
+                Gdk.Pixbuf icon_pixbuf = null;
+                try {
+                    icon_pixbuf = theme.load_icon (plug["icon"], 32, 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..
+                }
+                category_store[plug_down].append(out root);
+                
+                category_store[plug_down].set(root, 0, icon_pixbuf, 1, plug["title"], 2, plug["exec"], 
+                    3, true, 4, plug["extern"]);
+                category_labels[plug_down].show_all ();
+                category_views[plug_down].show_all ();
+
         }
 
         public void filter_plugs (string filter, SwitchboardApp switchboard) {
@@ -115,7 +116,7 @@
                 store.foreach((model, path, iter) => {
                     string title;
 
-                    store.get (iter, 0, out title);
+                    store.get (iter, 1, out title);
 
                     if (filter.down () in title.down ()) {
                         store.set_value (iter, 3, true);
@@ -155,7 +156,7 @@
                 return;
 
             store.get_iter (out selected_plug, item);
-            store.get_value (selected_plug, 0, out title);
+            store.get_value (selected_plug, 1, out title);
             store.get_value (selected_plug, 2, out executable);
             store.get_value (selected_plug, 4, out @extern);