context sensitive help, sr=blake, a=asa, r=sfraser, b=46226, part2

This commit is contained in:
oeschger%netscape.com 2001-06-19 22:40:56 +00:00
parent ecee63effb
commit bfdc2fc6ad
11 changed files with 124 additions and 2 deletions

View File

@ -22,6 +22,7 @@ comm.jar:
content/communicator/pref/pref-cache.xul (prefwindow/resources/content/pref-cache.xul)
content/communicator/pref/pref-colors.js (prefwindow/resources/content/pref-colors.js)
content/communicator/pref/pref-colors.xul (prefwindow/resources/content/pref-colors.xul)
content/communicator/pref/pref-help.js (prefwindow/resources/content/pref-help.js)
content/communicator/pref/pref-themes.xul (prefwindow/resources/content/pref-themes.xul)
content/communicator/pref/pref-themes.js (prefwindow/resources/content/pref-themes.js)
content/communicator/pref/pref-charset.js (prefwindow/resources/content/pref-charset.js)

View File

@ -21,6 +21,7 @@ pref-debug2.xul
pref-download.xul
pref-fonts.xul
pref-fonts.js
pref-help.js
pref-history.xul
pref-languages.xul
pref-languages-add.xul

View File

@ -51,6 +51,7 @@ CHROME_CONTENT = \
.\pref-calibrate-screen.xul \
.\pref-fonts.js \
.\pref-history.xul \
.\pref-help.js \
.\pref-languages.xul \
.\pref-languages-add.xul \
.\pref-languages.js \

View File

@ -0,0 +1,55 @@
var gHelpURL = 'chrome://help/content/help.xul';
// these are keys for resolving the preferences dialog subframe
// in terms of the context-sensitive help that should be loaded
// from the help button. The "?mail_prefs_display" things given
// here represent (for the help window itself) the help content.
var fm = {
"chrome://communicator/content/pref/pref-appearance.xul": "?appearance_pref_appearance",
"chrome://communicator/content/pref/pref-fonts.xul": "?appearance_pref_fonts",
"chrome://communicator/content/pref/pref-colors.xul": "?appearance_pref_colors",
"chrome://communicator/content/pref/pref-themes.xul": "?appearance_pref_themes",
"chrome://communicator/content/pref/pref-navigator.xul": "?navigator_pref_navigator",
"chrome://communicator/content/pref/pref-history.xul": "?navigator_pref_history",
"chrome://communicator/content/pref/pref-languages.xul": "?navigator_pref_languages",
"chrome://communicator/content/pref/pref-applications.xul": "?navigator_pref_helper_applications",
"chrome://communicator/content/pref/pref-search.xul": "?navigator_pref_internet_searching",
"chrome://messenger/content/pref-mailnews.xul": "?mail_prefs_general",
"chrome://messenger/content/pref-viewing_messages.xul": "?mail_prefs_display",
"chrome://messenger/content/messengercompose/pref-composing_messages.xul": "?mail_prefs_messages",
"chrome://messenger/content/messengercompose/pref-formatting.xul": "?mail_prefs_formatting",
"chrome://messenger/content/addressbook/pref-addressing.xul": "?nav_view",
"chrome://editor/content/pref-composer.xul": "?composer_prefs_general",
"chrome://editor/content/pref-editing.xul": "?composer_prefs_newpage",
"chrome://messenger/content/pref-mailnews.xul": "?mail_prefs_general",
"chrome://messenger/content/pref-viewing_messages.xul": "?mail_prefs_display",
"chrome://messenger/content/messengercompose/pref-composing_messages.xul": "?mail_prefs_messages",
"chrome://messenger/content/messengercompose/pref-formatting.xul": "?mail_prefs_formatting",
"chrome://messenger/content/addressbook/pref-addressing.xul": "?mail_prefs_addressing",
"chrome://aim/content/pref-IM_instantmessage.xul": "?im_prefs_general",
"chrome://aim/content/pref-IM_privacy.xul": "?im_prefs_privacy",
"chrome://aim/content/pref-IM_notification.xul": "?im_prefs_notification",
"chrome://aim/content/pref-IM_away.xul": "?im_prefs_away",
"chrome://aim/content/pref-IM_connection.xul": "?im_prefs_connection",
"chrome://communicator/content/pref/pref-security.xul": "?sec_gen",
"chrome://cookie/content/pref-cookies.xul": "?cookies_prefs",
"chrome://cookie/content/pref-images.xul": "?images_prefs",
"chrome://wallet/content/pref-wallet.xul": "?forms_prefs",
"chrome://wallet/content/pref-passwords.xul": "?passwords_prefs",
"chrome://communicator/content/pref/pref-advanced.xul": "?advanced_property_editor",
"chrome://communicator/content/pref/pref-cache.xul": "?advanced_property_editor",
"chrome://communicator/content/pref/pref-proxies.xul": "?advanced_property_editor",
"chrome://communicator/content/pref/pref-smartupdate.xul": "?advanced_property_editor",
"chrome://communicator/content/pref/pref-mousewheel.xul": "?advanced_property_editor",
"chrome://communicator/content/pref/pref-winhooks.xul": "?advanced_property_editor"
}
function doHelpButton() {
subsrc = document.getElementById("panelFrame").getAttribute("src");
if ( fm[subsrc] ) {
openHelp(gHelpURL + fm[subsrc]);
} else {
openHelp(gHelpURL + '?prefs');
}
}

