Bug 88739 F1 on Win/*nix, Cmd+? on Mac key doesn't bring up help

p=stefan_h@hem.utfors.se r=brade sr=neil.parkwaycc.co.uk a=asa

extensions/help/resources/content/helpMenuOverlay.xul

@@ -17,11 +17,16 @@
     <menuitem label="&openHelpCmd.label;" 
       accesskey="&openHelpCmd.accesskey;" 
       position="1" id="help"
-      oncommand="openHelp();" />   
+      key="key_openHelp"
+      command="cmd_openHelp"/>
     <menuitem label="&helpForIEUsers.label;"
       accesskey="&helpForIEUsers.accesskey;"
       position="2"
       oncommand="openHelp('ieusers');" />
   </menupopup>
   
+  <commandset id="tasksCommands">
+    <command id="cmd_openHelp" oncommand="openHelp();"/>
+  </commandset>
+
 </overlay>

extensions/help/resources/locale/en-US/shortcuts.xhtml

@@ -258,6 +258,12 @@
     <td>Cmd+6</td>
     <td>Ctrl+6</td>
   </tr>
+  <tr>
+    <td>Open Help Window</td>
+    <td>F1</td>
+    <td>Cmd+? or Help Key</td>
+    <td>F1</td>
+  </tr>
 </tbody>
 </table>
 
@@ -333,7 +339,7 @@
 </tbody>
 </table>
 
-<p>Copyright &copy; 2003-2004 The Mozilla Foundation.</p>
+<p>Copyright &copy; 2003-2005 The Mozilla Foundation.</p>
 
 </body>
 </html>

xpfe/browser/resources/content/viewSourceOverlay.xul

@@ -111,6 +111,9 @@
     <key id="key_reload"  key="&reloadCmd.commandkey;" oncommand="BrowserReload();" modifiers="accel"/>
     <key key="&reloadCmd.commandkey;" oncommand="BrowserReloadSkipCache();" modifiers="accel,shift"/>
     <keyset id="viewZoomKeys"/>
+
+    <!-- Window Menu -->
+    <keyset id="tasksKeys"/>
   </keyset>
 
   <!-- context menu -->
@@ -194,6 +197,8 @@
         </menupopup>
       </menu>
 
+      <menu id="windowMenu"/>
+
       <menu id="menu_Help"/>
     </menubar>  
   </toolbox>

xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul

@@ -72,6 +72,21 @@
          command="cmd_minimizeWindow"
          key="&minimizeWindowCmd.key;"
          modifiers="accel"/>
+
+  <!-- Standard OS X shortcut for opening Help (Cmd+? on most locales), visible
+    in the Help menu (if there's a Help viewer) -->
+    <key id="key_openHelp"
+         key="&openHelpFrontend.key;"
+         modifiers="&openHelpFrontend.modifiers;"/>
+
+  <!-- The Shift key is needed for the "?", thus we need openHelpCmd.key and
+    openHelpCmd.modifiers for the mapping -->
+    <key key="&openHelpCmd.key;"
+         modifiers="&openHelpCmd.modifiers;"
+         command="cmd_openHelp"/>
+
+    <key keycode="&openHelp2Cmd.key;"
+         command="cmd_openHelp"/>
   </keyset>
 
   <!-- Window menu -->

xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul

@@ -41,4 +41,11 @@
   <key id="key_findTypeLinks"
        key="&findTypeLinksCmd.key;"/>
 
+  <!-- Tasks Keys -->
+  <keyset id="tasksKeys">
+    <key id="key_openHelp"
+         keycode="&openHelpCmd.key;"
+         command="cmd_openHelp"/>
+  </keyset>
+
 </overlay>    

xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul

@@ -42,4 +42,11 @@
   <key id="key_findTypeLinks"
        key="&findTypeLinksCmd.key;"/>
 
+  <!-- Tasks Keys -->
+  <keyset id="tasksKeys">
+    <key id="key_openHelp"
+         keycode="&openHelpCmd.key;"
+         command="cmd_openHelp"/>
+  </keyset>
+
 </overlay>    

xpfe/communicator/resources/locale/en-US/mac/platformCommunicatorOverlay.dtd

@@ -27,3 +27,13 @@
 <!-- Help viewer -->
 <!ENTITY openHelpCmd.label          "&brandShortName; Help">
 <!ENTITY openHelpCmd.accesskey      "H">
+
+<!-- LOCALIZATION NOTE: openHelpFrontend.key and openHelpFrontend.modifiers
+  will show the standard OS X shortcut (Cmd+? on most locales) in the Help
+  menu. To make the shortcut work, mapping (Cmd+Shift+/ on en-US) is done with
+  openHelpCmd.key and openHelpCmd.modifiers. -->
+<!ENTITY openHelpFrontend.key       "?">
+<!ENTITY openHelpFrontend.modifiers "accel">
+<!ENTITY openHelpCmd.key            "/">
+<!ENTITY openHelpCmd.modifiers      "accel,shift">
+<!ENTITY openHelp2Cmd.key           "VK_HELP">

xpfe/communicator/resources/locale/en-US/unix/platformCommunicatorOverlay.dtd

@@ -21,3 +21,4 @@
 <!-- Help viewer -->
 <!ENTITY openHelpCmd.label          "Help Contents">
 <!ENTITY openHelpCmd.accesskey      "H">
+<!ENTITY openHelpCmd.key            "VK_F1">

xpfe/communicator/resources/locale/en-US/win/platformCommunicatorOverlay.dtd

@@ -22,3 +22,4 @@
 <!-- Help viewer -->
 <!ENTITY openHelpCmd.label              "Help Contents">
 <!ENTITY openHelpCmd.accesskey          "H">
+<!ENTITY openHelpCmd.key                "VK_F1">