Merge lp:~julien-spautz/switchboard-plug-keyboard/custom-shortcuts into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk

[Cody Garver]

Now open for review.

Implemented custom shortcuts into the keyboard plug. I'm using dconf/gsettings instead of gconf (unlike elementary tweaks) since the gconf version doesn't seem to work on isis, also it's deprecated.

Custom shortcuts can be added/removed/edited, the UI is a little different from the original ubuntu settings to avoid using unnecessary dialogs. I hope it's still intuitive.

If the schema for custom shortcuts doesn't exist, the section will not be shown at all.

Conflicting shortcuts are handled like before, asking the user whether he wants to reassign the shortcut.

NOTE that changes to custom shortcuts will, for some reason, not be applied immediately but you'll have to log out and in again, reboot or restart gnome-settings-daemon. This is not necessary with ubuntu's system settings, but I haven't yet figured out how to fix this.

[lp:~julien-spautz/switchboard-plug-keyboard/custom-shortcuts]

136. By Julien Spautz on 2014-03-26

small refactor: using DisplayTree instead of GtkTree to avoid casting

137. By Julien Spautz on 2014-03-26

remove some unused code

138. By Julien Spautz on 2014-03-29

fixed failing assertions on clearing shortcuts

[David Gomes (davidgomes)]

Code style wise this can't really pass for now. You added a new file that is tab-indented (conflict_dialog.vala). (and I realize you did it to keep consistency with existing files in the project, but new code should *usually* be good code).

Also diff lines 727-735 you mixed tabs and spaces.

I can't yet review the code itself, give me a couple of days. I'll test it in the meanwhile too.

review: Needs Fixing

[lp:~julien-spautz/switchboard-plug-keyboard/custom-shortcuts]

139. By Julien Spautz on 2014-03-30

fix inconsistent whitespace

[Julien Spautz (julien-spautz)]

Completely forgot about the whitespace... Following files should now follow elementary's coding guidelines, all other files should still be internally consistent:

src/Pages/Shortcuts/conflict_dialog.vala
src/Pages/Shortcuts/custom_shortcut_settings.vala
src/Pages/Shortcuts/custom_tree.vala
src/Pages/Shortcuts/display_tree.vala
src/Pages/Shortcuts/tree.vala

