From 2f36221b7abf40bf16e3205b1a05756798fa387e Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Sun, 18 Aug 2019 21:02:41 +1000 Subject: [PATCH] Fix conflicting keyboard shortcuts and update overlay This fixes search/star and archive/select all conflicting, cleans up mark read/unread conform to the HIG, and updates the help overlay and fix some problems with it. --- .../application/application-controller.vala | 31 +++++++++++++------ ui/gtk/help-overlay.ui | 16 +++++----- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/client/application/application-controller.vala b/src/client/application/application-controller.vala index 0ff2b9ed..fe7e7618 100644 --- a/src/client/application/application-controller.vala +++ b/src/client/application/application-controller.vala @@ -589,25 +589,38 @@ public class Application.Controller : Geary.BaseObject { private void setup_actions() { this.main_window.add_action_entries(win_action_entries, this); - add_window_accelerators(ACTION_MARK_AS_READ, { "I", "I" }); + // Marking actions + // + // Unmark is the primary action + add_window_accelerators(ACTION_MARK_AS_READ, { "U", "I" }); add_window_accelerators(ACTION_MARK_AS_UNREAD, { "U", "U" }); - add_window_accelerators(ACTION_MARK_AS_STARRED, { "S", "S" }); - add_window_accelerators(ACTION_MARK_AS_UNSTARRED, { "D", "D" }); + // Ephy uses Ctrl+D for bookmarking + add_window_accelerators(ACTION_MARK_AS_STARRED, { "D", "S" }); + add_window_accelerators(ACTION_MARK_AS_UNSTARRED, { "D", "D" }); add_window_accelerators(ACTION_MARK_AS_SPAM, { "J", "exclam" }); // Exclamation mark (!) - add_window_accelerators(ACTION_MARK_AS_NOT_SPAM, { "J", "exclam" }); - add_window_accelerators(ACTION_COPY_MENU, { "L", "L" }); - add_window_accelerators(ACTION_MOVE_MENU, { "M", "M" }); + + // Replying & forwarding add_window_accelerators(ACTION_REPLY_TO_MESSAGE, { "R", "R" }); add_window_accelerators(ACTION_REPLY_ALL_MESSAGE, { "R", "R" }); add_window_accelerators(ACTION_FORWARD_MESSAGE, { "L", "F" }); - add_window_accelerators(ACTION_FIND_IN_CONVERSATION, { "F", "slash" }); - add_window_accelerators(ACTION_ARCHIVE_CONVERSATION, { "A", "A", "Y" }); + + // Moving & labelling + add_window_accelerators(ACTION_COPY_MENU, { "L", "L" }); + add_window_accelerators(ACTION_MOVE_MENU, { "M", "M" }); + add_window_accelerators(ACTION_ARCHIVE_CONVERSATION, { "K", "A", "Y" }); add_window_accelerators(ACTION_TRASH_CONVERSATION, { "Delete", "BackSpace" }); add_window_accelerators(ACTION_DELETE_CONVERSATION, { "Delete", "BackSpace" }); + + // Find & search + add_window_accelerators(ACTION_FIND_IN_CONVERSATION, { "F", "slash" }); + add_window_accelerators(ACTION_SEARCH, { "S" }); + + // Zoom add_window_accelerators(ACTION_ZOOM+("('in')"), { "equal", "plus" }); add_window_accelerators(ACTION_ZOOM+("('out')"), { "minus" }); add_window_accelerators(ACTION_ZOOM+("('normal')"), { "0" }); - add_window_accelerators(ACTION_SEARCH, { "S" }); + + // Navigation add_window_accelerators(ACTION_CONVERSATION_LIST, { "B" }); add_window_accelerators(ACTION_CONVERSATION_UP, { "bracketleft", "K" }); add_window_accelerators(ACTION_CONVERSATION_DOWN, { "bracketright", "J" }); diff --git a/ui/gtk/help-overlay.ui b/ui/gtk/help-overlay.ui index db4b099d..7ed647d0 100644 --- a/ui/gtk/help-overlay.ui +++ b/ui/gtk/help-overlay.ui @@ -42,22 +42,22 @@ True - Mark/un-mark read - <primary>U <primary>I + Un-mark/mark read + <primary>U <primary><Shift>U True Mark/un-mark starred - <primary>S <primary>D + <primary>D <primary><Shift>D True Archive conversation - <primary>A + <primary>K @@ -91,7 +91,8 @@ True - Delete + Delete conversation <Shift>Delete <Shift>Back @@ -116,8 +117,7 @@