View File

@ -48,6 +48,8 @@
<script type="application/x-javascript" src="chrome://global/content/nsWidgetStateManager.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/pref/nsPrefWindow.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/pref/pref-help.js"/>
<script type="application/x-javascript" src="chrome://help/content/help.js"/>
<keyset id="dialogKeys"/>
@ -75,6 +77,6 @@
<separator/>
<box id="okCancelButtonsRight" />
<box id="okCancelHelpButtonsRight" />
</window>

View File

@ -35,6 +35,16 @@
<button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
</box>
<box id="okCancelHelpButtons" align="horizontal">
<button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
<spring flex="1"/>
<button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
<button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
<button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
</box>
<box id="okCancelButtonsRight" align="horizontal">
<spring flex="1"/>
<button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
@ -43,6 +53,15 @@
<button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
</box>
<box id="okCancelHelpButtonsRight" align="horizontal">
<button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
<spring flex="1"/>
<button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
<button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
<button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
</box>
<keyset id="dialogKeys">
<key keycode="VK_ENTER" oncommand="if (!document.getElementById('ok').disabled) doOKButton();"/>
<key keycode="VK_RETURN" oncommand="if (!document.getElementById('ok').disabled) doOKButton();"/>

View File

@ -36,6 +36,16 @@
<spring flex="1"/>
</box>
<box id="okCancelHelpButtons" align="horizontal">
<spring flex="1"/>
<button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
<button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
<button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
<button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
<spring flex="1"/>
</box>
<box id="okCancelButtonsRight" align="horizontal">
<spring flex="1"/>
<button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
@ -45,6 +55,15 @@
<spring flex="1"/>
</box>
<box id="okCancelHelpButtonsRight" align="horizontal">
<spring flex="1"/>
<button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
<button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
<button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
<button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
<spring flex="1"/>
</box>
<keyset id="dialogKeys">
<key keycode="VK_ENTER" oncommand="if (!document.getElementById('ok').disabled) doOKButton();"/>

View File

@ -37,6 +37,17 @@
<spring flex="1"/>
</box>
<box id="okCancelHelpButtons">
<spring flex="1"/>
<button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
<button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
<button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
<button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
<spring flex="1"/>
</box>
<box id="okCancelButtonsRight" halign="right">
<spring flex="1"/>
<button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
@ -45,6 +56,15 @@
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
</box>
<box id="okCancelHelpButtonsRight" halign="right">
<spring flex="1"/>
<button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
<button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
<button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
<button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
</box>
<keyset id="dialogKeys">
<key keycode="VK_ENTER" oncommand="if (!document.getElementById('ok').disabled) doOKButton();"/>
<key keycode="VK_RETURN" oncommand="if (!document.getElementById('ok').disabled) doOKButton();"/>

View File

@ -3,6 +3,8 @@
<!-- OK Cancel Buttons -->
<!ENTITY okButton.label "OK">
<!ENTITY cancelButton.label "Cancel">
<!ENTITY helpButton.label "Help">
<!-- Key labels, for mousewheel prefs -->
<!ENTITY ctrlKey.label "Control">

View File

@ -3,6 +3,7 @@
<!-- OK Cancel Buttons -->
<!ENTITY okButton.label "OK">
<!ENTITY cancelButton.label "Cancel">
<!ENTITY helpButton.label "Help">
<!-- Key labels, for mousewheel prefs -->
<!ENTITY ctrlKey.label "Control">

View File

@ -1,8 +1,9 @@
<!-- win -->
<!-- OK Cancel Buttons -->
<!ENTITY okButton.label "OK">
<!ENTITY okButton.label "OK">
<!ENTITY cancelButton.label "Cancel">
<!ENTITY helpButton.label "Help">
<!-- Key labels, for mousewheel prefs -->
<!ENTITY ctrlKey.label "Control">