Merge lp:~julien-spautz/switchboard-plug-startup-applications/new-design into lp:switchboard-plug-startup-applications

[Julien Spautz]

Implemented new design, now using Gtk.Popover and Gtk.ListBox requiring Gtk+ 3.12

Simplified interface by removing the editor pane because it's kind of useless, apps can still be added and removed, custom commands also still work.

[lp:~julien-spautz/switchboard-plug-startup-applications/new-design]

47. By Julien Spautz on 2014-04-05

make label insensitive when app is inactive

48. By Julien Spautz on 2014-04-06

rewrote AppChooser dialog using gtk.listbox

49. By Julien Spautz on 2014-04-06

remove gobject-style construction

50. By Julien Spautz on 2014-04-07

simplify KeyFileFactory and hide popover instead of destroying and recreating every time

=== modified file 'src/Backend/KeyFile.vala'
--- src/Backend/KeyFile.vala	2014-03-22 11:07:44 +0000
+++ src/Backend/KeyFile.vala	2014-04-07 13:03:25 +0000
@@ -18,13 +18,15 @@
 ***/
 
 /**
- * Stores information about an app found in it's .desktop file 
+ * Stores information about an app found in it's .desktop file
  * and allows us to modify it.
+ * http://standards.freedesktop.org/desktop-entry-spec/latest/index.html
  */
 public class Pantheon.Startup.Backend.KeyFile : GLib.Object {
 
     const int ICON_SIZE = 48;
     const string FALLBACK_ICON = "application-default-icon";
+    const string CUSTOM_COMMAND_NAME = _("Custom Command");
     
     const string KEY_NAME = KeyFileDesktop.KEY_NAME;
     const string KEY_COMMAND = KeyFileDesktop.KEY_EXEC;
@@ -33,7 +35,10 @@
     const string KEY_ACTIVE = "X-GNOME-Autostart-enabled";
     const string KEY_TYPE = KeyFileDesktop.KEY_TYPE;
     const string KEY_NO_DISPLAY = KeyFileDesktop.KEY_NO_DISPLAY;
-    
+    const string KEY_HIDDEN = KeyFileDesktop.KEY_HIDDEN;
+    const string KEY_NOT_SHOW_IN = KeyFileDesktop.KEY_NOT_SHOW_IN;
+    const string KEY_ONLY_SHOW_IN = KeyFileDesktop.KEY_ONLY_SHOW_IN;
+
     public string name {
         owned get { return get_key (KEY_NAME); }
         set { set_key (KEY_NAME, value); }
@@ -55,44 +60,54 @@
     }
 
     public bool active {
-        get { return get_key (KEY_ACTIVE) != "false"; }
-        set { set_key (KEY_ACTIVE, value.to_string ()); }
+        get { return get_bool_key (KEY_ACTIVE); }
+        set { set_bool_key (KEY_ACTIVE, value); }
     }
-    
-    public bool dont_show {
-        get { return bool.parse (get_key (KEY_NO_DISPLAY)); }
+
+    public bool show {
+        get {
+            if (get_bool_key (KEY_NO_DISPLAY))
+                return false;
+            if (get_bool_key (KEY_HIDDEN))
+                return false;
+            return show_in_environment ();
+        }
     }
 
     public string path { get; set; }
 
+    public bool is_custom_command {
+        get { return name == CUSTOM_COMMAND_NAME; }
+    }
+
     GLib.KeyFile keyfile;
     static string[] languages;
     static string preferred_language;
-    
+
     static construct {
         languages = Intl.get_language_names ();
         preferred_language = languages [0];
     }
-    
+
     public KeyFile (string path) {
-        GLib.Object (path: path);
+        Object (path: path);
 
         keyfile = new GLib.KeyFile ();
         load_from_file ();
     }
-    
+
     public KeyFile.from_command (string command) {
         keyfile = new GLib.KeyFile ();
-        
+
         this.path = Utils.get_user_startup_dir () + command.split (" ")[0] + ".desktop";
-        this.name = _("Custom Command");
+        this.name = CUSTOM_COMMAND_NAME;
         this.comment = command;
         this.command = command;
         this.icon = FALLBACK_ICON;
         this.active = true;
-        
+
         set_key (KEY_TYPE, "Application");
-        
+
         write_to_file ();
     }
 
@@ -106,7 +121,7 @@
         } catch (Error e) {
             warning (e.message);
         }
-        
+
         message ("-- Saving to %s --", path);
         message ("Name:    %s", name);
         message ("Comment: %s", comment);
@@ -124,31 +139,46 @@
         }
     }
     
+    void set_bool_key (string key, bool value) {
+        var as_string = value ? "true" : "false";
+        keyfile_set_string (key, as_string);
+    }
+    
+    bool get_bool_key (string key) {
+        var as_string = keyfile_get_string (key);
+        return as_string == "true";
+    }
+
     void set_key (string key, string value) {
         if (key_is_localized (key))
             keyfile_set_locale_string (key, value);
         else
             keyfile_set_string (key, value);
     }
