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

[Tom Beckmann]

Restructure the UI quite a bit to fit to Harvey's mockup http://imagebin.org/230647
Adjust the coding style in quite some places
Readd clutter based animations (this time stable ones as far as tested)

[Tom Beckmann (tombeckmann)]

Also see this video https://www.youtube.com/watch?v=Sf6XwTPNZO4 of the animations

[Danielle Foré (danrabbit)]

* The vertical layout doesn't really make sense to me.
    * Displays are typically landscape, not portrait. This layout is going to cause unecessary amounts of scrolling and doesn't take advantage of the width of the display.

* Filtering just looks really unclear. Not a fan.

* The animation here isn't meaningful to me. It says "I'm opening a new window" and then it doesn't. The swipe animation we had before made more sense because it says "I'm changing context" and it gives the user a path to follow back. Additionally, the swipe animation implies a multi-touch gesture and I think it would make sense to have a consistent back/forward swipe gesture in elementary future.

* At this point in the development cycle, we need to not introduce such drastic changes that could introduce new problems. The focus should be on stability, the time for new features and experimental was supposed to end with feature freeze.

review: Disapprove

[Harvey Cabaguio (harveycabaguio)]

> * The vertical layout doesn't really make sense to me.
> * Displays are typically landscape, not portrait. This layout is going to
> cause unecessary amounts of scrolling and doesn't take advantage of the width
> of the display.

There's no need to take advantage of the width of the display, the items displayed on Switchboard are essentially lists and a vertical list is more efficient than a horizontal one.

And there is no unnecessary amounts of scrolling, I've listed all the plugs we're using right now and it even fits a small 800x600 screen resolution.

Unmerged revisions

318. By Tom Beckmann on 2012-10-02

Restructure the UI, rewrite big parts of code, adjust style, readd clutter based animations

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-09-22 12:29:22 +0000
+++ CMakeLists.txt	2012-10-02 21:23:23 +0000
@@ -61,7 +61,7 @@
 #
 
 find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED granite gio-2.0 gee-1.0 unity)
+pkg_check_modules(DEPS REQUIRED granite gio-2.0 gee-1.0 unity clutter-gtk-1.0)
 add_definitions(${DEPS_CFLAGS})
 link_directories(${DEPS_LIBRARY_DIRS})
 find_package(Vala REQUIRED)
@@ -79,6 +79,7 @@
     gee-1.0
     gio-2.0
     unity
+    clutter-gtk-1.0
 CUSTOM_VAPIS
     vapi/config.vapi
     )

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-09-23 22:43:12 +0000
+++ Switchboard/switchboard-app.vala	2012-10-02 21:23:23 +0000
@@ -63,10 +63,11 @@
         Gtk.ScrolledWindow scrollable_view;
         Switchboard.CategoryView category_view;
 
+        GtkClutter.Embed clutter;
+        GtkClutter.Actor actor;
+
         // Plug data
-        bool socket_shown;
-        Gee.HashMap<string, string> current_plug = new Gee.HashMap<string, string>();
-        Gee.HashMap<string, string>[] plugs;
+        Plug current_plug;
 
         string[] plug_places = {"/usr/share/plugs/",
                                 "/usr/lib/plugs/",
@@ -78,7 +79,7 @@
 
         public SwitchboardApp () {
             
-            main_window = new Gtk.Window();
+            main_window = new Gtk.Window ();
 
             // Set up defaults
             main_window.title = APP_TITLE;
@@ -108,12 +109,8 @@
             });
             main_window.add_accel_group (accel_group);
 
-            // ??? Why?
-            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.plug_selected.connect ((title, executable, external) => load_plug (title, executable, external));
             category_view.margin_top = 12;
 
             scrollable_view = new Gtk.ScrolledWindow (null, null);
@@ -129,27 +126,30 @@
             grid.attach (alert_view, 0, 2, 1, 1);
 
             main_window.add (grid);
+            
             scrollable_view.add_with_viewport (category_view);
             scrollable_view.set_vexpand (true);
-            grid.attach (scrollable_view, 0, 1, 1, 1);
+
+            var bg = main_window.get_style_context ().get_background_color (Gtk.StateFlags.NORMAL);
+
+            clutter = new GtkClutter.Embed ();
+            actor = new GtkClutter.Actor ();
+            actor.scale_gravity = Clutter.Gravity.CENTER;
+            actor.add_constraint (new Clutter.BindConstraint (clutter.get_stage (), 
+                Clutter.BindCoordinate.WIDTH, 0));
+            actor.add_constraint (new Clutter.BindConstraint (clutter.get_stage (), 
+                Clutter.BindCoordinate.HEIGHT, 0));
+            (actor.get_widget () as Gtk.Container).add (scrollable_view);
+            
+            clutter.get_stage ().add_child (actor);
+            clutter.get_stage ().background_color = {(uint8)(bg.red * 255), (uint8)(bg.green * 255), (uint8)(bg.blue * 255)};
+            
+            grid.attach (clutter, 0, 1, 1, 1);
 
             main_window.set_application (this);
             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();