(The four first files are new, the last one isn't, but I had to change a lot of code in that one so I converted it to elementary code)

[lp:~julien-spautz/switchboard-plug-keyboard/custom-shortcuts]

140. By Julien Spautz on 2014-03-30

fixed small inconsistency in whitespace

[David Gomes (davidgomes)]

I can't seem to build this. First I got:

`
/usr/bin/msgfmt: error while opening "/home/david/src/switchboard-plug-keyboard/switchboard-plug-keyboard/build/po/el.mo" for writing: Permission denied
`

So I ran it with root privileges and got: http://paste.debian.net/91497/

[Julien Spautz (julien-spautz)]

built it on freya beta 1 and it works for me, can someone test it again?

[Danielle Foré (danrabbit)]

Shortcuts don't seem to apply until I log out and log back in. Is there any way to make these apply immediately? (restart/update whatever service is responsible for watching for shortcuts?)

If not, we should at least show an infobar stating that you'll need to log out or restart for the changes to take effect.

review: Needs Fixing

[Danielle Foré (danrabbit)]

The "-" button shouldn't be sensitive if there is no line selected

[Artem Anufrij (artem-anufrij)]

see line comments

review: Needs Fixing (code style)

[Raphael Isemann (teemperor)]

As Daniel said, you shouln't need to relog/reboot for the keybindings to take effect, so just set "org.gnome.settings-daemon.plugins.media-keys" to false and then to true again and GSD will reload the media-keys plugin.

Interestingly on my system if i do this noise seems to loose the binding to the next/previous keys on my keyboard until i restart noise. But i think that's rather a bug in noise itself?

Otherwise:
* Commented-out code in line 780-781.
* Line 417: tbar = new Gtk.Toolbar(); <- needs a blank before the bracket

review: Needs Fixing (code style, functionality)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-01-10 08:17:09 +0000
+++ src/CMakeLists.txt	2014-03-30 21:21:15 +0000
@@ -29,6 +29,10 @@
     Pages/Shortcuts/shortcut.vala
     Pages/Shortcuts/list.vala
     Pages/Shortcuts/section_switcher.vala
+    Pages/Shortcuts/custom_tree.vala
+    Pages/Shortcuts/custom_shortcut_settings.vala
+    Pages/Shortcuts/conflict_dialog.vala
+    Pages/Shortcuts/display_tree.vala
     
     Pages/layout.vala   
     Pages/Layout/display.vala
 
=== added file 'src/Pages/Shortcuts/conflict_dialog.vala'
--- src/Pages/Shortcuts/conflict_dialog.vala	1970-01-01 00:00:00 +0000
+++ src/Pages/Shortcuts/conflict_dialog.vala	2014-03-30 21:21:15 +0000
@@ -0,0 +1,19 @@
+class ConflictDialog : Gtk.MessageDialog {
+
+    public signal void reassign ();
+
+    public ConflictDialog (string shortcut, string conflict_action, string this_action) {
+        modal = true;
+        message_type = Gtk.MessageType.WARNING;
+        text = @"\"$shortcut\" is already used for \"$conflict_action\"!";
+        secondary_text = _(@"If you reassign the shortcut to \"$this_action\", \"$conflict_action\" will be disabled");
+        add_button (_("Cancel"), 0);
+        add_button (_("Reassign"), 1);
+
+        response.connect ((response_id) => {
+            if (response_id == 1)
+                reassign ();
+            destroy();
+        });
+    }
+}
 \ No newline at end of file
 
=== added file 'src/Pages/Shortcuts/custom_shortcut_settings.vala'
--- src/Pages/Shortcuts/custom_shortcut_settings.vala	1970-01-01 00:00:00 +0000
+++ src/Pages/Shortcuts/custom_shortcut_settings.vala	2014-03-30 21:21:15 +0000
@@ -0,0 +1,146 @@
+class Pantheon.Keyboard.Shortcuts.CustomShortcutSettings : Object {
+
+    const string SCHEMA = "org.gnome.settings-daemon.plugins.media-keys";
+    const string KEY = "custom-keybinding";
+
+    const string RELOCATABLE_SCHEMA_PATH_TEMLPATE = "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom%d/";
+
+    const int MAX_SHORTCUTS = 100;
+
+    static GLib.Settings settings;
+
+    public static bool available = false;
+
+    public struct CustomShortcut {
+        string shortcut;
+        string command;
+        string relocatable_schema;
+    }
+
+    public static void init () {
+        var schema_source = GLib.SettingsSchemaSource.get_default ();
+
+        var schema = schema_source.lookup (SCHEMA, true);
+
+        if (schema == null) {
+            warning ("Schema \"%s\" is not installed on your system.", SCHEMA);
+            return;
+        }
+
+        settings = new GLib.Settings.full (schema, null, null);
+        available = true;
+    }
+
+    static string[] get_relocatable_schemas () {
+        return settings.get_strv (KEY + "s");
+    }
+
+    static string get_relocatable_schema_path (int i) {
+        return RELOCATABLE_SCHEMA_PATH_TEMLPATE.printf (i);
+    }
+
+    static GLib.Settings? get_relocatable_schema_settings (string relocatable_schema) {
+        return new GLib.Settings.with_path (SCHEMA + "." + KEY, relocatable_schema);
+    }
+
+    public static string? create_shortcut () requires (available) {
+        for (int i = 0; i < MAX_SHORTCUTS; i++) {
+            var new_relocatable_schema = get_relocatable_schema_path (i);
+
+            if (relocatable_schema_is_used (new_relocatable_schema) == false) {
+                add_relocatable_schema (new_relocatable_schema);
+                reset_relocatable_schema (new_relocatable_schema);
+                return new_relocatable_schema;
+            }
+        }
+
+        return (string) null;
+    }
+
+    static bool relocatable_schema_is_used (string new_relocatable_schema) {
+        var relocatable_schemas = get_relocatable_schemas ();
+
+        foreach (var relocatable_schema in relocatable_schemas)
+            if (relocatable_schema == new_relocatable_schema)
+                return true;
+
+        return false;
+    }
+
+    static void add_relocatable_schema (string new_relocatable_schema) {
+        var relocatable_schemas = get_relocatable_schemas ();
+        relocatable_schemas += new_relocatable_schema;
+        settings.set_strv (KEY + "s", relocatable_schemas);
+    }
+
+    static void reset_relocatable_schema (string relocatable_schema) {
+        var relocatable_settings = get_relocatable_schema_settings (relocatable_schema);
+        relocatable_settings.reset ("name");
+        relocatable_settings.reset ("command");
+        relocatable_settings.reset ("binding");
+    }
+
+    public static void remove_shortcut (string relocatable_schema)
+        requires (available) {
+
+        string []relocatable_schemas = {};
+
+        foreach (var schema in get_relocatable_schemas ())
+            if (schema != relocatable_schema)
+                relocatable_schemas += schema;
+
+        reset_relocatable_schema (relocatable_schema);
+        settings.set_strv (KEY + "s", relocatable_schemas);
+    }
+
+    public static bool edit_shortcut (string relocatable_schema, string shortcut)
+        requires (available) {
+
+        var relocatable_settings = get_relocatable_schema_settings (relocatable_schema);
+        relocatable_settings.set_string ("binding", shortcut);
+        return true;
+    }
+
+    public static bool edit_command (string relocatable_schema, string command)
+        requires (available) {
+
+        var relocatable_settings = get_relocatable_schema_settings (relocatable_schema);
+        relocatable_settings.set_string ("command", command);
+        return true;
+    }
+
+    public static GLib.List <CustomShortcut?> list_custom_shortcuts ()
+        requires (available) {
+
+        var list = new GLib.List <CustomShortcut?> ();
+        foreach (var relocatable_schema in get_relocatable_schemas ())
+            list.append (create_custom_shortcut_object (relocatable_schema));
+        return list;
+    }
+
+    static CustomShortcut? create_custom_shortcut_object (string relocatable_schema) {
+        var relocatable_settings = get_relocatable_schema_settings (relocatable_schema);
+
+        return {
+            relocatable_settings.get_string ("binding"),
+            relocatable_settings.get_string ("command"),
+            relocatable_schema
+        };
+    }
+
+    public static bool shortcut_conflicts (Shortcut new_shortcut, out string command,
+                                           out string relocatable_schema) {
+        var custom_shortcuts = list_custom_shortcuts ();
+
+        foreach (var custom_shortcut in custom_shortcuts) {
+            var shortcut = new Shortcut.parse (custom_shortcut.shortcut);
+            if (shortcut.is_equal (new_shortcut)) {
+                command = custom_shortcut.command;
+                relocatable_schema = custom_shortcut.relocatable_schema;
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
 \ No newline at end of file
 
=== added file 'src/Pages/Shortcuts/custom_tree.vala'
--- src/Pages/Shortcuts/custom_tree.vala	1970-01-01 00:00:00 +0000
+++ src/Pages/Shortcuts/custom_tree.vala	2014-03-30 21:21:15 +0000
@@ -0,0 +1,178 @@
+private class Pantheon.Keyboard.Shortcuts.CustomTree : Gtk.TreeView, DisplayTree {
+
+    Gtk.CellRendererText cell_desc;
+    Gtk.CellRendererAccel cell_edit;
+
+    enum Column {
+        COMMAND,
+        SHORTCUT,
+        SCHEMA,
+        COUNT
+    }
+
+    public CustomTree () {
+        setup_gui ();
+        load_and_display_custom_shortcuts ();
+        connect_signals ();
+    }
+
+    Gtk.ListStore list_store {
+        get { return model as Gtk.ListStore; }
+    }
+
+    void setup_gui () {
+        var store = new Gtk.ListStore (Column.COUNT , typeof (string),
+                                                      typeof (string),
+                                                      typeof (string));
+
+        cell_desc = new Gtk.CellRendererText ();
+        cell_edit = new Gtk.CellRendererAccel ();
+
+        cell_desc.editable = true;
+        cell_edit.editable = true;
+        cell_edit.accel_mode = Gtk.CellRendererAccelMode.OTHER;
+
+        this.set_model (store);
+
+        this.insert_column_with_attributes (-1, _("Command"), cell_desc, "markup", Column.COMMAND);
+        this.insert_column_with_attributes (-1, _("Shortcut"), cell_edit, "text", Column.SHORTCUT);
+
+        this.expand = true;
+        this.get_column (0).expand = true;
+    }
+
+    public void load_and_display_custom_shortcuts () {
+        Gtk.TreeIter iter;
+        var store = new Gtk.ListStore (Column.COUNT , typeof (string),
+                                                      typeof (string),
+                                                      typeof (string));
+
+        foreach (var custom_shortcut in CustomShortcutSettings.list_custom_shortcuts ()) {
+            var shortcut = new Shortcut.parse (custom_shortcut.shortcut);
+
+            store.append (out iter);
+            store.set (iter,
+                Column.COMMAND, command_to_display (custom_shortcut.command),
+                Column.SHORTCUT, shortcut.to_readable (),
+                Column.SCHEMA, custom_shortcut.relocatable_schema
+            );
+        }
+
+        model = store;
+    }
+
+    void connect_signals () {
+        this.button_press_event.connect ((event) => {
+            if (event.window != this.get_bin_window ())
+                return false;
+
+            Gtk.TreePath path;
+            Gtk.TreeViewColumn col;
+
+            if (this.get_path_at_pos ((int) event.x, (int) event.y,
+                                      out path, out col, null, null)) {
+                this.grab_focus ();
+                this.set_cursor (path, col, true);
+            }
+
+            return true;
+        });
+
+        cell_edit.accel_edited.connect ((path, key, mods) => {
+            var shortcut = new Shortcut (key, mods);
+            change_shortcut (path, shortcut);
+        });
+
+        cell_edit.accel_cleared.connect ((path) => {
+            change_shortcut (path, (Shortcut) null);
+        });
+
+        cell_desc.edited.connect (change_command);
+    }
+
+    string command_to_display (string? command) {
+        if (command == null || command.strip () == "")
+            return "<i>" +_("Enter Command") + "</i>";
+        return GLib.Markup.escape_text (command);
+    }
+
+    public void on_add_clicked () {
+        var store = model as Gtk.ListStore;
+        Gtk.TreeIter iter;
+
+        var relocatable_schema = CustomShortcutSettings.create_shortcut ();
+
+        store.append (out iter);
+        store.set (iter, Column.COMMAND, command_to_display (null));
+        store.set (iter, Column.SHORTCUT, (new Shortcut.parse ("")).to_readable ());
+        store.set (iter, Column.SCHEMA, relocatable_schema);
+    }
+
+    public void on_remove_clicked () {
+        Gtk.TreeIter iter;
+        Gtk.TreePath path;
+        GLib.Value relocatable_schema;
+
+        get_cursor (out path, null);
+        model.get_iter (out iter, path);
+        model.get_value (iter, Column.SCHEMA, out relocatable_schema);
+
+        CustomShortcutSettings.remove_shortcut ((string) relocatable_schema);
+        list_store.remove (iter);
+    }
+
+    void change_command (string path, string new_text) {
+        Gtk.TreeIter iter;
+        GLib.Value relocatable_schema;
+
+        model.get_iter (out iter, new Gtk.TreePath.from_string (path));
+        model.get_value (iter, Column.SCHEMA, out relocatable_schema);
+
+        CustomShortcutSettings.edit_command ((string) relocatable_schema, new_text);
+        load_and_display_custom_shortcuts ();
+    }
+
+    public bool shortcut_conflicts (Shortcut shortcut, out string name) {
+        return CustomShortcutSettings.shortcut_conflicts (shortcut, out name, null);
+    }
+
+    public void reset_shortcut (Shortcut shortcut) {
+        string relocatable_schema;
+        CustomShortcutSettings.shortcut_conflicts (shortcut, null, out relocatable_schema);
+        CustomShortcutSettings.edit_shortcut (relocatable_schema, "");
+        load_and_display_custom_shortcuts ();
+    }
+
+    bool change_shortcut (string path, Shortcut? shortcut) {
+        Gtk.TreeIter iter;
+        GLib.Value command, relocatable_schema;
+
+        model.get_iter (out iter, new Gtk.TreePath.from_string (path));
+        model.get_value (iter, Column.SCHEMA, out relocatable_schema);
+        model.get_value (iter, Column.COMMAND, out command);
+
+        var not_null_shortcut = shortcut ?? new Shortcut ();
+
+        string conflict_name;
+
+        if (shortcut != null) {
+            foreach (var tree in trees) {
+                if (tree.shortcut_conflicts (shortcut, out conflict_name) == false)
+                    continue;
+
+                var dialog = new ConflictDialog (shortcut.to_readable (), conflict_name, (string) command);
+                dialog.reassign.connect (() => {
+                    tree.reset_shortcut (shortcut);
+                    CustomShortcutSettings.edit_shortcut ((string) relocatable_schema, not_null_shortcut.to_gsettings ());
+                    load_and_display_custom_shortcuts ();
+                });
+                dialog.show ();
+                return false;
+            }
+        }
+
+        CustomShortcutSettings.edit_shortcut ((string) relocatable_schema, not_null_shortcut.to_gsettings ());
+        load_and_display_custom_shortcuts ();
+        return true;
+    }
+}
 \ No newline at end of file
 
=== modified file 'src/Pages/Shortcuts/display.vala'
--- src/Pages/Shortcuts/display.vala	2014-01-06 17:12:27 +0000
+++ src/Pages/Shortcuts/display.vala	2014-03-30 21:21:15 +0000
@@ -1,3 +1,4 @@
+// TODO use new Gtk.Stack widget here
 namespace Pantheon.Keyboard.Shortcuts
 {
 	// creates a grid containing a tree view and an inline toolbar
@@ -6,16 +7,17 @@
 		int selected;
 		
 		Gtk.ScrolledWindow scroll;
-		Tree[] trees;
-		
-		public ShortcutDisplay (Tree[] t)
+		DisplayTree[] trees;
+		
+		Gtk.Toolbar tbar;
+		
+		public ShortcutDisplay (DisplayTree[] t)
 		{
 			selected = 0;
 			
-			trees = t;
-			
-			foreach (var tree in trees) {
+			foreach (var tree in t) {
 				tree.set_rules_hint (true);
+				trees += tree;
 			}
 			
 			scroll = new Gtk.ScrolledWindow(null, null);
@@ -23,14 +25,15 @@
 			scroll.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
 			scroll.shadow_type = Gtk.ShadowType.IN;
 			scroll.expand = true;
-			scroll.add (trees[selected]);
+			scroll.add (t[selected]);
 	
-			var tbar = new Gtk.Toolbar();
+			tbar = new Gtk.Toolbar();
 			tbar.set_style(Gtk.ToolbarStyle.ICONS);
 			tbar.set_icon_size(Gtk.IconSize.SMALL_TOOLBAR);
 			tbar.set_show_arrow(false);
 			tbar.hexpand = true;
-		
+			tbar.no_show_all = true;
+			
 			scroll.get_style_context().set_junction_sides(Gtk.JunctionSides.BOTTOM);
 			tbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
 			tbar.get_style_context().set_junction_sides(Gtk.JunctionSides.TOP);
@@ -48,7 +51,12 @@
 			tbar.insert (remove_button, -1);
 
 			this.attach (scroll, 0, 0, 1, 1);
-			//this.attach (tbar,   0, 1, 1, 1);
+			this.attach (tbar,   0, 1, 1, 1);
+			
+			add_button.clicked.connect (() => 
+			    (trees[selected] as CustomTree).on_add_clicked ());
+			remove_button.clicked.connect (() =>
+			    (trees[selected] as CustomTree).on_remove_clicked ());
 		}
 		
 		// replace old tree view with new one
@@ -58,7 +66,11 @@
 			scroll.add    (trees[new_selection]);
 			
 			selected = new_selection;
-			scroll.show_all ();
+			
+			tbar.no_show_all = new_selection != SectionID.CUSTOM;
+			tbar.visible = new_selection == SectionID.CUSTOM;
+			
+			show_all ();
 			
 			return true;
 		}
 
=== added file 'src/Pages/Shortcuts/display_tree.vala'
--- src/Pages/Shortcuts/display_tree.vala	1970-01-01 00:00:00 +0000
+++ src/Pages/Shortcuts/display_tree.vala	2014-03-30 21:21:15 +0000
@@ -0,0 +1,5 @@
+interface Pantheon.Keyboard.Shortcuts.DisplayTree : Gtk.TreeView {
+
+    public abstract bool shortcut_conflicts (Shortcut shortcut, out string name);
+    public abstract void reset_shortcut (Shortcut shortcut);
+}
 \ No newline at end of file
 
=== modified file 'src/Pages/Shortcuts/list.vala'
--- src/Pages/Shortcuts/list.vala	2014-03-12 08:11:41 +0000
+++ src/Pages/Shortcuts/list.vala	2014-03-30 21:21:15 +0000
@@ -21,31 +21,6 @@
 			return;
 		}
 		
-		public bool conflicts (Shortcut s, out string key, out int group, out int path)
-		{
-			key    = (string) null;
-			group  = (SectionID) 0;
-			path   = -1;
-			
-			if (s.accel_key == Gdk.Key.BackSpace)
-				return false;
-			
-			for (int g = 0; g < groups.length; g++)
-			{
-				for (int i = 0; i < groups[g].actions.length; i++)
-				{
-					if (s.is_equal (settings.get_val(groups[g].schemas[i], groups[g].keys[i])))
-					{
-						key    = groups[g].keys[i];
-						group  = g;
-						path   = i;
-						return true;
-					}
-				}
-			}
-			return false;
-		}
-		
 		public List ()
 		{
 			groups =
@@ -70,7 +45,7 @@
 						_("Expose Windows"),
 						_("Expose all Windows")
 					},
-				    schemas = {
+					schemas = {
 						Schema.WM,
 						Schema.WM,
 						Schema.WM,
 
=== modified file 'src/Pages/Shortcuts/section_switcher.vala'
--- src/Pages/Shortcuts/section_switcher.vala	2014-01-06 17:12:27 +0000
+++ src/Pages/Shortcuts/section_switcher.vala	2014-03-30 21:21:15 +0000
@@ -12,8 +12,11 @@
 			
 			Gtk.TreeIter iter;
 			
-			// add the sections
-			for (int id = 0; id < SectionID.COUNT; id++) {
+			var max_section_id = CustomShortcutSettings.available 
+			                     ? SectionID.COUNT
+			                     : SectionID.CUSTOM;
+			
+			for (int id = 0; id < max_section_id; id++) {
 				store.append (out iter);
 				store.set (iter, 0, section_names[id]);
 			}
@@ -39,6 +42,6 @@
 			});
 		}
 		
-		public signal void changed (int i);
+		public signal bool changed (int i);
 	}
 }
 \ No newline at end of file
 
=== modified file 'src/Pages/Shortcuts/settings.vala'
--- src/Pages/Shortcuts/settings.vala	2014-01-06 17:12:27 +0000
+++ src/Pages/Shortcuts/settings.vala	2014-03-30 21:21:15 +0000
@@ -26,7 +26,7 @@
 				var schema = schema_source.lookup (name, true);
 				
 				if (schema == null) {
-					warning ("Schema \"%s\" is not installed on you system.", name);
+					warning ("Schema \"%s\" is not installed on your system.", name);
 					schemas += (GLib.Settings) null;
 				} else {
 					schemas += new GLib.Settings.full (schema, null, null);
 
=== modified file 'src/Pages/Shortcuts/shortcut.vala'
--- src/Pages/Shortcuts/shortcut.vala	2014-01-06 17:12:27 +0000
+++ src/Pages/Shortcuts/shortcut.vala	2014-03-30 21:21:15 +0000
@@ -10,7 +10,7 @@
 		string SEPARATOR = " · ";
 		
 		// constructors
-		public Shortcut ( uint key, Gdk.ModifierType mod )
+		public Shortcut (uint key = 0, Gdk.ModifierType mod = (Gdk.ModifierType) 0)
 		{
 			accel_key = key;
 			modifiers = mod;
@@ -107,4 +107,4 @@
 		}
 
 	}
-}
 \ No newline at end of file
+}
 
=== modified file 'src/Pages/Shortcuts/tree.vala'
--- src/Pages/Shortcuts/tree.vala	2014-01-06 17:12:27 +0000
+++ src/Pages/Shortcuts/tree.vala	2014-03-30 21:21:15 +0000
@@ -1,182 +1,145 @@
-namespace Pantheon.Keyboard.Shortcuts
-{
-	// contains the shortcuts and handels all changes in gsettings
-	private class Tree : Gtk.TreeView
-	{
-		private string[] actions;
-		private Schema[] schemas;
-		private string[] keys;
-		
-		// quick access to one item in the tree view
-		public bool get_item (uint i, out string action, out Schema schema, out string key)
-		{
-			action = null;
-			schema = (Schema) null;
-			key    = null;
-			
-			if (i < actions.length)
-			{
-				action = actions[i];
-				schema = schemas[i];
-				key    = keys[i];
-				return true;
-			}
-			return false;
-		}
-		
-		public Tree (SectionID group)
-		{
-			list.get_group (group, out actions, out schemas, out keys);
-			
-			// create list store
-			var store = new Gtk.ListStore (4, typeof (string),
-			                                  typeof (string), 
-			                                  typeof (Schema),
-			                                  typeof (string));
-
-			Gtk.TreeIter iter;
-			
-			for (int i = 0; i < actions.length; i++)
-			{
-				var shortcut = settings.get_val(schemas[i], keys[i]);
-				
-				// simply ignore missing keys/schemas
-				if (shortcut == null)
-					continue;
-
-				store.append (out iter);
-				store.set (iter, 0, actions[i], 
-				                 1, shortcut.to_readable(),
-				                 2, schemas[i],    // hidden
-				                 3, keys[i], -1);  // hidden
-			}
-			
-			// create tree view
-			var cell_desc = new Gtk.CellRendererText ();
-			var cell_edit = new Gtk.CellRendererAccel ();
-			
-			cell_edit.editable   = true;
-			cell_edit.accel_mode = Gtk.CellRendererAccelMode.OTHER;
-			
-			this.set_model (store);
-
-			this.insert_column_with_attributes (-1, null, cell_desc, "text", 0);
-			this.insert_column_with_attributes (-1, null, cell_edit, "text", 1);
-			// debug
-			//this.insert_column_with_attributes (-1, null, cell_desc, "text", 2);
-			//this.insert_column_with_attributes (-1, null, cell_edit, "text", 3);
-			
-			this.headers_visible = false;
-			this.expand          = true;
-			
-			this.get_column (0).expand = true;
-			
-			this.button_press_event.connect ((event) =>
-			{
-				if (event.window != this.get_bin_window ())
-					return false;
-    
-				Gtk.TreePath path;
-				
-				if (this.get_path_at_pos ((int) event.x,
-                                          (int) event.y,
-                                          out path, null,
-                                          null, null))
-				{
-					Gtk.TreeViewColumn col = this.get_column (1);
-					this.grab_focus ();
-					this.set_cursor (path, col, true);
-				}
-				
-				return true;
-			} );
-			
-			// signals
-			cell_edit.accel_edited.connect ((path, key, mods) => 
-			{
-				var shortcut = new Shortcut (key, mods);
-				change_shortcut (path, shortcut);
-			} );
-			
-			cell_edit.accel_cleared.connect ((path) => 
-			{
-				change_shortcut (path, (Shortcut) null);
-			} );
-		}
-		
-		// change a shortcut in the list store and gsettings
-		private bool change_shortcut (string path, Shortcut? shortcut)
-		{
-			Gtk.TreeIter  iter;
-			GLib.Value    key, schema, name;
-			
-			model.get_iter (out iter, new Gtk.TreePath.from_string (path));
-			
-			model.get_value (iter, 0, out name);
-			model.get_value (iter, 2, out schema);
-			model.get_value (iter, 3, out key);
-			
-
-			if (shortcut != null)
-			{
-				// new shortcut is old shortcut?
-				if (shortcut.is_equal (settings.get_val ((Schema)schema, (string)key)))
-					return true;
-				
-				string conflict_accel;
-				int    conflict_group;
-				int    conflict_path;
-				
-				// check if shortcut is already used
-				if (list.conflicts (shortcut, out conflict_accel, out conflict_group, out conflict_path))
-				{
-					string conflict_action;
-					Schema conflict_schema;
-					string conflict_key;
-					
-					// get some info about the conflicting item
-					trees[conflict_group].get_item (conflict_path, out conflict_action, out conflict_schema, out conflict_key);
-					
-					// ask user what to do
-					var msg = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL,
-						                                   Gtk.MessageType.WARNING, 
-						                                   Gtk.ButtonsType.NONE, 
-						                                   "\"%s\" is already used for \"%s\"!", shortcut.to_readable (), conflict_action);
-						                                   
-					msg.secondary_text = _("If you reassign the shortcut to \"%s\", \"%s\" will be disabled").printf ((string)name, conflict_action);
-					msg.add_button (_("Cancel"),   0);
-					msg.add_button (_("Reassign"), 1);
-				
-					msg.response.connect ((response_id) =>
-					{
-						if (response_id == 1)
-						{
-							trees[conflict_group].change_shortcut (conflict_path.to_string (), (Shortcut) null);
-							change_shortcut (path, shortcut);
-						}
-
-						msg.destroy();
-					});
-					msg.show ();
-					
-					return false;
-				}
-				
-				if (!shortcut.valid ())
-					return false;
-			}
-			
-			// unset/disable shortcut
-			if (shortcut == null)
-			{
-				(model as Gtk.ListStore).set (iter, 1, _("Disabled"));
-				settings.set_val((Schema)schema, (string)key, new Shortcut(0, (Gdk.ModifierType)0));
-				return true;
-			}
-			
-			(model as Gtk.ListStore).set (iter, 1, shortcut.to_readable ());
-			settings.set_val((Schema)schema, (string)key, shortcut);
-			return true;
-		}
-	}
+namespace Pantheon.Keyboard.Shortcuts {
+
+    private class Tree : Gtk.TreeView, DisplayTree {
+
+        public SectionID group { private get; construct; }
+
+        private string[] actions;
+        private Schema[] schemas;
+        private string[] keys;
+
+        public Tree (SectionID group) {
+            Object (group: group);
+
+            load_and_display_shortcuts ();
+
+            var cell_desc = new Gtk.CellRendererText ();
+            var cell_edit = new Gtk.CellRendererAccel ();
+
+            cell_edit.editable   = true;
+            cell_edit.accel_mode = Gtk.CellRendererAccelMode.OTHER;
+
+            this.insert_column_with_attributes (-1, null, cell_desc, "text", 0);
+            this.insert_column_with_attributes (-1, null, cell_edit, "text", 1);
+            //this.insert_column_with_attributes (-1, null, cell_desc, "text", 2);
+            //this.insert_column_with_attributes (-1, null, cell_edit, "text", 3);
+
+            this.headers_visible = false;
+            this.expand          = true;
+
+            this.get_column (0).expand = true;
+
+            this.button_press_event.connect ((event) => {
+                if (event.window != this.get_bin_window ())
+                    return false;
+
+                Gtk.TreePath path;
+
+                if (this.get_path_at_pos ((int) event.x, (int) event.y,
+                                          out path, null, null, null)) {
+                    Gtk.TreeViewColumn col = this.get_column (1);
+                    this.grab_focus ();
+                    this.set_cursor (path, col, true);
+                }
+
+                return true;
+            });
+
+            cell_edit.accel_edited.connect ((path, key, mods) =>  {
+                var shortcut = new Shortcut (key, mods);
+                change_shortcut (path, shortcut);
+            });
+
+            cell_edit.accel_cleared.connect ((path) => {
+                change_shortcut (path, (Shortcut) null);
+            });
+        }
+
+        void load_and_display_shortcuts () {
+            list.get_group (group, out actions, out schemas, out keys);
+
+            var store = new Gtk.ListStore (4, typeof (string), typeof (string),
+                                              typeof (Schema), typeof (string));
+
+            Gtk.TreeIter iter;
+
+            for (int i = 0; i < actions.length; i++) {
+                var shortcut = settings.get_val(schemas[i], keys[i]);
+
+                if (shortcut == null)
+                    continue;
+
+                store.append (out iter);
+                store.set (iter, 0, actions[i],
+                                 1, shortcut.to_readable(),
+                                 2, schemas[i],    // hidden
+                                 3, keys[i], -1);  // hidden
+            }
+
+            model = store;
+        }
+
+        public bool shortcut_conflicts (Shortcut shortcut, out string name) {
+            string[] actions, keys;
+            Schema[] schemas;
+
+            list.get_group (group, out actions, out schemas, out keys);
+
+            for (int i = 0; i < actions.length; i++) {
+                if (shortcut.is_equal (settings.get_val (schemas[i], keys[i]))) {
+                    name = actions[i];
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public void reset_shortcut (Shortcut shortcut) {
+            string[] actions, keys;
+            Schema[] schemas;
+            var empty_shortcut = new Shortcut ();
+
+            list.get_group (group, out actions, out schemas, out keys);
+
+            for (int i = 0; i < actions.length; i++)
+                if (shortcut.is_equal (settings.get_val (schemas[i], keys[i])))
+                    settings.set_val (schemas[i], keys[i], empty_shortcut);
+
+            load_and_display_shortcuts ();
+        }
+
+        public bool change_shortcut (string path, Shortcut? shortcut) {
+            Gtk.TreeIter  iter;
+            GLib.Value    key, schema, name;
+
+            model.get_iter (out iter, new Gtk.TreePath.from_string (path));
+
+            model.get_value (iter, 0, out name);
+            model.get_value (iter, 2, out schema);
+            model.get_value (iter, 3, out key);
+
+            string conflict_name;
+
+            if (shortcut != null) {
+                foreach (var tree in trees) {
+                    if (tree.shortcut_conflicts (shortcut, out conflict_name) == false)
+                        continue;
+
+                    var dialog = new ConflictDialog (shortcut.to_readable (), conflict_name, (string) name);
+                    dialog.reassign.connect (() => {
+                        tree.reset_shortcut (shortcut);
+                        settings.set_val ((Schema) schema, (string) key, shortcut);
+                        load_and_display_shortcuts ();
+                    });
+                    dialog.show ();
+                    return false;
+                }
+            }
+
+            settings.set_val ((Schema) schema, (string) key, shortcut ?? new Shortcut ());
+            load_and_display_shortcuts ();
+            return true;
+        }
+    }
 }
 \ No newline at end of file
 
=== modified file 'src/Pages/shortcuts.vala'
--- src/Pages/shortcuts.vala	2014-01-06 17:12:27 +0000
+++ src/Pages/shortcuts.vala	2014-03-30 21:21:15 +0000
@@ -5,9 +5,18 @@
 	// class to interact with gsettings
 	private Shortcuts.Settings settings;
 	// array of tree views, one for each section
-	private Tree[] trees;
+	private DisplayTree[] trees;
 	
-	private enum SectionID { WINDOWS, WORKSPACES, SCREENSHOTS, APPS, MEDIA, A11Y, COUNT }
+	private enum SectionID {
+	    WINDOWS,
+	    WORKSPACES,
+	    SCREENSHOTS,
+	    APPS,
+	    MEDIA,
+	    A11Y,
+	    CUSTOM,
+	    COUNT
+	}
 	
 	private string[] section_names;
 	
@@ -27,6 +36,8 @@
 		
 		public Page ()
 		{
+			CustomShortcutSettings.init ();
+			
 			// init public elements
 			section_names = {
 				_("Windows"),
@@ -34,15 +45,18 @@
 				_("Screenshots"),
 				_("Applications"),
 				_("Media"),
-				_("Universal Access")
+				_("Universal Access"),
+				_("Custom")
 			};
 			
 			list     = new List ();
 			settings = new Shortcuts.Settings ();
 			
-			for (int id = 0; id < SectionID.COUNT; id++) {
+			for (int id = 0; id < SectionID.CUSTOM; id++)
 				trees += new Tree ((SectionID) id);
-			}
+			
+			if (CustomShortcutSettings.available)
+				trees += new CustomTree ();
 			
 			// private elements
 			var shortcut_display = new ShortcutDisplay (trees);
@@ -51,9 +65,7 @@
 			this.attach (section_switcher, 0, 0, 1, 1);
 			this.attach (shortcut_display, 1, 0, 2, 1);
 		
-			section_switcher.changed.connect ((i) => {
-				shortcut_display.change_selection (i);
-			});
+			section_switcher.changed.connect (shortcut_display.change_selection);
 		}
 	}
-}
 \ No newline at end of file
+}