[geary/mjog/shortcut-updates: 3/4] ui/gtk/help-overlay.ui: Reorganise so most needed shortcuts are first

From: Michael Gratton <mjog src gnome org>
To: commits-list gnome org
Cc:
Subject: [geary/mjog/shortcut-updates: 3/4] ui/gtk/help-overlay.ui: Reorganise so most needed shortcuts are first
Date: Fri, 8 Jan 2021 06:57:50 +0000 (UTC)

commit 600be0d5f4354eec2d31dc7b64d622b35dd84802
Author: Michael Gratton <mike vee net>
Date:   Wed Jan 6 21:43:00 2021 +1100

    ui/gtk/help-overlay.ui: Reorganise so most needed shortcuts are first
    
    Make the section order: Conversations > Composer > Application >
    Single-key.

 ui/gtk/help-overlay.ui | 244 ++++++++++++++++++++++++-------------------------
 1 file changed, 122 insertions(+), 122 deletions(-)
---
diff --git a/ui/gtk/help-overlay.ui b/ui/gtk/help-overlay.ui
index e0caa52f5..af6574517 100644
--- a/ui/gtk/help-overlay.ui
+++ b/ui/gtk/help-overlay.ui
@@ -186,280 +186,290 @@
     <child>
       <object class="GtkShortcutsSection">
         <property name="visible">True</property>
-        <property name="section-name">application</property>
-        <property name="title" translatable="yes">Application Shortcuts</property>
+        <property name="section-name">composer</property>
+        <property name="title" translatable="yes">Composer Shortcuts</property>
         <child>
           <object class="GtkShortcutsGroup">
             <property name="visible">True</property>
-            <property name="title" translatable="yes" context="shortcut window">General</property>
+            <property name="title" translatable="yes" context="shortcut window">Actions</property>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Show help</property>
-                <property name="accelerator">F1</property>
+                <property name="title" translatable="yes" context="shortcut window">Send</property>
+                <property name="accelerator">&lt;primary&gt;Return</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Show keyboard 
shortcuts</property>
-                <property name="accelerator">&lt;Primary&gt;question</property>
+                <property name="title" translatable="yes" context="shortcut window">Add attachment</property>
+                <property name="accelerator">&lt;primary&gt;T</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Open a new 
window</property>
-                <property name="accelerator">&lt;primary&gt;&lt;Shift&gt;N</property>
+                <property name="title" translatable="yes" context="shortcut window">Detach the 
composer</property>
+                <property name="accelerator">&lt;primary&gt;D</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">True</property>
+            <property name="title" translatable="yes" context="shortcut window">General</property>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Close the current 
window</property>
-                <property name="accelerator">&lt;primary&gt;W</property>
+                <property name="title" translatable="yes" context="shortcut window">Close composer 
window</property>
+                <property name="accelerator">&lt;primary&gt;W Escape</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Quit the 
application</property>
-                <property name="accelerator">&lt;primary&gt;Q</property>
+                <property name="title" translatable="yes" context="shortcut window">Detach composer 
window</property>
+                <property name="accelerator">&lt;primary&gt;D</property>
               </object>
             </child>
           </object>
-        </child>
-        <child>
           <object class="GtkShortcutsGroup">
             <property name="visible">True</property>
-            <property name="title" translatable="yes" context="shortcut window">Keyboard 
navigation</property>
+            <property name="title" translatable="yes" context="shortcut window">Editing</property>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Go to next/previous 
pane</property>
-                <property name="accelerator">&lt;Alt&gt;Right &lt;Alt&gt;Left</property>
+                <property name="title"
+                          translatable="yes" context="shortcut window">Move selection to the 
clipboard</property>
+                <property name="accelerator">&lt;primary&gt;X</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title"
-                          translatable="yes" context="shortcut window">Select next/previous 
conversation</property>
-                <property name="accelerator">&lt;primary&gt;period &lt;primary&gt;comma</property>
+                <property name="title" translatable="yes" context="shortcut window">Copy selection to 
clipboard</property>
+                <property name="accelerator">&lt;primary&gt;C</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Focus next/previous 
message</property>
-                <property name="accelerator">space &lt;shift&gt;space</property>
+                <property name="title" translatable="yes" context="shortcut window">Paste from the 
clipboard</property>
+                <property name="accelerator">&lt;primary&gt;V</property>
               </object>
             </child>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkShortcutsSection">
