Bug 432380: Remove openHelpMac.commandkey and hardcode modifiers. r=gavin
authorSteffen Wilberg <steffen.wilberg@web.de>
Sat, 18 Apr 2009 20:49:22 +0200
changeset 27536 30c742669856ac171b3df5e231c9b592254a8153
parent 27535 738052b475e20a2b319329689d270d95a311dd9e
child 27537 e32b47617afddec946fc88e131ec81a82f20a47c
push id6603
push userdgottwald@mozilla.com
push dateMon, 20 Apr 2009 18:10:53 +0000
treeherdermozilla-central@e32b47617afd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs432380
milestone1.9.2a1pre
Bug 432380: Remove openHelpMac.commandkey and hardcode modifiers. r=gavin
browser/base/content/baseMenuOverlay.xul
browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd
--- a/browser/base/content/baseMenuOverlay.xul
+++ b/browser/base/content/baseMenuOverlay.xul
@@ -75,17 +75,17 @@
           label="&helpMenu.label;"
           accesskey="&helpMenu.accesskey;">
 #endif
       <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
         <menuitem id="menu_openHelp"
                   oncommand="openHelpLink('firefox-help')"
 #ifdef XP_MACOSX
                   label="&helpContentsMac.label;"
-                  key="key_openHelpMacFrontend"/>
+                  key="key_openHelpMac"/>
 #else
                   label="&helpContents.label;"
                   accesskey="&helpContents.accesskey;"
                   key="key_openHelp"/>
 #endif
 # Show IE Users menu item on Windows only
 #ifdef XP_WIN
         <menuitem label="&helpForIEUsers.label;"
@@ -109,30 +109,30 @@
                   accesskey="&aboutCmd.accesskey;"
                   label="&aboutCmd.label;"
                   oncommand="openAboutDialog();"/>
       </menupopup>
     </menu>
 
     <keyset id="baseMenuKeyset">
 #ifdef XP_MACOSX
-        <key id="key_openHelpMacFrontend"
+        <key id="key_openHelpMac"
              oncommand="openHelpLink('firefox-help');"
-             key="&openHelpMac.frontendCommandkey;"
-             modifiers="&openHelpMac.frontendModifiers;"/>
+             key="&helpMac.commandkey;"
+             modifiers="accel"/>
 <!-- These are used to build the Application menu under Cocoa widgets -->
         <key id="key_preferencesCmdMac"
              key="&preferencesCmdMac.commandkey;"
-             modifiers="&preferencesCmdMac.modifiers;"/>
+             modifiers="accel"/>
         <key id="key_hideThisAppCmdMac"
              key="&hideThisAppCmdMac.commandkey;"
-             modifiers="&hideThisAppCmdMac.modifiers;"/>
+             modifiers="accel"/>
         <key id="key_hideOtherAppsCmdMac"
              key="&hideOtherAppsCmdMac.commandkey;"
-             modifiers="&hideOtherAppsCmdMac.modifiers;"/>
+             modifiers="accel,alt"/>
 #else
         <key id="key_openHelp"
             oncommand="openHelpLink('firefox-help');"
             keycode="&openHelp.commandkey;"/>
 #endif
     </keyset>
 
     <stringbundleset id="stringbundleset">
--- a/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd
@@ -13,35 +13,26 @@
 <!ENTITY aboutCmd.label           "About &brandFullName;">
 <!ENTITY aboutCmd.accesskey       "A">
 <!ENTITY helpContents.label       "Help Contents">
 <!ENTITY helpContents.accesskey   "H">
 <!ENTITY helpContentsMac.label    "&brandShortName; Help">
 <!ENTITY helpForIEUsers.label     "For Internet Explorer Users">
 <!ENTITY helpForIEUsers.accesskey "I">
 <!ENTITY openHelp.commandkey      "VK_F1">
-<!-- LOCALIZATION NOTE openHelpMac.commandkey and openHelpMac.modifiers
-                       are all the necessary keys to hit OS X's open-help 
-                       keyboard (visible) shortcut (that's Cmd+? for most locales) -->
-<!ENTITY openHelpMac.commandkey           "/">
-<!ENTITY openHelpMac.modifiers            "accel,shift">
-<!ENTITY openHelpMac.frontendCommandkey   "?">
-<!ENTITY openHelpMac.frontendModifiers    "accel">
+<!ENTITY helpMac.commandkey       "?">
 
 <!ENTITY helpReleaseNotes.label         "Release Notes">
 <!ENTITY helpReleaseNotes.accesskey     "N">
 <!ENTITY updateCmd.label                "Check for Updates…">
 
 <!ENTITY preferencesCmdMac.label        "Preferences…">
 <!ENTITY preferencesCmdMac.commandkey   ",">
-<!ENTITY preferencesCmdMac.modifiers    "accel">
 
 <!ENTITY servicesMenuMac.label          "Services">
 
 <!ENTITY hideThisAppCmdMac.label        "Hide &brandShortName;">
 <!ENTITY hideThisAppCmdMac.commandkey   "H">
-<!ENTITY hideThisAppCmdMac.modifiers    "accel">
 
 <!ENTITY hideOtherAppsCmdMac.label      "Hide Others">
 <!ENTITY hideOtherAppsCmdMac.commandkey "H">
-<!ENTITY hideOtherAppsCmdMac.modifiers  "accel,alt">
 
 <!ENTITY showAllAppsCmdMac.label        "Show All">