Move context menu action accelerators to SourceView

Author: jeremypw

src/MainWindow.vala

@@ -79,14 +79,10 @@ namespace Scratch {
         public const string ACTION_OPEN_PROJECT = "action-open-project";
         public const string ACTION_COLLAPSE_ALL_FOLDERS = "action-collapse-all-folders";
         public const string ACTION_GO_TO = "action-go-to";
-        public const string ACTION_SORT_LINES = "action-sort-lines";
         public const string ACTION_NEW_TAB = "action-new-tab";
         public const string ACTION_NEW_FROM_CLIPBOARD = "action-new-from-clipboard";
         public const string ACTION_DUPLICATE_TAB = "action-duplicate-tab";
         public const string ACTION_PREFERENCES = "preferences";
-        public const string ACTION_ADD_MARK = "action_add_mark";
-        public const string ACTION_PREVIOUS_MARK = "action_previous_mark";
-        public const string ACTION_NEXT_MARK = "action_next_mark";
 
         public const string ACTION_UNDO = "action-undo";
         public const string ACTION_REDO = "action-redo";
@@ -104,7 +100,6 @@ namespace Scratch {
         public const string ACTION_ZOOM_DEFAULT = "action-zoom-default";
         public const string ACTION_ZOOM_IN = "action-zoom-in";
         public const string ACTION_ZOOM_OUT = "action-zoom-out";
-        public const string ACTION_TOGGLE_COMMENT = "action-toggle-comment";
         public const string ACTION_TOGGLE_SHOW_FIND = "action-toggle_show-find";
         public const string ACTION_TOGGLE_SIDEBAR = "action-toggle-sidebar";
         public const string ACTION_FOCUS_SIDEBAR = "action-focus-sidebar";
@@ -151,7 +146,6 @@ namespace Scratch {
             { ACTION_TOGGLE_SHOW_FIND, action_toggle_show_find, null, "false" },
             { ACTION_TEMPLATES, action_templates },
             { ACTION_GO_TO, action_go_to },
-            { ACTION_SORT_LINES, action_sort_lines },
             { ACTION_NEW_TAB, action_new_tab },
             { ACTION_NEW_FROM_CLIPBOARD, action_new_tab_from_clipboard },
             { ACTION_DUPLICATE_TAB, action_duplicate_tab },
@@ -168,7 +162,6 @@ namespace Scratch {
             { ACTION_ZOOM_DEFAULT, action_set_default_zoom },
             { ACTION_ZOOM_IN, action_zoom_in },
             { ACTION_ZOOM_OUT, action_zoom_out},
-            { ACTION_TOGGLE_COMMENT, action_toggle_comment },
             { ACTION_TOGGLE_SIDEBAR, action_toggle_sidebar, null, "true" },
             { ACTION_FOCUS_SIDEBAR, action_focus_sidebar },
             { ACTION_FOCUS_DOCUMENT, action_focus_document },
@@ -180,9 +173,6 @@ namespace Scratch {
             { ACTION_PREVIOUS_TAB, action_previous_tab },
             { ACTION_CLEAR_LINES, action_clear_lines },
             { ACTION_BRANCH_ACTIONS, action_branch_actions, "s" },
-            { ACTION_ADD_MARK, action_add_mark},
-            { ACTION_PREVIOUS_MARK, action_previous_mark},
-            { ACTION_NEXT_MARK, action_next_mark},
             { ACTION_CLOSE_TAB, action_close_tab, "s" },
             { ACTION_CLOSE_TABS_TO_RIGHT, action_close_tabs_to_right },
             { ACTION_CLOSE_OTHER_TABS, action_close_other_tabs },
@@ -220,7 +210,6 @@ namespace Scratch {
             action_accelerators.set (ACTION_SAVE, "<Control>s");
             action_accelerators.set (ACTION_SAVE_AS, "<Control><shift>s");
             action_accelerators.set (ACTION_GO_TO, "<Control>i");
-            action_accelerators.set (ACTION_SORT_LINES, "F5");
             action_accelerators.set (ACTION_NEW_TAB, "<Control>n");
             action_accelerators.set (ACTION_DUPLICATE_TAB, "<Control><Shift>k" );
             action_accelerators.set (ACTION_UNDO, "<Control>z");
@@ -239,8 +228,6 @@ namespace Scratch {
             action_accelerators.set (ACTION_ZOOM_IN, "<Control>KP_Add");
             action_accelerators.set (ACTION_ZOOM_OUT, "<Control>minus");
             action_accelerators.set (ACTION_ZOOM_OUT, "<Control>KP_Subtract");
-            action_accelerators.set (ACTION_TOGGLE_COMMENT, "<Control>m");
-            action_accelerators.set (ACTION_TOGGLE_COMMENT, "<Control>slash");
             action_accelerators.set (ACTION_TOGGLE_SIDEBAR, "F9"); // GNOME
             action_accelerators.set (ACTION_TOGGLE_SIDEBAR, "<Control>backslash"); // Atom
             action_accelerators.set (ACTION_FOCUS_SIDEBAR, "<Control><Alt>Left");
@@ -255,9 +242,6 @@ namespace Scratch {
             action_accelerators.set (ACTION_PREVIOUS_TAB, "<Control>Page_Up");
             action_accelerators.set (ACTION_CLEAR_LINES, "<Control>K"); //Geany
             action_accelerators.set (ACTION_BRANCH_ACTIONS + "::", "<Control>B");
-            action_accelerators.set (ACTION_ADD_MARK, "<Alt>equal");
-            action_accelerators.set (ACTION_PREVIOUS_MARK, "<Alt>Left");
-            action_accelerators.set (ACTION_NEXT_MARK, "<Alt>Right");
             action_accelerators.set (ACTION_HIDE_PROJECT_DOCS + "::", "<Control><Shift>h");
             action_accelerators.set (ACTION_MOVE_TAB_TO_NEW_WINDOW, "<Control><Alt>n");
             action_accelerators.set (ACTION_RESTORE_PROJECT_DOCS + "::", "<Control><Shift>r");
@@ -1405,27 +1389,6 @@ namespace Scratch {
             buffer.insert (ref start, selected.up (), -1);
         }
 
-        private void action_toggle_comment () {
-            var doc = get_focused_document ();
-            if (doc == null) {
-                return;
-            }
-
-            var buffer = doc.source_view.buffer;
-            if (buffer is Gtk.SourceBuffer) {
-                CommentToggler.toggle_comment (buffer as Gtk.SourceBuffer);
-            }
-        }
-
-        private void action_sort_lines () {
-            var doc = get_focused_document ();
-            if (doc == null) {
-                return;
-            }
-
-            doc.source_view.sort_selected_lines ();
-        }
-
         private void action_toggle_sidebar (SimpleAction action) {
             if (sidebar == null) {
                 return;
@@ -1526,33 +1489,6 @@ namespace Scratch {
             folder_manager_view.branch_actions (get_target_path_for_actions (param));
         }
 
-        private void action_previous_mark () {
-            var doc = get_focused_document ();
-            if (doc == null) {
-                return;
-            }
-
-            doc.source_view.goto_previous_mark ();
-        }
-
-        private void action_next_mark () {
-            var doc = get_focused_document ();
-            if (doc == null) {
-                return;
-            }
-
-            doc.source_view.goto_next_mark ();
-        }
-
-        private void action_add_mark () {
-            var doc = get_focused_document ();
-            if (doc == null) {
-                return;
-            }
-
-            doc.source_view.add_mark_at_cursor ();
-        }
-
         private void action_move_tab_to_new_window () {
             document_view.transfer_tab_to_new_window ();
         }

src/Widgets/SourceView.vala

@@ -39,6 +39,7 @@ namespace Scratch.Widgets {
         private string selected_text = "";
         private GitGutterRenderer git_diff_gutter_renderer;
         private NavMarkGutterRenderer navmark_gutter_renderer;
+        private Gtk.EventControllerKey key_controller;
 
         private const uint THROTTLE_MS = 400;
         private double total_delta = 0;
@@ -256,6 +257,42 @@ namespace Scratch.Widgets {
                 menu.show_all ();
             });
 
+            // Handle context menu shortcuts here.
+            // In Gtk3 we use a EventControllerKey but after porting to Gtk4 we can replace with Gtk.Shortcuts
+            key_controller = new Gtk.EventControllerKey (application.get_active_window ()) {
+                propagation_phase = CAPTURE
+            };
+            key_controller.key_pressed.connect ((kv, kc, state) => {
+                if (!this.is_focus || !Gtk.accelerator_valid (kv, state)) {
+                    return false;
+                }
+
+                var mods = (state & Gtk.accelerator_get_default_mod_mask ());
+                var accel = Gtk.accelerator_name (kv, mods);
+                switch (accel) {
+                    case "F5":
+                        sort_selected_lines ();
+                        return true;
+                    case "<Alt>equal":
+                            add_mark_at_cursor ();
+                            return true;
+                    case "<Alt>Left":
+                            goto_next_mark ();
+                            return true;
+                    case "<Alt>Right":
+                            goto_previous_mark ();
+                            return true;
+                    case "<Primary>m":
+                    case "<Primary>slash":
+                            CommentToggler.toggle_comment (buffer as Gtk.SourceBuffer);
+                            return true;
+                    default:
+                        break;
+                }
+
+                return false;
+            });
+
             size_allocate.connect ((allocation) => {
                 // Throttle for performance
                 if (size_allocate_timer == 0) {