-    
+
     string get_key (string key) {
         if (key_is_localized (key))
             return keyfile_get_locale_string (key);
         else
             return keyfile_get_string (key);
     }
-    
+
     bool key_is_localized (string key) {
         switch (key) {
             case KEY_NAME:
             case KEY_COMMENT:
                 return true;
-                
+
             case KEY_COMMAND:
             case KEY_ICON:
             case KEY_ACTIVE:
+            case KEY_NO_DISPLAY:
+            case KEY_TYPE:
+            case KEY_ONLY_SHOW_IN:
+            case KEY_NOT_SHOW_IN:
+            case KEY_HIDDEN:
                 return false;
-            
+
             default:
                 warn_if_reached ();
                 return false;
@@ -166,9 +196,7 @@
     string keyfile_get_string (string key) {
         try {
             return keyfile.get_string (KeyFileDesktop.GROUP, key);
-        } catch (KeyFileError e) {
-            warning (e.message);
-        }
+        } catch (KeyFileError e) { }
 
         return "";
     }
@@ -177,28 +205,51 @@
         foreach (string lang in languages) {
             try {
                 return keyfile.get_locale_string (KeyFileDesktop.GROUP, key, lang);
-            } catch (KeyFileError e) {
-                warning (e.message);
-            }
+            } catch (KeyFileError e) { }
         }
 
         return "";
     }
-    
+
+    bool show_in_environment () {
+        var only_show_in = get_key (KEY_ONLY_SHOW_IN);
+        var not_show_in = get_key (KEY_NOT_SHOW_IN);
+
+        var session = Environment.get_variable ("DESKTOP_SESSION");
+
+        if (session in only_show_in)
+            return true;
+        if (session in not_show_in)
+            return false;
+
+        if (only_show_in == "")
+            return true;
+        return false;
+    }
+
     public void copy_to_local () {
         path = Utils.get_user_startup_dir () + name.down ().split (" ")[0] + ".desktop";
         write_to_file ();
     }
-    
+
     public string create_markup () {
-        var markup = @"<span font_weight=\"bold\" size=\"large\">$name</span>\n$comment";
+        var escaped_name = Markup.escape_text (name);
+        var escaped_comment = Markup.escape_text (comment);
+        var escaped_command = Markup.escape_text (command);
+        string markup;
+        
+        if (is_custom_command)
+            markup = escaped_command;
+        else
+            markup = @"<span font_weight=\"bold\" size=\"large\">$escaped_name</span>\n$escaped_comment";
+
         return markup;
     }
-    
+
     public Gdk.Pixbuf create_icon (int size = ICON_SIZE) {
         var icon_theme = Gtk.IconTheme.get_default ();
         var lookup_flags = Gtk.IconLookupFlags.GENERIC_FALLBACK;
-        
+
         try {
             if (icon_theme.has_icon (icon))
                 return icon_theme.load_icon (icon, size, lookup_flags);
@@ -207,7 +258,7 @@
         } catch (Error e) {
             warning (e.message);
         }
-        
+
         return (Gdk.Pixbuf) null;
     }
 }
\ No newline at end of file

=== modified file 'src/Backend/KeyFileFactory.vala'
--- src/Backend/KeyFileFactory.vala	2014-03-22 11:07:44 +0000
+++ src/Backend/KeyFileFactory.vala	2014-04-07 13:03:25 +0000
@@ -24,29 +24,10 @@
     public static void init () {
         cache = new Gee.HashMap <string, KeyFile> ();
     }
-
+    
     public static KeyFile get_or_create (string path) {
-        if (key_file_is_cached (path))
-            return get_key_file_from_path (path);
-        else
-            return create_key_file_from_path (path);
-    }
-
-    static KeyFile get_key_file_from_path (string path)
-        requires (key_file_is_cached (path)) {
-        return cache[path];
-    }
-
-    static KeyFile create_key_file_from_path (string path)
-        requires (key_file_is_cached (path) == false)
-        ensures (key_file_is_cached (path)) {
-
-        var key_file = new KeyFile (path);
-        cache.set (path, key_file);
-        return key_file;
-    }
-
-    static bool key_file_is_cached (string path) {
-        return cache.has_key (path);
+        if (cache [path] == null) {
+            cache [path] = new KeyFile (path);
+        return cache [path];
     }
 }
\ No newline at end of file

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-03-22 11:07:44 +0000
+++ src/CMakeLists.txt	2014-04-07 13:03:25 +0000
@@ -1,7 +1,12 @@
 find_package (PkgConfig)
 
 # Add all your dependencies to the list below
-pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 switchboard-2.0 granite)
+pkg_check_modules (DEPS REQUIRED
+    gthread-2.0
+    gtk+-3.0>=3.12
+    switchboard-2.0
+    granite
+)
 
 add_definitions (${DEPS_CFLAGS})
 link_libraries (${DEPS_LIBRARIES})
