Handle accels with GLib.Action (#434)

Co-authored-by: Stanisław <6031763+stsdc@users.noreply.github.com>

Author: danirabbit

src/MainWindow.vala

@@ -147,6 +147,11 @@ public class Monitor.MainWindow : Hdy.ApplicationWindow {
 
         dbusserver.indicator_state (MonitorApp.settings.get_boolean ("indicator-state"));
         stack.visible_child_name = MonitorApp.settings.get_string ("opened-view");
+
+        var search_action = new GLib.SimpleAction ("search", null);
+        search_action.activate.connect (() => search.activate_entry ());
+
+        add_action (search_action);
     }
 
     private void setup_window_state () {

src/Monitor.vala

@@ -43,12 +43,16 @@ namespace Monitor {
 
             var quit_action = new SimpleAction ("quit", null);
             add_action (quit_action);
-            set_accels_for_action ("app.quit", { "<Ctrl>q" });
             quit_action.activate.connect (() => {
                 if (window != null) {
                     window.destroy ();
                 }
             });
+
+            set_accels_for_action ("app.quit", { "<Ctrl>q" });
+            set_accels_for_action ("win.search", { "<Ctrl>f" });
+            set_accels_for_action ("process.end", { "<Ctrl>e" });
+            set_accels_for_action ("process.kill", { "<Ctrl>k" });
         }
 
         public override void activate () {

src/Services/Shortcuts.vala

@@ -20,31 +20,6 @@ public class Monitor.Shortcuts : Object {
             handled = true;
         }
 
-        if ((e.state & Gdk.ModifierType.CONTROL_MASK) != 0) {
-            switch (e.keyval) {
-            case Gdk.Key.f:
-                window.search.activate_entry ();
-                handled = true;
-                break;
-            case Gdk.Key.e:
-                window.process_view.process_tree_view.end_process ();
-                handled = true;
-                break;
-            case Gdk.Key.k:
-                window.process_view.process_tree_view.kill_process ();
-                handled = true;
-                break;
-            case Gdk.Key.comma:
-                handled = true;
-                break;
-            case Gdk.Key.period:
-                handled = true;
-                break;
-            default:
-                break;
-            }
-        }
-
         switch (e.keyval) {
         case Gdk.Key.Return:
             window.process_view.process_tree_view.focus_on_first_row ();

src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala

@@ -82,6 +82,18 @@ public class Monitor.CPUProcessTreeView : Gtk.TreeView {
 
         cursor_changed.connect (_cursor_changed);
         // model.process_manager.updated.connect (_cursor_changed);
+
+        var end_process_action = new GLib.SimpleAction ("end", null);
+        end_process_action.activate.connect (end_process);
+
+        var kill_process_action = new GLib.SimpleAction ("kill", null);
+        kill_process_action.activate.connect (kill_process);
+
+        var action_group = new SimpleActionGroup ();
+        action_group.add_action (end_process_action);
+        action_group.add_action (kill_process_action);
+
+        insert_action_group ("process", action_group);
     }
     public void icon_cell_layout (Gtk.CellLayout cell_layout, Gtk.CellRenderer icon_cell, Gtk.TreeModel model, Gtk.TreeIter iter) {
         Value icon_name;