Bug 69489 - Keyboard shortcut Cmd+Opt+S for opening/closing sidebar on Mac. r=IanN, sr=Neil, a=mcsmurf for checkin to a CLOSED TREE.
authorstefanh@inbox.com
Sat, 01 Feb 2014 15:29:48 +0100
changeset 15685 45ad1b4359c1ba8f6f515514106e57887817385c
parent 15684 632820fa398b8d5119273331d4b04826a7d5f91e
child 15686 d3290a8c9b4400d6754c4822f1693d5f6c6752ce
push id9831
push userstefanh@inbox.com
push dateSat, 01 Feb 2014 14:30:03 +0000
treeherdercomm-central@45ad1b4359c1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, Neil, mcsmurf
bugs69489
Bug 69489 - Keyboard shortcut Cmd+Opt+S for opening/closing sidebar on Mac. r=IanN, sr=Neil, a=mcsmurf for checkin to a CLOSED TREE.
suite/common/mac/platformCommunicatorOverlay.xul
suite/common/sidebar/sidebarOverlay.xul
suite/common/unix/platformCommunicatorOverlay.xul
suite/common/win/platformCommunicatorOverlay.xul
suite/locales/en-US/chrome/common/help/shortcuts_mailnews.xhtml
suite/locales/en-US/chrome/common/help/shortcuts_navigator.xhtml
suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd
suite/mailnews/addrbook/addressbook.xul
suite/mailnews/mailWindowOverlay.xul
--- a/suite/common/mac/platformCommunicatorOverlay.xul
+++ b/suite/common/mac/platformCommunicatorOverlay.xul
@@ -73,16 +73,22 @@
        key="&findTypeLinksCmd.key;"/>
 
   <menuitem id="menu_printPreview" hidden="true"/>
   <menuitem id="printPreviewMenuItem" hidden="true"/>
   <menuitem id="printPreviewMenuItemToolbar" hidden="true"/>
   <menuitem id="printPreviewAddressBook" hidden="true"/>
   <menuitem id="mailContext-printpreview" hidden="true"/>
 
+  <key id="showHideSidebar" key="&showHideSidebarCmd.key;" modifiers="accel,alt"/>
+
+  <key id="key_toggleDirectoryPane" key="&toggleDirectoryPaneCmd.key;" modifiers="accel,alt"/>
+
+  <key id="key_toggleFolderPane" key="&toggleFolderPaneCmd.key;" modifiers="accel,alt"/>
+
   <!-- Tasks Commands -->
   <commandset id="tasksCommands"> 
     <command id="cmd_minimizeWindow" oncommand="window.minimize();"/>
     <command id="cmd_zoomWindow" oncommand="ZoomCurrentWindow();"/>
   </commandset>
 
   <!-- Tasks Keys -->
   <keyset id="tasksKeys">
--- a/suite/common/sidebar/sidebarOverlay.xul
+++ b/suite/common/sidebar/sidebarOverlay.xul
@@ -48,17 +48,17 @@
                  type="checkbox"
                  group="sidebar"
                  sidebartitle="&sidebar.client-addressbook.label;"
                  sidebarurl="chrome://messenger/content/addressbook/addressbook-panel.xul"
                  oncommand="toggleSidebar('viewAddressbookSidebar');"/>
   </broadcasterset>
 
   <command id="toggleSidebar" oncommand="SidebarShowHide();"/>
-  <key id="showHideSidebar" keycode="VK_F9" command="toggleSidebar"/>
+  <key id="showHideSidebar" command="toggleSidebar"/>
   <menupopup id="sidebarPopup" 
     onpopupshowing="SidebarInitContextMenu(this, document.popupNode);">
     <menuitem id="switch-ctx-item" label="&sidebar.switch.label;" 
               accesskey="&sidebar.switch.accesskey;" default="true" 
               oncommand="SidebarSelectPanel(document.popupNode,false,false);"/>
     <menuitem id="reload-ctx-item" label="&sidebar.reload.label;" 
               accesskey="&sidebar.reload.accesskey;" disabled="true"
               oncommand="SidebarReloadPanel(document.popupNode);"/>