@@ -16,25 +21,18 @@
 vala_precompile (VALA_C
     Plug.vala
     Utils.vala
-    
     Backend/KeyFile.vala
     Backend/KeyFileFactory.vala
     Backend/DesktopFileEnumerator.vala
-    
     Widgets/List.vala
-    Widgets/Editor.vala
-    Widgets/Toolbar.vala
-    
     Dialogs/AppChooser.vala
-    
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     switchboard-2.0
     granite
 OPTIONS
     --thread
-    --enable-experimental
-    #--fatal-warnings
+    --fatal-warnings
     --verbose
 )
 

=== modified file 'src/Dialogs/AppChooser.vala'
--- src/Dialogs/AppChooser.vala	2014-03-22 11:07:44 +0000
+++ src/Dialogs/AppChooser.vala	2014-04-07 13:03:25 +0000
@@ -1,204 +1,158 @@
 /***
-    Copyright (C) 2013 Michael Langfermann
-                  2013 Julien Spautz <[e-mail]>
-  
+    Copyright (C) 2013 Julien Spautz <[e-mail]>
+
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
-  
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
-  
+
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-public class Pantheon.Startup.Dialogs.AppChooser : Granite.Widgets.PopOver {
-
-    private Gtk.ListStore list_store;
-    private Gtk.TreeModelSort list_sort;
-    private Gtk.TreeModelFilter list_filter;
-    private Gtk.TreeView list;
-    private Gtk.Widget apply_button;
-    private Granite.Widgets.SearchBar search;
-    private Gtk.ScrolledWindow scroll;
-    private Gtk.CellRendererText cell;
-    private Gtk.Entry command;
-
-    private string search_text = "";
-
-    public AppInfo selected_app;
-
-    public signal void app_chosen (Backend.KeyFile key_file);
-    public signal void app_selected ();
-
-    public AppChooser () {
-        setup_gui ();
-        list_update ();
-        connect_signals ();
-    }
-
-    private void setup_gui () {
-        title = _("Choose an Application...");
-        border_width = 5;
-        
-        list_store = new Gtk.ListStore (3,
-                                        typeof (string),
-                                        typeof (Gdk.Pixbuf),
-                                        typeof (Backend.KeyFile));
-
-        list_filter = new Gtk.TreeModelFilter (list_store, null);
-        list_filter.set_visible_func (filter_func);
-
-        list_sort = new Gtk.TreeModelSort.with_model (list_filter);
-        list_sort.set_sort_column_id (0, Gtk.SortType.ASCENDING);
-
-        list = new Gtk.TreeView.with_model (list_sort);
-        list.expand = true;
-        list.enable_search = false;
-        list.headers_visible = false;
-
-        Gtk.CellRendererPixbuf pixbuf = new Gtk.CellRendererPixbuf ();
-        list.insert_column_with_attributes (-1, null, pixbuf, "pixbuf", 1);
-
-        cell = new Gtk.CellRendererText ();
-        cell.wrap_mode = Pango.WrapMode.WORD_CHAR;
-        list.insert_column_with_attributes (-1, null, cell, "markup", 0);
-
-        search = new Granite.Widgets.SearchBar (_("Search Applications..."));
-
-        scroll = new Gtk.ScrolledWindow (null, null);
-        scroll.hscrollbar_policy = Gtk.PolicyType.NEVER;
-        scroll.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
-        scroll.shadow_type = Gtk.ShadowType.IN;
-        scroll.expand = true;
-        scroll.height_request = 250;
-        scroll.width_request = 150;
-        scroll.add (list);
-
-        Gtk.Box content = get_content_area () as Gtk.Box;
-        content.pack_start (search, false, true, 0);
-        content.pack_start (scroll, false, true, 0);
-
-        command = new Gtk.Entry();
-        command.placeholder_text = _("Type in a custom command");
-        command.primary_icon_name = "document-properties-symbolic";
-        command.primary_icon_activatable = false;
-        content.pack_start (command, false, true, 0);
-
-        content.spacing = 10;
-
-        add_button (Gtk.Stock.CANCEL, Gtk.ResponseType.CLOSE);
-        apply_button = add_button (Gtk.Stock.ADD, Gtk.ResponseType.APPLY);
-        apply_button.sensitive = false;
-    }
-
-    void list_update () {
-        var enumerator = new Backend.DesktopFileEnumerator ("/usr/share/applications/");
-        var names = enumerator.get_desktop_files ();
-        
-        foreach (var file in names) {
-            var key_file = new Backend.KeyFile (file);
-            append_item_from_keyfile (key_file);
-        }
-    }
-    
-    void append_item_from_keyfile (Backend.KeyFile key_file) {
-        if (key_file.dont_show)
-            return;
-            
-        Gtk.TreeIter iter;
-        list_store.append (out iter);
-        list_store.set (iter, 0, key_file.name,
-                              1, key_file.create_icon (32),
-                              2, key_file);
-    }
-
-    void connect_signals () {
-        command.icon_press.connect (() => command.text = "");
-
-        command.changed.connect (() => {
-            var is_empty = (command.text == "");
-
-            scroll.sensitive = is_empty;
-            search.sensitive = is_empty;
-            command.secondary_icon_sensitive = !is_empty;
-            apply_button.sensitive = !is_empty;
-            
-            if (is_empty) {
-                command.secondary_icon_name = null;
-                list_update ();
-            } else {
-                list_store.clear ();
-                command.secondary_icon_name = "edit-clear-symbolic";
+namespace Pantheon.Startup.Dialogs {
+
+    public class AppRow : Gtk.Box {
+
+        public Backend.KeyFile app { get; construct; }
+
+        public signal void deleted ();
+
+        public AppRow (Backend.KeyFile app) {
+            Object (app: app);
+            setup ();
+        }
+
+        void setup () {
+            orientation = Gtk.Orientation.HORIZONTAL;
+
+            var markup = app.create_markup ();
+            var icon = app.create_icon (32);
+
+            margin = 6;
+            spacing = 12;
+
+            var image = new Gtk.Image.from_pixbuf (icon);
+            add (image);
+
+            var label = new Gtk.Label (markup);
+            label.use_markup = true;
+            label.halign = Gtk.Align.START;
+            label.ellipsize = Pango.EllipsizeMode.END;
+            add (label);
+
+            show_all ();
+        }
+    }
+
+    public class AppChooser : Gtk.Popover {
+
+        Gtk.ListBox list;
+        Granite.Widgets.SearchBar search_bar;
+        Gtk.Entry custom_bar;
+
+        public signal void app_chosen (Backend.KeyFile key_file);
+
+        public AppChooser (Gtk.Widget widget) {
+            Object (relative_to: widget);
+            setup_gui ();
+            connect_signals ();
+        }
+
+        void setup_gui () {
+            var grid = new Gtk.Grid ();
+            grid.margin = 12;
+            grid.row_spacing = 6;
+
+            search_bar = new Granite.Widgets.SearchBar (_("Search Applications"));
+
+            var scrolled = new Gtk.ScrolledWindow (null, null);
+            scrolled.height_request = 200;
+            scrolled.width_request = 250;
+            scrolled.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
+            scrolled.shadow_type = Gtk.ShadowType.IN;
+
+            list = new Gtk.ListBox ();
+            list.expand = true;
+            list.height_request = 200;
+            list.width_request = 150;
+            list.set_sort_func (sort_function);
+            list.set_filter_func (filter_function);
+            scrolled.add (list);
+
+            custom_bar = new Gtk.Entry();
+            custom_bar.placeholder_text = _("Type in a custom command");
+            custom_bar.primary_icon_name = "document-properties-symbolic";
+            custom_bar.primary_icon_activatable = false;
+
+            grid.attach (search_bar, 0, 0, 1, 1);
+            grid.attach (scrolled, 0, 1, 1, 1);
+            grid.attach (custom_bar, 0, 2, 1, 1);
+
+            add (grid);
+
+            list_update ();
+        }
+
+        void list_update () {
+            var enumerator = new Backend.DesktopFileEnumerator ("/usr/share/applications/");
+            var paths = enumerator.get_desktop_files ();
+
+            foreach (var path in paths) {
+                var key_file = Backend.KeyFileFactory.get_or_create (path);
+                if (key_file.show)
+                    append_item_from_keyfile (key_file);
             }
-        });
-
-        list.cursor_changed.connect (() => command.activate ());
-        response.connect (on_response);
-
-        command.activate.connect (() => {
-            app_chosen(get_app());
-            destroy ();
-        });
-
-        search.text_changed_pause.connect ((text) => {
-            search_text = text;
-            list_filter.refilter ();
-        });
-
-        size_allocate.connect ((allocation) =>
-                               cell.wrap_width = allocation.width - (allocation.width / 3));
-    }
-
-    private void on_response (Gtk.Dialog source, int response_id) {
-        if (response_id == Gtk.ResponseType.APPLY) {
-            app_chosen (get_app());
-        }
-        
-        destroy ();
-    }
-
-    private Backend.KeyFile get_app () {
-        Gtk.TreeIter iter;
-        Gtk.TreePath path;
-        Backend.KeyFile app = null;
-
-        list.get_cursor (out path, null);
-        if (path != null) {
-            path = list_sort.convert_path_to_child_path (path);
-            path = list_filter.convert_path_to_child_path (path);
-            list_store.get_iter (out iter, path);
-            list_store.get (iter, 2, out app);
-            app.copy_to_local ();
-            app.active = true;
-            return app;
-        } else if (command.text != "" && command.text != null) {
-            return create_command ();
-        }
-        
-        return (Backend.KeyFile) null;
-    }
-
-    private bool filter_func (Gtk.TreeModel model, Gtk.TreeIter iter) {
-        Backend.KeyFile key_file;
-        string name;
-
-        list_store.get (iter, 2, out key_file);
-        name = key_file.name + key_file.comment;
-
-        if (search_text == "")
-            return true;
-        else if (name != null)
-            return name.up ().contains (search_text.up ());
-        else
-            return false;
-    }
-
-    private Backend.KeyFile create_command () {
-        return new Backend.KeyFile.from_command (command.text);
+        }
+
+        void append_item_from_keyfile (Backend.KeyFile key_file) {
+            var app_row = new AppRow (key_file);
+            list.prepend (app_row);
+        }
+
+        int sort_function (Gtk.ListBoxRow list_box_row_1,
+                           Gtk.ListBoxRow list_box_row_2) {
+            var row_1 = list_box_row_1.get_child () as AppRow;
+            var row_2 = list_box_row_2.get_child () as AppRow;
+
+            var name_1 = row_1.app.name;
+            var name_2 = row_2.app.name;
+
+            return name_1.collate (name_2);
+        }
+
+        bool filter_function (Gtk.ListBoxRow list_box_row) {
+            var app_row = list_box_row.get_child () as AppRow;
+            return search_bar.text.down () in app_row.app.name.down ();
+        }
+
+        void connect_signals () {
+            list.row_activated.connect (on_app_selected);
+            search_bar.text_changed_pause.connect (apply_filter);
+            custom_bar.activate.connect (on_custom_command_entered);
+        }
+
+        void on_app_selected (Gtk.ListBoxRow list_box_row) {
+            var app_row = list_box_row.get_child () as AppRow;
+            app_row.app.copy_to_local ();
+            app_row.app.active = true;
+            app_chosen (app_row.app);
+            hide ();
+        }
+        
+        void apply_filter () {
+            list.set_filter_func (filter_function);
+        }
+
+        void on_custom_command_entered () {
+            var app = new Backend.KeyFile.from_command (custom_bar.text);
+            app_chosen (app);
+            hide ();
+        }
     }
 }
\ No newline at end of file

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2014-03-22 11:07:44 +0000
+++ src/Plug.vala	2014-04-07 13:03:25 +0000
@@ -19,67 +19,44 @@
 
 public Switchboard.Plug get_plug (Module module) {
     debug ("Activating Startup Apps plug");
-    var plug = new Pantheon.Startup.Plug ();
-    return plug;
+    return new Pantheon.Startup.Plug ();
 }
 
 public class Pantheon.Startup.Plug : Switchboard.Plug {
 
-    Widgets.List list;
-    Widgets.Editor editor;
-    Granite.Widgets.ThinPaned paned = null;
-    
+    Gtk.ScrolledWindow scrolled;
+
     public Plug () {
         Object (category: Category.PERSONAL,
                 code_name: "personal-pantheon-startup",
                 display_name: _("Startup Apps"),
                 description: _("Shows Startup Applications Settings…"),
                 icon: "preferences-system-session");
-        
+
         Backend.KeyFileFactory.init ();
     }
 
     public override Gtk.Widget get_widget () {
-        if (paned == null) {
-            setup_gui ();
-            connect_signals ();
-            initialize_state ();
+        if (scrolled == null) {
+            scrolled = new Gtk.ScrolledWindow (null, null);
+            var list = new Widgets.List ();
+            scrolled.add (list);
         }
         
-        return paned;
+        return scrolled;
     }
-    
+
     public override void shown () {
+        scrolled.show_all ();
     }
-    
+
     public override void hidden () {
     }
 
     public override void search_callback (string location) {
     }
 
-    public override async Gee.TreeMap<string, string> search (string search) {
-        return new Gee.TreeMap<string, string> (null, null);
-    }
-
-    void setup_gui () {
-        this.list = new Widgets.List ();
-        this.editor = new Widgets.Editor ();
-
-        paned = new Granite.Widgets.ThinPaned ();
-        paned.pack1 (list, false, false);
-        paned.pack2 (editor, false, false);
-        
-        paned.show_all ();
-    }
-
-    void connect_signals () {
-        list.selected.connect ((key_file) => {
-            editor.load_key_file (key_file);
-        });
-    }
-
-    void initialize_state () {
-        list.select_first_item ();
+    public override async Gee.TreeMap <string, string> search (string search) {
+        return new Gee.TreeMap <string, string> (null, null);
     }
 }
\ No newline at end of file

=== removed file 'src/Widgets/Editor.vala'
--- src/Widgets/Editor.vala	2014-03-22 11:07:44 +0000
+++ src/Widgets/Editor.vala	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-/***
-    Copyright (C) 2013 Julien Spautz <[e-mail]>
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-public class Pantheon.Startup.Widgets.Editor : Gtk.Grid {
-
-    public string icon { get; set; }
-
-    public new string name {
-        get { return name_entry.text; }
-        set { name_entry.text = value; }
-    }
-
-    public string comment {
-        get { return comment_entry.text; }
-        set { comment_entry.text = value; }
-    }
-
-    public string command {
-        get { return command_entry.text; }
-        set { command_entry.text = value; }
-    }
-    
-    public bool revive {
-        get; set;
-    }
-    
-    Backend.KeyFile key_file;
-    
-    Gtk.Entry name_entry;
-    Gtk.Entry comment_entry;
-    Gtk.Entry command_entry;
-    
-    public Editor () {
-        var name_label = new Gtk.Label (_("Name:"));
-        name_label.halign = Gtk.Align.END;
-        name_entry = new Gtk.Entry ();
-        name_entry.placeholder_text = _("Application name");
-        name_entry.width_request = 300;
-        name_entry.valign = Gtk.Align.END;
-        
-        var comment_label = new Gtk.Label (_("Description:"));
-        comment_label.halign = Gtk.Align.END;
-        comment_entry = new Gtk.Entry ();
-        comment_entry.placeholder_text = _("Short description");
-
-        var command_label = new Gtk.Label (_("Command:"));
-        command_label.halign = Gtk.Align.END;
-        command_entry = new Gtk.Entry ();
-        command_entry.placeholder_text = _("Command to execute");
-        
-        this.attach (name_label, 0, 0, 1, 1);
-        this.attach (name_entry, 1, 0, 1, 1);
-        this.attach (comment_label, 0, 1, 1, 1);
-        this.attach (comment_entry, 1, 1, 1, 1);
-        this.attach (command_label, 0, 2, 1, 1);
-        this.attach (command_entry, 1, 2, 1, 1);
-        
-        row_spacing = 6;
-        column_spacing = 6;
-        margin = 12;
-        halign = Gtk.Align.CENTER;
-        
-        name_entry.notify["text"].connect (() => {
-            key_file.name = name_entry.text;
-            key_file.write_to_file ();
-        });
-        
-        comment_entry.notify["text"].connect (() => {
-            key_file.comment = comment_entry.text;
-            key_file.write_to_file ();
-        });
-        
-        command_entry.notify["text"].connect (() => {
-            key_file.command = command_entry.text;
-            key_file.write_to_file ();
-        });
-    }
-    
-    public void load_key_file (Backend.KeyFile key_file) {
-        this.key_file = key_file;
-
-        name_entry.text = key_file.name;
-        comment_entry.text = key_file.comment;
-        command_entry.text = key_file.command;
-    }
-}
\ No newline at end of file

=== modified file 'src/Widgets/List.vala'
--- src/Widgets/List.vala	2014-03-22 11:07:44 +0000
+++ src/Widgets/List.vala	2014-04-07 13:03:25 +0000
@@ -17,187 +17,192 @@
     Boston, MA 02110-1301 USA.
 ***/
 
