[geary/wip/update-shortcuts: 3/6] Update keyboard shortcut overlay
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/update-shortcuts: 3/6] Update keyboard shortcut overlay
- Date: Sun, 21 Jul 2019 15:26:53 +0000 (UTC)
commit 0fa5ac7fa670aca84b3402f8345c49784798d162
Author: Michael Gratton <mike vee net>
Date: Mon Jul 22 00:15:38 2019 +1000
Update keyboard shortcut overlay
Reorganise and reword a bit, ensure all shortcuts are present (including
Undo), try to make more compact to fit on narrrow displays.
See #257, 447
ui/gtk/help-overlay.ui | 309 ++++++++++++++++++++++++++++++++++++-------------
1 file changed, 228 insertions(+), 81 deletions(-)
---
diff --git a/ui/gtk/help-overlay.ui b/ui/gtk/help-overlay.ui
index be856c1e..2ec893d9 100644
--- a/ui/gtk/help-overlay.ui
+++ b/ui/gtk/help-overlay.ui
@@ -10,54 +10,89 @@
<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">Move
focus to the next/previous pane</property>
- <property name="accelerator">F6 <Shift>F6</property>
+ <property name="title" translatable="yes" context="shortcut window">New
conversation</property>
+ <property name="accelerator"><primary>N</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Move
focus to conversation list</property>
- <property name="accelerator"><primary>B</property>
+ <property name="title" translatable="yes" context="shortcut window">Reply to
sender</property>
+ <property name="accelerator"><primary>R</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"><primary>D</property>
+ <property name="title" translatable="yes" context="shortcut window">Reply to
all</property>
+ <property name="accelerator"><primary><Shift>R</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Close
composer window</property>
- <property name="accelerator"><primary>W Escape</property>
+ <property name="title" translatable="yes" context="shortcut
window">Forward</property>
+ <property name="accelerator"><primary>L</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"><Primary>F1
<Primary>question</property>
+ <property name="title" translatable="yes" context="shortcut
window">Mark/un-mark read</property>
+ <property name="accelerator"><primary>U <primary>I</property>
</object>
</child>
<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">Mark/un-mark starred</property>
+ <property name="accelerator"><primary>S <primary>D</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"><primary>Q</property>
+ <property name="title" translatable="yes" context="shortcut window">Archive
conversation</property>
+ <property name="accelerator"><primary>A</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes" context="shortcut window">Move
conversation</property>
+ <property name="accelerator"><primary>M</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes" context="shortcut window">Label
conversation</property>
+ <property name="accelerator"><primary>L</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes" context="shortcut window">Trash
conversation</property>
+ <property name="accelerator">Delete Back</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes" context="shortcut window">Move to
Spam</property>
+ <property name="accelerator"><primary>J</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes" context="shortcut
window">Delete</property>
+ <property name="accelerator"><Shift>Delete <Shift>Back</property>
</object>
</child>
</object>
@@ -69,7 +104,7 @@
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Jump to
search box</property>
+ <property name="title" translatable="yes" context="shortcut window">Search
for conversations</property>
<property name="accelerator"><primary>S</property>
</object>
</child>
@@ -80,122 +115,151 @@
<property name="accelerator"><primary>F</property>
</object>
</child>
+ <!--
+ The following two aren't curently
+ supported.
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Find
next/previous in current conversation</property>
- <property name="accelerator"><primary>G
<primary><Shift>G</property>
+ <property name="title" translatable="yes" context="shortcut window">Find
next in current conversation</property>
+ <property name="accelerator"><primary>G</property>
</object>
</child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes" context="shortcut window">Find
previous in current conversation</property>
+ <property name="accelerator"><primary><Shift>G</property>
+ </object>
+ </child>
+ -->
</object>
</child>
<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">Undo</property>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Compose
a new message</property>
- <property name="accelerator"><primary>N</property>
+ <property name="title" translatable="yes" context="shortcut window">Undo the
last action</property>
+ <property name="accelerator"><primary>Z</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"><primary>R R</property>
+ <property name="title" translatable="yes" context="shortcut window">Redo the
last action</property>
+ <property name="accelerator"><primary><Shift>Z</property>
</object>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsGroup">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes" context="shortcut window">View</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"><primary><Shift>R
<Shift>R</property>
+ <property name="title" translatable="yes" context="shortcut window">Zoom
in</property>
+ <property name="accelerator"><primary>plus</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"><primary>L F</property>
+ <property name="title" translatable="yes" context="shortcut window">Zoom
out</property>
+ <property name="accelerator"><primary>minus</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut
window">Archive</property>
- <property name="accelerator">A</property>
+ <property name="title" translatable="yes" context="shortcut window">Reset
zoom</property>
+ <property name="accelerator"><primary>0</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">Move to
trash</property>
- <property name="accelerator">Delete Back</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">Toggle
spam</property>
- <property name="accelerator"><primary>J exclam</property>
+ <property name="title" translatable="yes" context="shortcut window">Show
keyboard shortcuts</property>
+ <property name="accelerator"><Primary>question</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Move the
conversation</property>
- <property name="accelerator">M</property>
+ <property name="title" translatable="yes" context="shortcut window">Close
current window</property>
+ <property name="accelerator"><primary>W</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Label
the conversation</property>
- <property name="accelerator">L</property>
+ <property name="title" translatable="yes" context="shortcut window">Quit the
application</property>
+ <property name="accelerator"><primary>Q</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>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Mark
read</property>
- <property name="accelerator"><primary>I <Shift>I</property>
+ <property name="title" translatable="yes" context="shortcut window">Focus
the next pane</property>
+ <property name="accelerator">F6</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Mark
unread</property>
- <property name="accelerator"><primary>U <Shift>U</property>
+ <property name="title" translatable="yes" context="shortcut window">Focus
the previous pane</property>
+ <property name="accelerator"><Shift>F6</property>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkShortcutsGroup">
- <property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">View</property>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Zoom
in</property>
- <property name="accelerator"><primary>equal equal</property>
+ <property name="title" translatable="yes" context="shortcut window">Focus
the conversation list</property>
+ <property name="accelerator"><primary>B</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Zoom
out</property>
- <property name="accelerator"><primary>minus minus</property>
+ <property name="title" translatable="yes" context="shortcut window">Select
next conversation down</property>
+ <property name="accelerator">J</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Reset
zoom</property>
- <property name="accelerator"><primary>0 0</property>
+ <property name="title" translatable="yes" context="shortcut window">Select
previous conversation up</property>
+ <property name="accelerator">K</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 <shift>space</property>
</object>
</child>
</object>
@@ -203,43 +267,72 @@
<child>
<object class="GtkShortcutsGroup">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Additional
Shortcuts</property>
+ <property name="title" translatable="yes"
+ context="shortcut window">Single-key shortcuts</property>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut
window">Star</property>
- <property name="accelerator">S</property>
+ <property name="title" translatable="yes" context="shortcut window">Reply to
sender </property>
+ <property name="accelerator">R</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut
window">Unstar</property>
- <property name="accelerator">D</property>
+ <property name="title" translatable="yes" context="shortcut window">Reply to
all</property>
+ <property name="accelerator"><Shift>R</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut
window">Delete</property>
- <property name="accelerator"><Shift>Delete <Shift>Back</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">Jump to
next (older) conversation</property>
- <property name="accelerator">J</property>
+ <property name="title" translatable="yes" context="shortcut
window">Mark/un-mark read</property>
+ <property name="accelerator"><Shift>I <Shift>U</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Jump to
previous (newer) conversation</property>
- <property name="accelerator">K</property>
+ <property name="title" translatable="yes" context="shortcut
window">Mark/un-mark starred</property>
+ <property name="accelerator">S D</property>
</object>
</child>
- </object>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes" context="shortcut window">Archive
conversation</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">Move
conversation</property>
+ <property name="accelerator">M</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes" context="shortcut window">Label
conversation</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">Move to
Spam</property>
+ <property name="accelerator">exclam</property>
+ </object>
+ </child>
+ </object>
</child>
</object>
</child>
@@ -251,19 +344,19 @@
<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">Quote
text</property>
- <property name="accelerator"><primary>bracketleft</property>
+ <property name="title" translatable="yes" context="shortcut
window">Send</property>
+ <property name="accelerator"><primary>Return</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"><primary>bracketright</property>
+ <property name="title" translatable="yes" context="shortcut window">Add
attachment</property>
+ <property name="accelerator"><primary>T</property>
</object>
</child>
</object>
@@ -271,19 +364,59 @@
<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">General</property>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut
window">Send</property>
- <property name="accelerator"><primary>Return</property>
+ <property name="title" translatable="yes" context="shortcut window">Close
composer window</property>
+ <property name="accelerator"><primary>W Escape</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"><primary>T</property>
+ <property name="title" translatable="yes" context="shortcut window">Detach
composer window</property>
+ <property name="accelerator"><primary>D</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"><primary>C</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"><primary>C</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"><primary>V</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"><primary>bracketleft</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"><primary>bracketright</property>
</object>
</child>
</object>
@@ -291,7 +424,14 @@
<child>
<object class="GtkShortcutsGroup">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Rich text
mode</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"><primary><shift>V</property>
+ </object>
+ </child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
@@ -323,15 +463,22 @@
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Insert a
link</property>
- <property name="accelerator"><primary>L</property>
+ <property name="title" translatable="yes" context="shortcut window">Remove
formatting</property>
+ <property name="accelerator"><primary>space</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"><primary>space</property>
+ <property name="title" translatable="yes" context="shortcut window">Insert
an image</property>
+ <property name="accelerator"><primary>I</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"><primary>L</property>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]