[geary/wip/shortcut-conflicts] Fix conflicting keyboard shortcuts and update overlay

[Michael Gratton <mjog src gnome org>]

commit 2f36221b7abf40bf16e3205b1a05756798fa387e
Author: Michael Gratton <mike vee net>
Date:   Sun Aug 18 21:02:41 2019 +1000

    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.

 src/client/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, { "<Ctrl>I", "<Shift>I" });
+        // Marking actions
+        //
+        // Unmark is the primary action
+        add_window_accelerators(ACTION_MARK_AS_READ, { "<Ctrl><Shift>U", "<Shift>I" });
         add_window_accelerators(ACTION_MARK_AS_UNREAD, { "<Ctrl>U", "<Shift>U" });
-        add_window_accelerators(ACTION_MARK_AS_STARRED, { "<Ctrl>S", "S" });
-        add_window_accelerators(ACTION_MARK_AS_UNSTARRED, { "<Ctrl>D", "D" });
+        // Ephy uses Ctrl+D for bookmarking
+        add_window_accelerators(ACTION_MARK_AS_STARRED, { "<Ctrl>D", "S" });
+        add_window_accelerators(ACTION_MARK_AS_UNSTARRED, { "<Ctrl><Shift>D", "D" });
         add_window_accelerators(ACTION_MARK_AS_SPAM, { "<Ctrl>J", "exclam" }); // Exclamation mark (!)
-        add_window_accelerators(ACTION_MARK_AS_NOT_SPAM, { "<Ctrl>J", "exclam" });
-        add_window_accelerators(ACTION_COPY_MENU, { "<Ctrl>L", "L" });
-        add_window_accelerators(ACTION_MOVE_MENU, { "<Ctrl>M", "M" });
+
+        // Replying & forwarding
         add_window_accelerators(ACTION_REPLY_TO_MESSAGE, { "<Ctrl>R", "R" });
         add_window_accelerators(ACTION_REPLY_ALL_MESSAGE, { "<Ctrl><Shift>R", "<Shift>R" });
         add_window_accelerators(ACTION_FORWARD_MESSAGE, { "<Ctrl>L", "F" });
-        add_window_accelerators(ACTION_FIND_IN_CONVERSATION, { "<Ctrl>F", "slash" });
-        add_window_accelerators(ACTION_ARCHIVE_CONVERSATION, { "<Ctrl>A", "A", "Y" });
+
+        // Moving & labelling
+        add_window_accelerators(ACTION_COPY_MENU, { "<Ctrl>L", "L" });
+        add_window_accelerators(ACTION_MOVE_MENU, { "<Ctrl>M", "M" });
+        add_window_accelerators(ACTION_ARCHIVE_CONVERSATION, { "<Ctrl>K", "A", "Y" });
         add_window_accelerators(ACTION_TRASH_CONVERSATION, { "Delete", "BackSpace" });
         add_window_accelerators(ACTION_DELETE_CONVERSATION, { "<Shift>Delete", "<Shift>BackSpace" });
+
+        // Find & search
+        add_window_accelerators(ACTION_FIND_IN_CONVERSATION, { "<Ctrl>F", "slash" });
+        add_window_accelerators(ACTION_SEARCH, { "<Ctrl>S" });
+
+        // Zoom
         add_window_accelerators(ACTION_ZOOM+("('in')"), { "<Ctrl>equal", "<Ctrl>plus" });
         add_window_accelerators(ACTION_ZOOM+("('out')"), { "<Ctrl>minus" });
         add_window_accelerators(ACTION_ZOOM+("('normal')"), { "<Ctrl>0" });
-        add_window_accelerators(ACTION_SEARCH, { "<Ctrl>S" });
+
+        // Navigation
         add_window_accelerators(ACTION_CONVERSATION_LIST, { "<Ctrl>B" });
         add_window_accelerators(ACTION_CONVERSATION_UP, { "<Ctrl>bracketleft", "K" });
         add_window_accelerators(ACTION_CONVERSATION_DOWN, { "<Ctrl>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 @@
                         <child>
                             <object class="GtkShortcutsShortcut">
                                 <property name="visible">True</property>
-                                <property name="title" translatable="yes" context="shortcut 
window">Mark/un-mark read</property>
-                                <property name="accelerator">&lt;primary&gt;U &lt;primary&gt;I</property>
+                                <property name="title" translatable="yes" context="shortcut 
window">Un-mark/mark read</property>
+                                <property name="accelerator">&lt;primary&gt;U 
&lt;primary&gt;&lt;Shift&gt;U</property>
                             </object>
                         </child>
                         <child>
                             <object class="GtkShortcutsShortcut">
                                 <property name="visible">True</property>
                                 <property name="title" translatable="yes" context="shortcut 
window">Mark/un-mark starred</property>
-                                <property name="accelerator">&lt;primary&gt;S &lt;primary&gt;D</property>
+                                <property name="accelerator">&lt;primary&gt;D 
&lt;primary&gt;&lt;Shift&gt;D</property>
                             </object>
                         </child>
                         <child>
                             <object class="GtkShortcutsShortcut">
                                 <property name="visible">True</property>
                                 <property name="title" translatable="yes" context="shortcut window">Archive 
conversation</property>
-                                <property name="accelerator">&lt;primary&gt;A</property>
+                                <property name="accelerator">&lt;primary&gt;K</property>
                             </object>
                         </child>
                         <child>
@@ -91,7 +91,8 @@
                         <child>
                             <object class="GtkShortcutsShortcut">
                                 <property name="visible">True</property>
-                                <property name="title" translatable="yes" context="shortcut 
window">Delete</property>
+                                <property name="title"
+                                          translatable="yes" context="shortcut window">Delete 
conversation</property>
                                 <property name="accelerator">&lt;Shift&gt;Delete &lt;Shift&gt;Back</property>
                             </object>
                         </child>
@@ -116,8 +117,7 @@
                             </object>
                         </child>
                         <!--
-                             The following two aren't curently
-                             supported.
+                             The following two aren't currently supported.
                         <child>
                             <object class="GtkShortcutsShortcut">
                                 <property name="visible">True</property>
@@ -388,7 +388,7 @@
                                 <property name="visible">True</property>
                                 <property name="title"
                                           translatable="yes" context="shortcut window">Move selection to the 
clipboard</property>
-                                <property name="accelerator">&lt;primary&gt;C</property>
+                                <property name="accelerator">&lt;primary&gt;X</property>
                             </object>
                         </child>
                         <child>