[geary] Clean up shortcuts and shortcut docs. Closes Bug 766987.



commit 54ba285ab8df9dcedb9b84419a295068d8e57b11
Author: Michael James Gratton <mike vee net>
Date:   Sun May 29 22:24:19 2016 +1000

    Clean up shortcuts and shortcut docs. Closes Bug 766987.
    
    * 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.

 help/C/shortcuts.page                        |   12 ++----------
 src/client/application/geary-controller.vala |    4 ++--
 ui/app_menu.interface                        |    2 --
 3 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/help/C/shortcuts.page b/help/C/shortcuts.page
index 3530968..ea69163 100644
--- a/help/C/shortcuts.page
+++ b/help/C/shortcuts.page
@@ -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>
@@ -92,14 +92,6 @@
                <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>
        </tr>
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index bf7a981..25d7642 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -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;
diff --git a/ui/app_menu.interface b/ui/app_menu.interface
index 77329a3..9c40ec0 100644
--- a/ui/app_menu.interface
+++ b/ui/app_menu.interface
@@ -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>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]