-
-            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 ();
+            alert_view.hide ();
 
             grid.attach (socket, 0, 1, 1, 1);
             socket.hide ();
@@ -158,13 +158,6 @@
 
             var any_plugs = false;
 
-            socket.plug_added.connect (() => {
-                if (loading.visible) {
-                    loading.hide ();
-                    socket.show_all ();
-                }
-            });
-
             foreach (string place in plug_places)
                 if (enumerate_plugs (place))
                     any_plugs = true;
@@ -174,27 +167,24 @@
                 search_box.sensitive = false;
             }
             
+            actor.get_widget ().show_all ();
+            
             bool found = false;
             if (plug_to_open != null) {
-                foreach (var plug in plugs) {
-                    if (plug["id"] == plug_to_open) {
-                        load_plug (plug["title"], plug["exec"], plug["extern"] == "1");
+                foreach (var child in category_view.get_children ()) {
+                    if (child is Plug && (child as Plug).id == plug_to_open) {
+                        var plug = child as Plug;
+                        load_plug (plug.title, plug.exec, plug.external);
                         found = true;
                     }
                 }
+                
                 if (!found) {
                     critical ("Couldn't find %s among the loaded settings.", plug_to_open);
                 }
             }
-            
-            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 ();
         }
@@ -210,36 +200,42 @@
             category_view.hide ();
         }
 
-        public void load_plug (string title, string executable, bool @extern) {
-            debug ("Selected plug: title %s | executable %s", title, executable);
+        // we cant pass a Plug to this method as its serialization via dbus is not supported
+        public void load_plug (string title, string executable, bool external) {
+            
+            Plug plug = null;
+            foreach (var child in category_view.get_children ()) {
+                if (child is Plug && (child as Plug).exec == executable)
+                    plug = child as Plug;
+            }
+            
+            if (plug == null)
+                error ("Could not load plug %s, not loaded", title);
+            
+            debug ("Selected plug: title %s | executable %s", plug.title, plug.exec);
 
-            // Launch plug's executable
-            if (current_plug["title"] != title || !socket.visible) {
-                try {
-                    // The plug is already selected
-                    debug(_("Closing plug \"%s\" in Switchboard controller..."), current_plug["title"]);
+            try {
+                // The plug is already selected
+                if (current_plug != null) { 
+                    debug(_("Closing plug \"%s\" in Switchboard controller"), current_plug.title);
                     plug_closed ();
-                    
-                    string[] cmd_exploded = (executable!=null)?executable.split (" "):null;
-                    GLib.Process.spawn_async (File.new_for_path (cmd_exploded[0]).get_parent ().
-                        get_path (), cmd_exploded, null, SpawnFlags.SEARCH_PATH, null, null);
-                    
-                    // 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;
-                    }
-                } catch {  warning(_("Failed to launch plug: title %s | executable %s"), title, executable); }
-            } else {
-                navigation_button.set_sensitive(true);
-                navigation_button.stock_id = Gtk.Stock.HOME;
-            }
+                }
+                
+                string[] cmd_exploded = (plug.exec != null) ? plug.exec.split (" ") : null;
+                GLib.Process.spawn_async (File.new_for_path (cmd_exploded[0]).get_parent ().
+                    get_path (), cmd_exploded, null, SpawnFlags.SEARCH_PATH, null, null);
+                
+                // ensure the button is sensitive; it might be the first plug loaded
+                if (!plug.external) {
+                    navigation_button.set_sensitive (true);
+                    navigation_button.stock_id = Gtk.Stock.HOME;
+                    current_plug = plug;
+                }
+            } catch { warning(_("Failed to launch plug: title %s | executable %s"), plug.title, plug.exec); }
             
-            if (!@extern) {
+            if (!plug.external) {
                 switch_to_socket ();
-                main_window.title = @"$APP_TITLE - $title";
+                main_window.title = @"$APP_TITLE - " + plug.title;
             }
         }
 
@@ -254,35 +250,34 @@
                 switch_to_icons();
                 navigation_button.stock_id = Gtk.Stock.GO_BACK;
             }
