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

Clean up shortcuts and shortcut docs. Closes Bug 766987.

Browse source 
* src/client/application/geary-controller.vala: Remove prefs and accounts
  shortcuts.

* ui/app_menu.interface: Remove prefs and accounts shortcuts

* help/C/shortcuts.page: Capitalise J/K, remove prefs and accounts
  shortcuts.
This commit is contained in:
Michael James Gratton 2016-05-29 22:24:19 +10:00
parent 244c6ed486
commit 54ba285ab8
3 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
help/C/shortcuts.page
View file

@ -65,11 +65,11 @@
</tr>
<tr>
<td><p>Jump to next (older) conversation</p></td>
<td><p> <keyseq><key>j</key></keyseq> </p></td>
<td><p><keyseq><key>J</key></keyseq></p></td>
</tr>
<tr>
<td><p>Jump to previous (newer) conversation</p></td>
<td><p> <keyseq><key>k</key></keyseq> </p></td>
<td><p><keyseq><key>K</key></keyseq></p></td>
</tr>
<tr>
<td><p>Toggle spam</p></td>
@ -91,14 +91,6 @@
<td><p>Reset zoom</p></td>
<td><p><keyseq><key>Ctrl</key><key>0</key></keyseq> or <key>0</key> </p></td>
</tr>
<tr>
<td><p>Preferences</p></td>
<td><p> <keyseq><key>Ctrl</key><key>E</key></keyseq> </p></td>
</tr>
<tr>
<td><p>Accounts</p></td>
<td><p> <keyseq><key>Ctrl</key><key>M</key></keyseq> </p></td>
</tr>
<tr>
<td><p>Close composer window</p></td>
<td><p> <keyseq><key>Ctrl</key><key>W</key></keyseq> </p></td>

4
src/client/application/geary-controller.vala
View file

@ -369,12 +369,12 @@ public class GearyController : Geary.BaseObject {
private Gtk.ActionEntry[] create_actions() {
Gtk.ActionEntry[] entries = new Gtk.ActionEntry[0];
Gtk.ActionEntry accounts = { ACTION_ACCOUNTS, null, TRANSLATABLE, "<Ctrl>M",
Gtk.ActionEntry accounts = { ACTION_ACCOUNTS, null, TRANSLATABLE, null,
null, on_accounts };
accounts.label = _("A_ccounts");
entries += accounts;
Gtk.ActionEntry prefs = { ACTION_PREFERENCES, Stock._PREFERENCES, TRANSLATABLE, "<Ctrl>E",
Gtk.ActionEntry prefs = { ACTION_PREFERENCES, Stock._PREFERENCES, TRANSLATABLE, null,
null, on_preferences };
prefs.label = _("_Preferences");
entries += prefs;

2
ui/app_menu.interface
View file

@ -4,12 +4,10 @@
<item>
<attribute name='label' translatable='yes'>A_ccounts</attribute>
<attribute name='action'>app.GearyAccounts</attribute>
<attribute name='accel'>&lt;Primary&gt;M</attribute>
</item>
<item>
<attribute name='label' translatable='yes'>_Preferences</attribute>
<attribute name='action'>app.GearyPreferences</attribute>
<attribute name='accel'>&lt;Primary&gt;E</attribute>
</item>
</section>
<section>