nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix conflicting keyboard shortcuts and update overlay

Browse source 
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.
This commit is contained in:
Michael Gratton 2019-08-18 21:02:41 +10:00
parent 90016b8ae6
commit 2f36221b7a
2 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/client/application/application-controller.vala
View file

@ -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" });

16
ui/gtk/help-overlay.ui
View file

@ -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>