--- a/suite/common/unix/platformCommunicatorOverlay.xul
+++ b/suite/common/unix/platformCommunicatorOverlay.xul
@@ -44,16 +44,22 @@
          command="cmd_find"/>
   </keyset>
   <!-- Find As You Type Keys -->
   <key id="key_findTypeText"
        key="&findTypeTextCmd.key;"/>
   <key id="key_findTypeLinks"
        key="&findTypeLinksCmd.key;"/>
 
+  <key id="showHideSidebar" keycode="VK_F9"/>
+
+  <key id="key_toggleDirectoryPane" keycode="VK_F9"/>
+
+  <key id="key_toggleFolderPane" keycode="VK_F9"/>
+
   <!-- Tasks Keys -->
   <keyset id="tasksKeys">
     <key id="key_openHelp"
          keycode="&openHelpCmd.key;"
          command="cmd_openHelp"/>
   </keyset>
 
 </overlay>    
--- a/suite/common/win/platformCommunicatorOverlay.xul
+++ b/suite/common/win/platformCommunicatorOverlay.xul
@@ -38,16 +38,23 @@
   <!-- Delete Key -->
   <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
 
   <!-- Find As You Type Keys -->
   <key id="key_findTypeText"
        key="&findTypeTextCmd.key;"/>
   <key id="key_findTypeLinks"
        key="&findTypeLinksCmd.key;"/>
+
+  <key id="showHideSidebar" keycode="VK_F9"/>
+
+  <key id="key_toggleDirectoryPane" keycode="VK_F9"/>
+
+  <key id="key_toggleFolderPane" keycode="VK_F9"/>
+
 #ifdef XP_WIN
   <menupopup id="helpPopup">
       <menuitem label="&helpForIEUsers.label;" accesskey="&helpForIEUsers.accesskey;" insertafter="help"
                 oncommand="openHelp('ieusers', 'chrome://communicator/locale/help/suitehelp.rdf');"/>
   </menupopup>
 #endif
 
   <!-- Tasks Keys -->
--- a/suite/locales/en-US/chrome/common/help/shortcuts_mailnews.xhtml
+++ b/suite/locales/en-US/chrome/common/help/shortcuts_mailnews.xhtml
@@ -65,17 +65,17 @@
     <td>Toggle Message Pane Visibility</td>
     <td>F8</td>
     <td>F8</td>
     <td>F8</td>
   </tr>
   <tr>
     <td>Toggle Folder Pane Visibility</td>
     <td>F9</td>
-    <td/>
+    <td>Cmd+Opt+S</td>
     <td>F9</td>
   </tr>
   <tr>
     <td>New Message</td>
     <td>Ctrl+M</td>
     <td>Cmd+Shift+M</td>
     <td>Ctrl+M</td>
   </tr>
--- a/suite/locales/en-US/chrome/common/help/shortcuts_navigator.xhtml
+++ b/suite/locales/en-US/chrome/common/help/shortcuts_navigator.xhtml
@@ -457,17 +457,17 @@
     <th>Mac OS</th>
     <th>Linux or Unix</th>
   </tr>
 </thead>
 <tbody class="tbody-default">
   <tr>
     <td>Open/Close Sidebar (toggle)</td>
     <td>F9</td>
-    <td/>
+    <td>Cmd+Opt+S</td>
     <td>F9</td>
   </tr>
   <tr>
     <td>Switch to Next Sidebar Panel</td>
     <td>Alt+Page Down</td>
     <td>Opt+Page Down</td>
     <td>Alt+Page Down</td>
   </tr>
@@ -494,17 +494,17 @@
     <th>Command</th>
     <th>Windows</th>
     <th>Mac OS</th>
     <th>Linux or Unix</th>
   </tr>
 </thead>
 <tbody class="tbody-default">
   <tr>