-class Pantheon.Startup.Widgets.List : Gtk.Grid {
-
-    private Gtk.ListStore list_store;
-    private Gtk.TreeModelSort sorted_list;
-    private Gtk.TreeView list;
-    private Widgets.Toolbar toolbar;
-    private Gtk.ScrolledWindow scroll;
-    private Gtk.CellRendererToggle toggle;
-
+class Pantheon.Startup.Widgets.AppRow : Gtk.Box {
+
+    Gtk.Button delete_button;
+    Gtk.Label label;
+    Gtk.Switch active_switch;
+    Gtk.Image image;
+    
+    public Backend.KeyFile app { get; construct; }
+
+    public signal void deleted ();
+
+    public AppRow (Backend.KeyFile app) {
+        Object (app: app);
+        setup ();
+        connect_signals ();
+        on_active_changed ();
+    }
+
+    void setup () {
+        orientation = Gtk.Orientation.HORIZONTAL;
+
+        var markup = app.create_markup ();
+        var icon = app.create_icon ();
+
+        margin = 6;
+        spacing = 12;
+
+        active_switch = new Gtk.Switch ();
+        active_switch.active = app.active;
+        add (active_switch);
+
+        image = new Gtk.Image.from_pixbuf (icon);
+        add (image);
+
+        label = new Gtk.Label (markup);
+        label.expand = true;
+        label.use_markup = true;
+        label.halign = Gtk.Align.START;
+        label.ellipsize = Pango.EllipsizeMode.END;
+        label.sensitive = app.active;
+        add (label);
+
+        delete_button = new Gtk.Button.with_label (_("Delete"));
+        delete_button.get_style_context ().add_class ("destructive-action");
+        delete_button.no_show_all = true;
+        delete_button.vexpand = false;
+        var button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+        button_box.add (delete_button);
+        add (button_box);
+
+        show_all ();
+    }
+
+    void connect_signals () {
+        delete_button.clicked.connect (on_delete_clicked);
+        active_switch.notify["active"].connect (on_active_changed);
+    }
+
+    void on_delete_clicked () {
+        app.delete_file ();
+        deleted ();
+    }
+
+    void on_active_changed () {
+        var active = active_switch.active;
+        label.sensitive = active;
+        app.active = active;
+        app.write_to_file ();
+    }
+
+    public void show_delete (bool show) {
+        delete_button.no_show_all = !show;
+        delete_button.visible = show;
+    }
+}
+
+class Pantheon.Startup.Widgets.NewAppRow : Gtk.Box {
+
+    public signal void app_added (Backend.KeyFile app);
+
+    public NewAppRow () {
+        orientation = Gtk.Orientation.HORIZONTAL;
+
+        margin = 6;
+        spacing = 12;
+
+        var sw = new Gtk.Switch ();
+        sw.opacity = 0.0;
+        add (sw);
+
+        var add_button = new Gtk.Button.from_icon_name ("add", Gtk.IconSize.DIALOG);
+        add_button.relief = Gtk.ReliefStyle.NONE;
+        add (add_button);
+
+        var label = new Gtk.Label ("<i>" + _("Add Startup App") + "</i>");
+        label.expand = true;
+        label.use_markup = true;
+        label.halign = Gtk.Align.START;
+        label.ellipsize = Pango.EllipsizeMode.END;
+        add (label);
+
+        var app_chooser = new Dialogs.AppChooser (add_button);
+        app_chooser.modal = true;
+    
+        app_chooser.app_chosen.connect ((key_file) => {
+            app_added (key_file);
+        });
+        
+        add_button.clicked.connect (app_chooser.show_all);
+    }
+}
+
+class Pantheon.Startup.Widgets.List : Gtk.ListBox {
+
+    NewAppRow new_app_row;
+    
+    public string search_string { get; set; }
+    
     public signal void selected (Backend.KeyFile app);
 
-    enum Column {
-        ACTIVE,
-        ICON,
-        TEXT,
-        APP,
-        COUNT
-    }
-
     public List () {
-        setup_scrolled ();
-        setup_toolbar ();
-
-        attach (scroll, 0, 0, 1, 1);
-        attach (toolbar, 0, 1, 1, 1);
-
-        setup_signals ();
-        
-        load_apps ();
-    }
-
-    void setup_scrolled () {
-        list_store = new Gtk.ListStore (Column.COUNT,
-            typeof (bool),
-            typeof (Gdk.Pixbuf),
-            typeof (string),
-            typeof (Backend.KeyFile)
-        );
-
-        sorted_list = new Gtk.TreeModelSort.with_model (list_store);
-        sorted_list.set_sort_column_id (Column.TEXT, Gtk.SortType.ASCENDING);
-
-        list = new Gtk.TreeView.with_model (sorted_list);
-        
-        toggle = new Gtk.CellRendererToggle ();
-        list.insert_column_with_attributes (-1, null, toggle, "active", Column.ACTIVE);
-
-        var pixbuf = new Gtk.CellRendererPixbuf ();
-        list.insert_column_with_attributes (-1, null, pixbuf, "pixbuf", Column.ICON);
-        
-        var cell = new Gtk.CellRendererText ();
-        list.insert_column_with_attributes (-1, null, cell, "markup", Column.TEXT);
-
-        list.expand = true;
-        list.enable_search = false;
-        list.headers_visible = false;
-
-        scroll = new Gtk.ScrolledWindow (null, null);
-        scroll.width_request = 300;
-        scroll.add (list);
-    }
-
-    void setup_toolbar () {
-        toolbar = new Widgets.Toolbar ();
-    }
-    
-    void setup_signals () {
-        list.cursor_changed.connect (() => {
-            Gtk.TreeIter iter;
-            Gtk.TreePath tree_path;
-            GLib.Value app;
-
-            list.get_cursor (out tree_path, null);
-            list.model.get_iter (out iter, tree_path);
-            list.model.get_value (iter, Column.APP, out app);
-
-            selected (app as Backend.KeyFile);
-        });
-        
-        toggle.toggled.connect ((toggle, tree_path_string) => {
-            GLib.Value app;
-            
-            Gtk.TreePath tree_path = new Gtk.TreePath.from_string (tree_path_string);
-            list.set_cursor (tree_path, null, false);
-            Gtk.TreeIter iter;
-            tree_path = sorted_list.convert_path_to_child_path (tree_path);
-            
-            list_store.get_iter (out iter, tree_path);
-            list_store.set (iter, Column.ACTIVE, !toggle.active);
-            list_store.get_value (iter, Column.APP, out app);
-            
-            (app as Backend.KeyFile).active = toggle.active;
-            (app as Backend.KeyFile).write_to_file ();
-        });
-        
-        toolbar.clicked_remove_button.connect (() => {
-            remove_current_app ();
-        });
-        
-        toolbar.clicked_add_button.connect ((key_file) => {
-            add_app (key_file.path);
-        });
-    }
-    
-    void load_apps () {
-        foreach (var file in get_auto_start_files ())
-            add_app (file);
-    }
-    
+        setup_gui ();
+        connect_signals ();
+    }
+
+    void setup_gui () {
+        load_startup_apps ();
+        add_new_app_row ();
+    }
+
+    void connect_signals () {
+        row_selected.connect (show_delete_button_on_select);
+        set_sort_func (sort_function);
+        new_app_row.app_added.connect (add_app);
+    }
+
+    void load_startup_apps () {
+        foreach (var path in get_auto_start_files ()) {
+            var app = Backend.KeyFileFactory.get_or_create (path);
+            add_app (app);
+        }
+    }
+
+    void add_new_app_row () {
+        new_app_row = new NewAppRow ();
+        prepend (new_app_row);
+    }
+
+    void show_delete_button_on_select (Gtk.ListBoxRow? selected_list_box_row) {
+        this.foreach ((row) => {
+            var list_box_row = row as Gtk.ListBoxRow;
+            var app_row = list_box_row.get_child () as AppRow;
+            if (app_row != null)
+                app_row.show_delete (false);
+        });
+
+        if (selected_list_box_row != null) {
+            var selected_app_row = selected_list_box_row.get_child () as AppRow;
+            selected_app_row.show_delete (true);
+        }
+    }
+
+    int sort_function (Gtk.ListBoxRow list_box_row_1,
+                       Gtk.ListBoxRow list_box_row_2) {
+        var row_1 = list_box_row_1.get_child ();
+        var row_2 = list_box_row_2.get_child ();
+
+        if (row_1 is NewAppRow)
+            return 1;
+        if (row_2 is NewAppRow)
+            return -1;
+
+        var name_1 = (row_1 as AppRow).app.name;
+        var name_2 = (row_2 as AppRow).app.name;
+        return name_1.collate (name_2);
+    }
+
     string[] get_auto_start_files () {
         var startup_dir = Utils.get_user_startup_dir ();
         var enumerator = new Backend.DesktopFileEnumerator (startup_dir);
         return enumerator.get_desktop_files ();
     }
-    
-
-    public void select_first_item () {
-        var path = new Gtk.TreePath.from_indices (0);
-        list.set_cursor (path, null, false);
-    }
-
-    public void remove_current_app () {
-        Gtk.TreeIter iter;
-        Gtk.TreePath path;
-        GLib.Value app;
-            
-        list.get_cursor (out path, null);
-        path = sorted_list.convert_path_to_child_path (path);
-        
-        list_store.get_iter (out iter, path);
-        list_store.get_value (iter, Column.APP, out app);
-        (app as Backend.KeyFile).delete_file (); 
-        
-        list_store.remove (iter);
-    }
-    
-    public void add_app (string path) {
-        Gtk.TreeIter iter;
-
-        var app = Backend.KeyFileFactory.get_or_create (path);
-        var markup = app.create_markup ();
-        var icon = app.create_icon ();
-            
-        list_store.append (out iter);
-        list_store.set (iter,
-            Column.ACTIVE, app.active,
-            Column.ICON, icon,
-            Column.TEXT, markup,
-            Column.APP, app
-        );
-
-        app.notify["name"].connect (() => {
-            update_list_item (iter, path);
-        });
-
-        app.notify["comment"].connect (() => {
-            update_list_item (iter, path);
-        });
-
-        app.notify["command"].connect (() => {
-            update_list_item (iter, path);
-        });
-    }
-    
-    void update_list_item (Gtk.TreeIter iter, string path) {
-        var app = Backend.KeyFileFactory.get_or_create (path);
-        var markup = app.create_markup ();
-        var icon = app.create_icon ();
-        
-        list_store.set (iter,
-            Column.ACTIVE, app.active,
-            Column.ICON, icon,
-            Column.TEXT, markup,
-            Column.APP, app
-        );
-    }
-    
-    /*Gtk.TreeIter get_iter_from_index (int index) {
-        Gtk.TreeIter iter;
-        var path = new Gtk.TreePath.from_indices (0);
-        list_store.get_iter (out iter, path);
-        return iter;
-    }*/
+
+    public void add_app (Backend.KeyFile app) {
+        var row = new AppRow (app);
+        prepend (row);
+        row.deleted.connect (() => remove (row.parent));
+    }
 }