-            else {
-                load_plug (current_plug["title"], current_plug["executable"], current_plug["extern"] == "1");
+            else if (current_plug != null) {
+                load_plug (current_plug.title, current_plug.exec, current_plug.external);
                 navigation_button.stock_id = Gtk.Stock.HOME;
             }
         }
 
         // Switches to the socket view
         void switch_to_socket () {
-
-            socket_shown = true;
             search_box.sensitive = false;
 
-            category_view.hide ();
-            loading.show_all ();
+            actor.animate (Clutter.AnimationMode.EASE_IN_CUBIC, 300, scale_x : 2.0f, scale_y : 2.0f, opacity : 0).
+                completed.connect (() => {
+                clutter.hide ();
+                socket.show_all ();
+            });
         }
         
         // Switches back to the icons
         bool switch_to_icons () {
             socket.hide ();
-            loading.hide ();
-            category_view.show ();
-            
-            socket_shown = false;
+            clutter.show ();
+            actor.animate (Clutter.AnimationMode.EASE_IN_CUBIC, 250, scale_x : 1.0f, scale_y : 1.0f, opacity : 255);
 
             // Reset state
             reset_title ();
-            search_box.set_text("");
-            search_box.sensitive = count_plugs() > 0;
-            progress_label.set_text("");
+            search_box.set_text ("");
+            search_box.sensitive = count_plugs () > 0;
+            progress_label.set_text ("");
             progress_bar.fraction = 0.0;
             progress_toolitem.visible = false;
             
@@ -298,36 +293,42 @@
 
             // <keyfile's absolute path, keyfile's directory>
             List<string> keyfiles = find_plugs (plug_root_dir);
-            if (keyfiles.length() == 0) {
+            if (keyfiles.length () == 0) {
                 return false;
             } else {
                 foreach (string keyfile in keyfiles) {
                     KeyFile kf = new KeyFile();
 
-                    string head = File.new_for_path(keyfile).get_basename();
-                    string parent = File.new_for_path(keyfile).get_parent().get_path();
+                    string head = File.new_for_path (keyfile).get_basename ();
+                    string parent = File.new_for_path (keyfile).get_parent ().get_path ();
 
-                    Gee.HashMap<string, string> plug = new Gee.HashMap<string, string> ();
-                    try { kf.load_from_file(keyfile, KeyFileFlags.NONE);
-                    } 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
+                    string title="", icon="", category="", exec="", id="";
+                    bool external=false;
+                    
+                    try {
+                        kf.load_from_file (keyfile, KeyFileFlags.NONE);
+                    } catch (Error e) { warning ("Couldn't load this keyfile, %s (path: %s)", e.message, keyfile); }
+                    
+                    id = kf.get_start_group ();
+                    
+                    try {
+                        exec = kf.get_string (head, "exec");
+                        //if a path starts with a double slash, we take it as an absolute path to an extern plug
                         if (exec.substring (0, 2) == "//") {
                             exec = exec.substring (1);
-                            plug["extern"] = "1";
+                            external = true;
                         } else {
-                            exec = Path.build_filename(parent, exec);
-                            plug["extern"] = "0";
+                            exec = Path.build_filename (parent, exec);
+                            external = false;
                         }
-                        
-                        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");
+                    
+                    try {
+                        icon = kf.get_string (head, "icon");
                     } catch (Error e) { warning("Couldn't read icon field in file %s, %s", keyfile, e.message); }
+                    
                     try {
-                        plug["title"] = kf.get_locale_string (head, "title");
+                        title = kf.get_locale_string (head, "title");
                         string? textdomain = null;
                         foreach (var domain_key in SUPPORTED_GETTEXT_DOMAINS_KEYS) {
                             if (kf.has_key (head, domain_key)) {
@@ -336,32 +337,34 @@
                             }
                         }
                         if (textdomain != null)
-                            plug["title"] = GLib.dgettext (textdomain, plug["title"]).dup ();
+                            title = GLib.dgettext (textdomain, title).dup ();
                     } catch (Error e) { warning("Couldn't read title field in file %s, %s", keyfile, e.message); }
-                    try { plug["category"] = kf.get_string (head, "category");
-                    } catch {
-                        plug["category"] = "other";
-                    }
-                    category_view.add_plug (plug);
-                    plugs += plug;
+                    
+                    try {
+                        category = kf.get_string (head, "category");
+                    } catch { category = "other"; }
+                    
+                    category_view.add_plug (new Plug (title, exec, external, icon, category, id));
                 }
+                
                 return true;
             }
         }
 
         // Checks if the file is a .plug file
         bool is_plug_file (string filename) {
-            return (filename.down().has_suffix(".plug"));
+            return filename.down ().has_suffix (".plug");
         }
 
         // Find all .plug files
-        List<string> find_plugs (string path, List<string>? keyfiles_list = null) {
+        List<string>? find_plugs (string path, List<string>? keyfiles_list = null) {
+            
             List<string>? keyfiles;
             if(keyfiles_list == null) {
                 keyfiles = new List<string> ();
             } else {
                 keyfiles = new List<string> ();
-                foreach(var keyfile in keyfiles_list) {
+                foreach (var keyfile in keyfiles_list) {
                     keyfiles.append(keyfile);
                 }
             }
@@ -370,18 +373,19 @@
             if (!directory.query_exists ()) {
                 return null;
             }
+            
             try {
                 var enumerator = directory.enumerate_children (
                     FileAttribute.STANDARD_NAME + "," + FileAttribute.STANDARD_TYPE, 0);
                 FileInfo file_info;
+                
                 while ((file_info = enumerator.next_file ()) != null) {
-                    string file_path = Path.build_filename(path, file_info.get_name());
-                    if (file_info.get_file_type() == GLib.FileType.REGULAR && 
-                        is_plug_file(file_info.get_name())) {
-                        keyfiles.append(file_path);
-                    } else if(file_info.get_file_type() == GLib.FileType.DIRECTORY) {
-                        keyfiles = find_plugs(file_path, keyfiles);
-                    }
+                    string file_path = Path.build_filename (path, file_info.get_name ());
+                    
+                    if (file_info.get_file_type() == GLib.FileType.REGULAR && is_plug_file (file_info.get_name()))
+                        keyfiles.append (file_path);
+                    else if(file_info.get_file_type () == GLib.FileType.DIRECTORY)
+                        keyfiles = find_plugs (file_path, keyfiles);
                 }
             } catch { warning(_(@"Unable to iterate over enumerated plug directory \"$path\"'s contents")); }
             
@@ -391,10 +395,12 @@
         // Counts how many plugs exist at the moment
         int count_plugs () {
 
-            uint count = 0;
-            foreach (string place in plug_places)
-                count += find_plugs (place).length ();
-            return (int) count;
+            int count = 0;
+            foreach (var child in category_view.get_children ())
+                if (child is Plug)
+                    count ++;
+            
+            return count;
         }
 
         /*
@@ -463,7 +469,7 @@
             rspace.set_expand(true);
 
             // Progressbar
-            var progress_vbox = new Gtk.VBox (true, 0);
+            var progress_vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
             progress_label = new Gtk.Label ("");
             progress_label.set_use_markup(true);
             progress_bar = new Gtk.ProgressBar ();
@@ -477,18 +483,19 @@
             search_box = new Granite.Widgets.SearchBar (_("Search Settings"));
             search_box.primary_icon_stock = "gtk-find";
             search_box.activate.connect(() => search_box_activated());
+            search_box.margin_right = 6;
             search_box.changed.connect(() => {
                 category_view.filter_plugs(search_box.get_text (), this);
-                search_box_text_changed();
+                search_box_text_changed ();
             });
-            search_box.sensitive = (count_plugs () > 0);
+            
             var find_toolitem = new Gtk.ToolItem ();
-            find_toolitem.add(search_box);
+            find_toolitem.add (search_box);
 
             // Nav button
             navigation_button = new Gtk.ToolButton.from_stock(Gtk.Stock.GO_BACK);
             navigation_button.clicked.connect (handle_navigation_button_clicked);
-            navigation_button.set_sensitive(false);
+            navigation_button.set_sensitive (false);
 
             // Add everything to the toolbar
             toolbar.insert (navigation_button, -1);
@@ -496,7 +503,6 @@
             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 () {}
@@ -516,7 +522,7 @@
         message(_(@"Version: $VERSION"));
         message(_("Report any issues/bugs you mind find to lp:switchboard"));
         
-        Gtk.init (ref args);
+        GtkClutter.init (ref args);
         
         var context = new OptionContext("");
         context.add_main_entries(entries, "switchboard ");

=== modified file 'Switchboard/switchboard-categoryview.vala'
--- Switchboard/switchboard-categoryview.vala	2012-09-22 17:33:26 +0000
+++ Switchboard/switchboard-categoryview.vala	2012-10-02 21:23:23 +0000
@@ -17,152 +17,103 @@
 
 namespace Switchboard {
 
+    public class Plug : Gtk.EventBox {
+        
+        public string title;
+        public string exec;
+        public bool external;
+        public string category;
+        public string id;
+        
+        public signal void selected ();
+        
+        Gtk.Box box;
+        
+        public Plug (string _title, string _exec, bool _extern, string _icon, string _category, string _id)
+        {
+            title = _title;
+            exec = _exec;
+            external = _extern;
+            id = _id;
+            category = _category;
+            
+            margin = 6;
+            
+            Gdk.Pixbuf icon_pixbuf = null;
+            try {
+                icon_pixbuf = Gtk.IconTheme.get_default ().load_icon (_icon, 32, Gtk.IconLookupFlags.GENERIC_FALLBACK);
+            } catch { warning (_("Unable to load plug %s's icon: %s"), title, _icon); }
+
+            var lbl = new Gtk.Label (title);
+            lbl.halign = Gtk.Align.START;
+            lbl.ellipsize = Pango.EllipsizeMode.END;
+            box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+
+            box.pack_start (new Gtk.Image.from_pixbuf (icon_pixbuf), false);
+            box.pack_start (lbl);
+
+            add (box);
+        }
+        
+        public override bool button_press_event (Gdk.EventButton event) {
+            selected ();
+            
+            return false;
+        }
+    }
+
     public class CategoryView : Gtk.Grid {
 
-        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 ();
-
-        public signal void plug_selected (string title, string executable, bool @extern);
+        public signal void plug_selected (string title, string executable, bool external);
+        
         string [] category_ids = { "personal", "hardware", "network", "system" };
         string [] category_names = { N_("Personal"), N_("Hardware"), N_("Network and Wireless"), N_("System") };
+        int [] current_indices = {1, 1, 1, 1};
 
         public CategoryView () {
-            for (int i = 0; i < category_ids.length; i++) {
-                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 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.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);
-                category_label.xalign = (float) 0.02;
-                
-                var grid = new Gtk.Grid ();
-                category_label.use_markup = true;
-                
-                // Always add a Seperator
-                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;
-                
-                attach (grid, 0, i, 1, 1);
+            
+            column_homogeneous = true;
+            margin = 12;
+            
+            for (var i = 0;i < category_names.length; i++) {
+                var lbl = new Gtk.Label ("<b><big>"+category_names[i]+"</big></b>");
+                lbl.halign = Gtk.Align.START;
+                lbl.use_markup = true;
+                attach (lbl, i, 0, 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, 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) {
             
-            var any_found = false;
-            foreach (string category in category_ids) {
-
-                var store = category_store[category];
-                var container = category_labels[category];
-
-                int shown = 0;
-
-                store.foreach((model, path, iter) => {
-                    string title;
-
-                    store.get (iter, 1, out title);
-
-                    if (filter.down () in title.down ()) {
-                        store.set_value (iter, 3, true);
-                        shown ++;
-                    } else {
-                        store.set_value (iter, 3, false);
+        }
+
+        public void add_plug (Plug plug) {
+                string plug_down = plug.category.down ();
+                
+                int column = -1;
+                for (var i=0;i<category_ids.length; i++) {
+                    if (plug_down == category_ids[i]) {
+                        column = i;
+                        break;
                     }
-
-                    return false;
-                });
-                
-                if (shown == 0) {
-                    container.hide ();
-                } else {
-                    any_found = true;
-                    container.show ();
                 }
-            }
-            if (!any_found) {
-                switchboard.show_alert(_("No settings found"), _("Try changing your search terms"), Gtk.MessageType.INFO);
-            } else {
-                switchboard.hide_alert();
-            }
+                
+                if (column == -1)
+                    error (_("Keyfile \"%s\" contains an invalid category: \"%s\", and will not be added"), 
+                        plug.title, plug.category);
+
+                attach (plug, column, current_indices[column], 1, 1);
+                current_indices[column]++;
+
+                plug.selected.connect (() => plug_selected (plug.title, plug.exec, plug.external));
         }
 
-        private void on_selection_changed (Gtk.IconView view, Gtk.TreeModelFilter store) {
-            
-            GLib.Value title;
-            GLib.Value executable;
-            GLib.Value @extern;
-            Gtk.TreeIter selected_plug;
-            
-            var selected = view.get_selected_items ();
-            var item = selected.nth_data(0);
-
-            if (item == null)
-                return;
-
-            store.get_iter (out selected_plug, item);
-            store.get_value (selected_plug, 1, out title);
-            store.get_value (selected_plug, 2, out executable);
-            store.get_value (selected_plug, 4, out @extern);
-
-            plug_selected (title.get_string(), executable.get_string(), @extern.get_string () == "1");
-
-            view.unselect_path (item);
+        public void filter_plugs (string filter, SwitchboardApp switchboard) {         
+            var searching = filter.down ();
+            
+            foreach (var child in get_children ()) {
+                if (!(child is Plug))
+                    continue;
+                
+                child.visible = searching in (child as Plug).title.down ();                
+            }
         }
     }
 }