Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 409814 - Remove useless VK_HELP key for mac. r=Mano, a=mconnor.

Browse Source
This commit is contained in:
stefanh@inbox.com 2008-01-09 08:46:43 -08:00
parent e9a70fa58f
commit 29be5d1fd9
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
browser/base/content/baseMenuOverlay.xul
View File

@ -112,21 +112,16 @@
</menu>
<keyset id="baseMenuKeyset">
<key id="key_openHelp"
oncommand="openHelp('firefox-help', 'chrome://browser/locale/help/help.rdf');"
# VK_HELP doesn't work on other platforms yet
#ifdef XP_MACOSX
keycode="&openHelpMac.commandkey;"/>
<!-- On mac, we support both the help key and Cmd+?
...Map Cmd+Shift+/, show Cmd+
<!-- On mac, we map Cmd+Shift+/, but show Cmd+?
(that's for en-US, it might be different for other keyboard layouts) -->
<key id="key_openHelpMac"
oncommand="openHelp('firefox-help', 'chrome://browser/locale/help/help.rdf');"
key="&openHelpMac2.commandkey;"
modifiers="&openHelpMac2.modifiers;"/>
key="&openHelpMac.commandkey;"
modifiers="&openHelpMac.modifiers;"/>
<key id="key_openHelpMacFrontend"
key="&openHelpMac2.frontendCommandkey;"
modifiers="&openHelpMac2.frontendModifiers;"/>
key="&openHelpMac.frontendCommandkey;"
modifiers="&openHelpMac.frontendModifiers;"/>
<!-- These are used to build the Application menu under Cocoa widgets -->
<key id="key_preferencesCmdMac"
key="&preferencesCmdMac.commandkey;"
@ -138,7 +133,9 @@
key="&hideOtherAppsCmdMac.commandkey;"
modifiers="&hideOtherAppsCmdMac.modifiers;"/>
#else
keycode="&openHelp.commandkey;"/>
<key id="key_openHelp"
oncommand="openHelp('firefox-help', 'chrome://browser/locale/help/help.rdf');"
keycode="&openHelp.commandkey;"/>
#endif
</keyset>

11
browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd
View File

@ -18,14 +18,13 @@
<!ENTITY helpForIEUsers.label "For Internet Explorer Users">
<!ENTITY helpForIEUsers.accesskey "I">
<!ENTITY openHelp.commandkey "VK_F1">
<!ENTITY openHelpMac.commandkey "VK_HELP">
<!-- LOCALIZATION NOTE openHelpMac2.commandkey and openHelpMac2.modifiers
<!-- 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 openHelpMac2.commandkey "/">
<!ENTITY openHelpMac2.modifiers "accel,shift">
<!ENTITY openHelpMac2.frontendCommandkey "?">
<!ENTITY openHelpMac2.frontendModifiers "accel">
<!ENTITY openHelpMac.commandkey "/">
<!ENTITY openHelpMac.modifiers "accel,shift">
<!ENTITY openHelpMac.frontendCommandkey "?">
<!ENTITY openHelpMac.frontendModifiers "accel">
<!ENTITY helpReleaseNotes.label "Release Notes">
<!ENTITY helpReleaseNotes.accesskey "N">