\ No newline at end of file

=== removed file 'src/Widgets/Toolbar.vala'
--- src/Widgets/Toolbar.vala	2014-03-22 11:07:44 +0000
+++ src/Widgets/Toolbar.vala	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/***
-    Copyright (C) 2013 Julien Spautz <[e-mail]>
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-class Pantheon.Startup.Widgets.Toolbar : Gtk.Toolbar {
-
-    public signal void clicked_add_button (Backend.KeyFile key_file);
-    public signal void clicked_remove_button ();
-
-    public Toolbar () {
-        set_style (Gtk.ToolbarStyle.ICONS);
-        set_icon_size (Gtk.IconSize.SMALL_TOOLBAR);
-        set_show_arrow (false);
-        get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
-        get_style_context ().set_junction_sides (Gtk.JunctionSides.TOP);
-
-        var add_button = new Gtk.ToolButton (null, _("Add..."));
-        var remove_button = new Gtk.ToolButton (null, _("Remove"));
-
-        add_button.set_icon_name ("list-add-symbolic");
-        remove_button.set_icon_name ("list-remove-symbolic");
-
-        add_button.set_tooltip_text (_("Add..."));
-        remove_button.set_tooltip_text (_("Remove"));
-
-        insert (add_button, -1);
-        insert (remove_button, -1);
-
-        add_button.clicked.connect (() => {
-            var app_chooser = new Dialogs.AppChooser ();
-            app_chooser.modal = true;
-
-            app_chooser.app_chosen.connect ((key_file) => {
-                clicked_add_button (key_file);
-            });
-
-            app_chooser.move_to_widget (add_button);
-            app_chooser.show_all ();
-            app_chooser.present ();
-            app_chooser.run ();
-            app_chooser.destroy ();
-        });
-
-        remove_button.clicked.connect (() => clicked_remove_button ());
-    }
-}
\ No newline at end of file