ShortcutsList: store shortcuts in a listmodel (#551)

Author: danirabbit

src/Shortcuts/Backend/ConflictsManager.vala

@@ -26,19 +26,14 @@ class Keyboard.Shortcuts.ConflictsManager : GLib.Object {
         unowned var list = ShortcutsList.get_default ();
 
         for (int group_id = 0; group_id < SectionID.CUSTOM; group_id++) {
-            string[] actions, keys;
-            Schema[] schemas;
+            var listmodel = list.get_model (group_id);
+            for (int i = 0; i < listmodel.n_items; i++) {
+                var shortcut_action = (Keyboard.Shortcuts.Action) listmodel.get_item (i);
 
-            name = "";
-            group = ((SectionID) group_id).to_string ();
-            list.get_group (group_id, out actions, out schemas, out keys);
+                var action_shortcut = Settings.get_default ().get_val (shortcut_action.schema, shortcut_action.key);
 
-            // For every action in group there is a corresponding schema and key entry
-            // so only need to iterate actions
-            for (int i = 0; i < actions.length; i++) {
-                var action_shortcut = Settings.get_default ().get_val (schemas[i], keys[i]);
                 if (shortcut.is_equal (action_shortcut)) {
-                    name = actions[i];
+                    name = shortcut_action.action;
                     return true;
                 }
             }

src/Shortcuts/Backend/Settings.vala

@@ -18,7 +18,7 @@
 */
 
 namespace Keyboard.Shortcuts {
-    private enum Schema { WM, MUTTER, GALA, MEDIA, SOUND_INDICATOR, IBUS, DOCK, COUNT }
+    public enum Schema { WM, MUTTER, GALA, MEDIA, SOUND_INDICATOR, IBUS, DOCK, COUNT }
 
     // helper class for gsettings
     // note that media key are stored as strings, all others as string vectors

src/Shortcuts/Backend/ShortcutsList.vala

@@ -21,9 +21,22 @@ namespace Keyboard.Shortcuts {
     struct Group {
         public string icon_name;
         public string label;
-        public string[] actions;
-        public Schema[] schemas;
-        public string[] keys;
+
+        public GLib.ListStore list;
+    }
+
+    public class Action : Object {
+        public Schema schema { get; construct; }
+        public string action { get; construct; }
+        public string key { get; construct; }
+
+        public Action (Schema schema, string action, string key) {
+            Object (
+                schema: schema,
+                action: action,
+                key: key
+            );
+        }
     }
 
     class ShortcutsList : GLib.Object {
@@ -48,7 +61,9 @@ namespace Keyboard.Shortcuts {
         private ShortcutsList () {}
 
         construct {
-            windows_group = {};
+            windows_group = Group () {
+                list = new GLib.ListStore (typeof (Keyboard.Shortcuts.Action))
+            };
             windows_group.icon_name = "io.elementary.settings.keyboard.windows";
             windows_group.label = _("Windows");
             add_action (ref windows_group, Schema.WM, _("Close"), "close");
@@ -74,7 +89,9 @@ namespace Keyboard.Shortcuts {
             add_action (ref windows_group, Schema.WM, _("Move to right display"), "move-to-monitor-right");
             add_action (ref windows_group, Schema.WM, _("Move to left display"), "move-to-monitor-left");
 
-            workspaces_group = {};
+            workspaces_group = Group () {
+                list = new GLib.ListStore (typeof (Keyboard.Shortcuts.Action))
+            };
             workspaces_group.icon_name = "preferences-desktop-workspaces";
             workspaces_group.label = _("Workspaces");
             add_action (ref workspaces_group, Schema.GALA, _("Multitasking View"), "toggle-multitasking-view");
@@ -105,7 +122,9 @@ namespace Keyboard.Shortcuts {
             add_action (ref workspaces_group, Schema.WM, _("Move to left workspace"), "move-to-workspace-left");
             add_action (ref workspaces_group, Schema.WM, _("Move to right workspace"), "move-to-workspace-right");
 
-            screenshot_group = {};
+            screenshot_group = Group () {
+                list = new GLib.ListStore (typeof (Keyboard.Shortcuts.Action))
+            };
             screenshot_group.icon_name = "accessories-screenshot-tool";
             screenshot_group.label = _("Screenshots");
             add_action (ref screenshot_group, Schema.GALA, _("Grab the whole screen"), "screenshot");
@@ -115,7 +134,9 @@ namespace Keyboard.Shortcuts {
             add_action (ref screenshot_group, Schema.GALA, _("Select an area to grab"), "area-screenshot");
             add_action (ref screenshot_group, Schema.GALA, _("Copy an area to clipboard"), "area-screenshot-clip");
 
-            launchers_group = {};
+            launchers_group = Group () {
+                list = new GLib.ListStore (typeof (Keyboard.Shortcuts.Action))
+            };
             launchers_group.icon_name = "io.elementary.settings.keyboard.applications";
             launchers_group.label = _("Applications");
             add_action (ref launchers_group, Schema.MEDIA, _("Email"), "email");
@@ -133,7 +154,9 @@ namespace Keyboard.Shortcuts {
             add_action (ref launchers_group, Schema.DOCK, _("Launch eighth dock item"), "launch-dock-8");
             add_action (ref launchers_group, Schema.DOCK, _("Launch ninth dock item"), "launch-dock-9");
 
-            media_group = {};
+            media_group = Group () {
+                list = new GLib.ListStore (typeof (Keyboard.Shortcuts.Action))
+            };
             media_group.icon_name = "applications-multimedia";
             media_group.label = _("Media");
             add_action (ref media_group, Schema.SOUND_INDICATOR, _("Volume Up"), "volume-up");
@@ -146,7 +169,9 @@ namespace Keyboard.Shortcuts {
             add_action (ref media_group, Schema.MEDIA, _("Next Track"), "next");
             add_action (ref media_group, Schema.MEDIA, _("Eject"), "eject");
 
-            a11y_group = {};
+            a11y_group = Group () {
+                list = new GLib.ListStore (typeof (Keyboard.Shortcuts.Action))
+            };
             a11y_group.icon_name = "preferences-desktop-accessibility";
             a11y_group.label = _("Universal Access");
             add_action (ref a11y_group, Schema.MEDIA, _("Decrease Text Size"), "decrease-text-size");
@@ -156,23 +181,29 @@ namespace Keyboard.Shortcuts {
             add_action (ref a11y_group, Schema.MEDIA, _("Toggle On Screen Keyboard"), "on-screen-keyboard");
             add_action (ref a11y_group, Schema.MEDIA, _("Toggle Screenreader"), "screenreader");
 
-            system_group = {};
+            system_group = Group () {
+                list = new GLib.ListStore (typeof (Keyboard.Shortcuts.Action))
+            };
             system_group.icon_name = "preferences-system";
             system_group.label = _("System");
             add_action (ref system_group, Schema.GALA, _("Applications Menu"), "panel-main-menu");
             add_action (ref system_group, Schema.MEDIA, _("Lock"), "screensaver");
             add_action (ref system_group, Schema.MEDIA, _("Log Out"), "logout");
             add_action (ref system_group, Schema.MUTTER, _("Cycle display mode"), "switch-monitor");
 
-            keyboard_layouts_group = {};
+            keyboard_layouts_group = Group () {
+                list = new GLib.ListStore (typeof (Keyboard.Shortcuts.Action))
+            };
             keyboard_layouts_group.icon_name = "preferences-desktop-locale";
             keyboard_layouts_group.label = _("Keyboard Layouts");
             add_action (ref keyboard_layouts_group, Schema.GALA, _("Switch Keyboard Layout"), "switch-input-source");
             add_action (ref keyboard_layouts_group, Schema.GALA, _("Switch Keyboard Layout Backwards"), "switch-input-source-backward");
             add_action (ref keyboard_layouts_group, Schema.IBUS, _("Enable Emoji Typing"), "hotkey");
             add_action (ref keyboard_layouts_group, Schema.IBUS, _("Enable Unicode Typing"), "unicode-hotkey");
 
-            custom_group = {};
+            custom_group = Group () {
+                list = new GLib.ListStore (typeof (Keyboard.Shortcuts.Action))
+            };
             custom_group.icon_name = "applications-other";
             custom_group.label = _("Custom");
 
@@ -188,17 +219,16 @@ namespace Keyboard.Shortcuts {
             };
         }
 
-        public void get_group (SectionID group, out string[] a, out Schema[] s, out string[] k) {
-            a = groups[group].actions;
-            s = groups[group].schemas;
-            k = groups[group].keys;
-            return;
+        public ListStore get_model (SectionID group) {
+            return groups[group].list;
         }
 
         public void add_action (ref Group group, Schema schema, string action, string key) {
-            group.keys += key;
-            group.schemas += schema;
-            group.actions += action;
+            var action_object = new Keyboard.Shortcuts.Action (schema, action, key);
+
+            if (Settings.get_default ().valid (schema, key)) {
+                group.list.append (action_object);
+            }
         }
     }
 }

src/Shortcuts/Widgets/ShortcutListBox.vala

@@ -20,31 +20,27 @@
 private class Keyboard.Shortcuts.ShortcutListBox : Gtk.Box {
     public SectionID group { get; construct; }
 
-    private string[] actions;
-    private Schema[] schemas;
-    private string[] keys;
-
     public ShortcutListBox (SectionID group) {
         Object (group: group);
     }
 
     construct {
-        ShortcutsList.get_default ().get_group (group, out actions, out schemas, out keys);
+        var sizegroup = new Gtk.SizeGroup (VERTICAL);
 
         var list_box = new Gtk.ListBox () {
             hexpand = true
         };
+        list_box.bind_model (
+            ShortcutsList.get_default ().get_model (group),
+            (object) => {
+                var action_object = (Keyboard.Shortcuts.Action) object;
 
-        var sizegroup = new Gtk.SizeGroup (Gtk.SizeGroupMode.VERTICAL);
-
-        for (int i = 0; i < actions.length; i++) {
-            if (Settings.get_default ().valid (schemas[i], keys[i])) {
-                var row = new ShortcutRow (actions[i], schemas[i], keys[i]);
-                list_box.append (row);
-
+                var row = new ShortcutRow (action_object.action, action_object.schema, action_object.key);
                 sizegroup.add_widget (row);
+
+                return row;
             }
-        }
+        );
 
         append (list_box);
     }