-    <td> Move to Next/Previous Item in Form</td>
+    <td>Move to Next/Previous Item in Form</td>
     <td>Tab/Shift+Tab</td>
     <td>Tab/Shift+Tab</td>
     <td>Tab/Shift+Tab</td>
   </tr>
   <tr>
     <td>Submit Form</td>
     <td>Enter</td>
     <td>Return</td>
--- a/suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd
@@ -26,17 +26,23 @@
 <!-- End of Application menu -->
 
 <!ENTITY closeCmd.label                 "Close">  
 <!ENTITY closeCmd.key                   "W">  
 
 <!ENTITY printSetupCmd.label            "Page Setup…">
 <!ENTITY printSetupCmd.accesskey        "u">
 
-<!ENTITY redoCmd.key                    "Z">  
+<!ENTITY redoCmd.key                    "Z">
+
+<!-- Keys for toggling Sidebar, Folder Pane in mailNews and Directory Pane in
+  Address Book -->
+<!ENTITY showHideSidebarCmd.key         "S">
+<!ENTITY toggleFolderPaneCmd.key        "S">
+<!ENTITY toggleDirectoryPaneCmd.key     "S">
 
 <!ENTITY historyCmd.key                 "H">  
 
 <!ENTITY findTypeTextCmd.key            "">
 <!ENTITY findTypeLinksCmd.key           "">
 
 <!ENTITY accel.emacs_conflict           "accel">
 
--- a/suite/mailnews/addrbook/addressbook.xul
+++ b/suite/mailnews/addrbook/addressbook.xul
@@ -124,16 +124,19 @@
   <key id="key_undo"/>
   <key id="key_redo"/>
   <key id="key_cut"/>
   <key id="key_copy"/>
   <key id="key_paste"/>
   <key id="key_selectAll"/>
   <key id="key_properties" key="&propertiesCmd.key;" command="cmd_properties" modifiers="accel"/>
 
+  <!-- View Menu -->
+  <key id="key_toggleDirectoryPane" oncommand="togglePaneSplitter('dirTree-splitter');"/>
+
   <!-- Tab/F6 Keys -->
   <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
   <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
   <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
   <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
   <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="shift"/>
   <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);"/>
 
@@ -299,16 +302,17 @@
             </menu>
             <menu id="menu_Layout"
                   label="&layoutMenu.label;"
                   accesskey="&layoutMenu.accesskey;">
               <menupopup id="view_layout_popup"
                          onpopupshowing="InitViewLayoutMenuPopup(event);">
                 <menuitem id="menu_showDirectoryPane"
                           label="&showDirectoryPane.label;"
+                          key="key_toggleDirectoryPane"
                           accesskey="&showDirectoryPane.accesskey;"
                           oncommand="togglePaneSplitter('dirTree-splitter');"
                           checked="true"
                           type="checkbox"/>
                 <menuitem id="menu_showCardPane"
                           label="&showContactPane2.label;"
                           accesskey="&showContactPane2.accesskey;"
                           oncommand="togglePaneSplitter('results-splitter');"
--- a/suite/mailnews/mailWindowOverlay.xul
+++ b/suite/mailnews/mailWindowOverlay.xul
@@ -371,19 +371,18 @@
   <!-- Tab/F6 Keys -->
   <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
   <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
   <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
   <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
   <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="shift"/>
   <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);"/>
 
-  <!-- View Toggle Keys (F8/F9) -->
+  <!-- View Toggle Keys -->
   <key id="key_toggleFolderPane"
-       keycode="VK_F9"
        oncommand="MsgToggleFolderPane(true);"
        observes="mailDisableKeys"/>
   <key id="key_toggleThreadPane"
        keycode="VK_F8"
        modifiers="shift"
        oncommand="MsgToggleThreadPane();"
        disabled="true"/>
   <key id="key_toggleMessagePane"