F1 on Win/*nix, Help key on Mac doesn't bring up Help. r=mconnor

This commit is contained in:
steffen.wilberg%web.de 2004-07-19 14:14:14 +00:00
parent a4eaf4742f
commit 6b7dd74605
2 changed files with 20 additions and 8 deletions

View File

@ -43,14 +43,25 @@
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
<keyset id="keys">
<key id="key_openHelp" keycode="&openHelp.commandkey;"
#ifdef MOZ_PHOENIX
oncommand="openHelp('firefox-help');"
#elifdef MOZ_THUNDERBIRD
oncommand="openHelp('smtp-docs','chrome://help/locale/thunderbirdhelp.rdf');"
# Use the Thunderbird content pack if we're building thunderbird. Otherwise use the Firefox content
# pack. We should use else instead of elseif to prevent build errors if MOZ_PHOENIX and MOZ_THUNDERBIRD
# are not built.
# These keyset ids have to be used to show the key shortcut in the menu
#ifdef MOZ_THUNDERBIRD
<keyset id="mailKeys">
<key id="key_openHelp"
oncommand="openHelp('smtp-docs','chrome://help/locale/thunderbirdhelp.rdf');"
#else
<keyset id="mainKeyset">
<key id="key_openHelp"
oncommand="openHelp('firefox-help');"
#endif
# VK_HELP doesn't work on other platforms yet
#ifdef XP_MACOSX
keycode="&openHelpMac.commandkey;"/>
#else
keycode="&openHelp.commandkey;"/>
#endif
modifiers="accel"/>
</keyset>
<menupopup id="menu_HelpPopup">

View File

@ -41,5 +41,6 @@
<!ENTITY helpContents.accesskey "H">
<!ENTITY helpForIEUsers.label "For Internet Explorer Users">
<!ENTITY helpForIEUsers.accesskey "I">
<!ENTITY openHelp.commandkey "VK_HELP">
<!ENTITY openHelp.commandkey "VK_F1">
<!ENTITY openHelpMac.commandkey "VK_HELP">