-        <property name="visible">True</property>
-        <property name="section-name">single-key</property>
-        <property name="title" translatable="yes">Single-key Shortcuts</property>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
-            <property name="title" translatable="yes"
-                      context="shortcut window">Single-key shortcuts (if enabled)</property>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
+                <property name="title" translatable="yes" context="shortcut window">Quote text</property>
+                <property name="accelerator">&lt;primary&gt;bracketleft</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Reply to sender 
</property>
-                <property name="accelerator">R</property>
+                <property name="title" translatable="yes" context="shortcut window">Unquote text</property>
+                <property name="accelerator">&lt;primary&gt;bracketright</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">True</property>
+            <property name="title" translatable="yes" context="shortcut window">Rich text editing</property>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Reply to all</property>
-                <property name="accelerator">A</property>
+                <property name="title" translatable="yes" context="shortcut window">Paste without 
formatting</property>
+                <property name="accelerator">&lt;primary&gt;&lt;shift&gt;V</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Forward</property>
-                <property name="accelerator">F</property>
+                <property name="title" translatable="yes" context="shortcut window">Bold text</property>
+                <property name="accelerator">&lt;primary&gt;B</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Un-mark/mark 
read</property>
-                <property name="accelerator">&lt;Shift&gt;U &lt;Shift&gt;I</property>
+                <property name="title" translatable="yes" context="shortcut window">Italicize text</property>
+                <property name="accelerator">&lt;primary&gt;I</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">S</property>
+                <property name="title" translatable="yes" context="shortcut window">Underline text</property>
+                <property name="accelerator">&lt;primary&gt;U</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Archive 
conversations</property>
-                <property name="accelerator">E</property>
+                <property name="title" translatable="yes" context="shortcut window">Strike text</property>
+                <property name="accelerator">&lt;primary&gt;K</property>
               </object>
             </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
+                <property name="title" translatable="yes" context="shortcut window">Remove 
formatting</property>
+                <property name="accelerator">&lt;primary&gt;space</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Move 
conversations</property>
-                <property name="accelerator">V</property>
+                <property name="title" translatable="yes" context="shortcut window">Insert an 
image</property>
+                <property name="accelerator">&lt;primary&gt;I</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Label 
conversations</property>
-                <property name="accelerator">L</property>
+                <property name="title" translatable="yes" context="shortcut window">Insert a link</property>
+                <property name="accelerator">&lt;primary&gt;L</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkShortcutsSection">
+        <property name="visible">True</property>
+        <property name="section-name">application</property>
+        <property name="title" translatable="yes">Application Shortcuts</property>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">True</property>
+            <property name="title" translatable="yes" context="shortcut window">General</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
+                <property name="title" translatable="yes" context="shortcut window">Show help</property>
+                <property name="accelerator">F1</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Junk 
conversations</property>
-                <property name="accelerator">exclam</property>
+                <property name="title" translatable="yes" context="shortcut window">Show keyboard 
shortcuts</property>
+                <property name="accelerator">&lt;Primary&gt;question</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Delete 
conversations</property>
-                <property name="accelerator">numbersign</property>
+                <property name="title" translatable="yes" context="shortcut window">Open a new 
window</property>
+                <property name="accelerator">&lt;primary&gt;&lt;Shift&gt;N</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Find in current 
conversation</property>
-                <property name="accelerator">slash</property>
+                <property name="title" translatable="yes" context="shortcut window">Close the current 
window</property>
+                <property name="accelerator">&lt;primary&gt;W</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Select next/previous 
conversations</property>
-                <property name="accelerator">J K</property>
+                <property name="title" translatable="yes" context="shortcut window">Quit the 
application</property>
+                <property name="accelerator">&lt;primary&gt;Q</property>
               </object>
             </child>
           </object>
         </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkShortcutsSection">
-        <property name="visible">True</property>
-        <property name="section-name">composer</property>
-        <property name="title" translatable="yes">Composer Shortcuts</property>
         <child>
           <object class="GtkShortcutsGroup">
             <property name="visible">True</property>
-            <property name="title" translatable="yes" context="shortcut window">Actions</property>
+            <property name="title" translatable="yes" context="shortcut window">Keyboard 
navigation</property>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Send</property>
-                <property name="accelerator">&lt;primary&gt;Return</property>
+                <property name="title" translatable="yes" context="shortcut window">Go to next/previous 
pane</property>
+                <property name="accelerator">&lt;Alt&gt;Right &lt;Alt&gt;Left</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Add attachment</property>
-                <property name="accelerator">&lt;primary&gt;T</property>
+                <property name="title"
+                          translatable="yes" context="shortcut window">Select next/previous 
conversation</property>
+                <property name="accelerator">&lt;primary&gt;period &lt;primary&gt;comma</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Detach the 
composer</property>
-                <property name="accelerator">&lt;primary&gt;D</property>
+                <property name="title" translatable="yes" context="shortcut window">Focus next/previous 
message</property>
+                <property name="accelerator">space &lt;shift&gt;space</property>
               </object>
             </child>
           </object>
         </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkShortcutsSection">
+        <property name="visible">True</property>
+        <property name="section-name">single-key</property>
+        <property name="title" translatable="yes">Single-key Shortcuts</property>
         <child>
           <object class="GtkShortcutsGroup">
             <property name="visible">True</property>
-            <property name="title" translatable="yes" context="shortcut window">General</property>
+            <property name="title" translatable="yes"
+                      context="shortcut window">Single-key shortcuts (if enabled)</property>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Close composer 
window</property>
-                <property name="accelerator">&lt;primary&gt;W Escape</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Detach composer 
window</property>
-                <property name="accelerator">&lt;primary&gt;D</property>
+                <property name="title" translatable="yes" context="shortcut window">Reply to sender 
</property>
+                <property name="accelerator">R</property>
               </object>
             </child>
-          </object>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
-            <property name="title" translatable="yes" context="shortcut window">Editing</property>
             <child>
               <object class="GtkShortcutsShortcut">
                 <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;X</property>
+                <property name="title" translatable="yes" context="shortcut window">Reply to all</property>
+                <property name="accelerator">A</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Copy selection to 
clipboard</property>
-                <property name="accelerator">&lt;primary&gt;C</property>
+                <property name="title" translatable="yes" context="shortcut window">Forward</property>
+                <property name="accelerator">F</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Paste from the 
clipboard</property>
-                <property name="accelerator">&lt;primary&gt;V</property>
+                <property name="title" translatable="yes" context="shortcut window">Un-mark/mark 
read</property>
+                <property name="accelerator">&lt;Shift&gt;U &lt;Shift&gt;I</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Quote text</property>
-                <property name="accelerator">&lt;primary&gt;bracketleft</property>
+                <property name="title" translatable="yes" context="shortcut window">Mark/un-mark 
starred</property>
+                <property name="accelerator">S</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Unquote text</property>
-                <property name="accelerator">&lt;primary&gt;bracketright</property>
+                <property name="title" translatable="yes" context="shortcut window">Archive 
conversations</property>
+                <property name="accelerator">E</property>
               </object>
             </child>
           </object>
@@ -467,61 +477,51 @@
         <child>
           <object class="GtkShortcutsGroup">
             <property name="visible">True</property>
-            <property name="title" translatable="yes" context="shortcut window">Rich text editing</property>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Paste without 
formatting</property>
-                <property name="accelerator">&lt;primary&gt;&lt;shift&gt;V</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Bold text</property>
-                <property name="accelerator">&lt;primary&gt;B</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Italicize text</property>
-                <property name="accelerator">&lt;primary&gt;I</property>
+                <property name="title" translatable="yes" context="shortcut window">Move 
conversations</property>
+                <property name="accelerator">V</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Underline text</property>
-                <property name="accelerator">&lt;primary&gt;U</property>
+                <property name="title" translatable="yes" context="shortcut window">Label 
conversations</property>
+                <property name="accelerator">L</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Strike text</property>
-                <property name="accelerator">&lt;primary&gt;K</property>
+                <property name="title" translatable="yes" context="shortcut window">Junk 
conversations</property>
+                <property name="accelerator">exclam</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Remove 
formatting</property>
-                <property name="accelerator">&lt;primary&gt;space</property>
+                <property name="title" translatable="yes" context="shortcut window">Delete 
conversations</property>
+                <property name="accelerator">numbersign</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Insert an 
image</property>
-                <property name="accelerator">&lt;primary&gt;I</property>
+                <property name="title" translatable="yes" context="shortcut window">Find in current 
conversation</property>
+                <property name="accelerator">slash</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes" context="shortcut window">Insert a link</property>
-                <property name="accelerator">&lt;primary&gt;L</property>
+                <property name="title" translatable="yes" context="shortcut window">Select next/previous 
conversations</property>
+                <property name="accelerator">J K</property>
               </object>
             </child>
           </object>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]