Make it possible to use the help dialog button in Thunderbird b=256915 p=paul@wavebreaks.com (Paul Tomlin) r+sr=me,mscott,mconnor as appropriate

2006-10-24 15:36:27 +00:00 · 2006-10-24 15:36:27 +00:00 · 98c1e92458
--- a/extensions/help/resources/content/contents.rdf
+++ b/extensions/help/resources/content/contents.rdf
@ -38,6 +38,17 @@
    <RDF:li resource="chrome://pippki/content/crlManager.xul"/>
    <RDF:li resource="chrome://pippki/content/resetpassword.xul"/>
    <RDF:li resource="chrome://pippki/content/downloadcert.xul"/>
+    <RDF:li resource="chrome://messenger/content/addressbook/pref-editdirectories.xul"/>
+    <RDF:li resource="chrome://messenger/content/addressbook/pref-directory-add.xul"/>
+    <RDF:li resource="chrome://messenger/content/AccountManager.xul"/>
+    <RDF:li resource="chrome://messenger/content/FilterEditor.xul"/>
+    <RDF:li resource="chrome://messenger/content/junkMailInfo.xul"/>
+    <RDF:li resource="chrome://messenger/content/msgSelectOffline.xul"/>
+    <RDF:li resource="chrome://messenger/content/subscribe.xul"/>
+    <RDF:li resource="chrome://messenger/content/mailViewList.xul"/>
+    <RDF:li resource="chrome://messenger/content/mailViewSetup.xul"/>
+    <RDF:li resource="chrome://messenger-smime/content/msgCompSecurityInfo.xul"/>
+    <RDF:li resource="chrome://messenger-smime/content/msgReadSecurityInfo.xul"/>
  </RDF:Seq>

  <!-- Define the local overlay file(s) for each overlay point -->
@ -132,4 +143,48 @@
  <RDF:Seq about="chrome://pippki/content/downloadcert.xul">
    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger/content/addressbook/pref-editdirectories.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger/content/addressbook/pref-directory-add.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger/content/AccountManager.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger/content/FilterEditor.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger/content/junkMailInfo.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger/content/msgSelectOffline.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger/content/subscribe.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger/content/mailViewList.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger/content/mailViewSetup.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger-smime/content/msgCompSecurityInfo.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger-smime/content/msgReadSecurityInfo.xul">
+    <RDF:li>chrome://help/content/helpMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
 </RDF:RDF>
--- a/extensions/help/resources/content/helpMessengerOverlay.xul
+++ b/extensions/help/resources/content/helpMessengerOverlay.xul
--- a/extensions/help/resources/jar.mn
+++ b/extensions/help/resources/jar.mn
@ -27,11 +27,12 @@ help.jar:
 #else
 *       content/help/contents.rdf                       (content/contents.rdf)
 #endif
-        content/help/help.xul                           (content/help.xul)
        content/help/contextHelp.js                     (content/contextHelp.js)
        content/help/help.js                            (content/help.js)
-*       content/help/helpMenuOverlay.xul                (content/helpMenuOverlay.xul)
+        content/help/help.xul                           (content/help.xul)
        content/help/helpContextOverlay.xul             (content/helpContextOverlay.xul)
+*       content/help/helpMenuOverlay.xul                (content/helpMenuOverlay.xul)
+        content/help/helpMessengerOverlay.xul           (content/helpMessengerOverlay.xul)
        content/help/helpSecurityOverlay.xul            (content/helpSecurityOverlay.xul)
 *       content/help/platformClasses.css                (content/platformClasses.css)

@ -50,5 +51,3 @@ modern.jar:

 classic.jar:
        skin/classic/communicator/help.css              (skin/classic/help.css)
-
-
--- a/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
@ -49,13 +49,11 @@
        title="&newDirectoryTitle.label;"
        onload="Startup();"
        onunload="onUnload();"
-        buttons="accept,cancel,help"
+        buttons="accept,cancel"
        ondialogaccept="return onAccept();"
-        ondialogcancel="return onCancel();"
-        ondialoghelp="return doHelpButton();">
+        ondialogcancel="return onCancel();">

  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory-add.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
  <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
  <stringbundle id="bundle_replication" src="chrome://messenger/locale/addressbook/replicationProgress.properties"/>

--- a/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
@ -42,14 +42,13 @@

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        id="editDirectories"
        title="&pref.ldap.window.title;"
-        buttons="accept,cancel,help"
+        buttons="accept,cancel"
        onload="onInitEditDirectories();"
-        ondialogaccept="return onAccept();"
-        ondialoghelp="return doHelpButton();">
+        ondialogaccept="return onAccept();">

  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>

    <label value="&directoriesText.label;" accesskey="&directoriesText.accesskey;" control="directoriesList"/>
    <hbox flex="1">
--- a/mailnews/base/prefs/resources/content/AccountManager.xul
+++ b/mailnews/base/prefs/resources/content/AccountManager.xul
@ -13,10 +13,9 @@
        style="&macAccountManager.size;"
 #endif
        persist="screenX screenY"
-        buttons="accept,cancel,help"
+        buttons="accept,cancel"
        onload="onLoad(event);"
-        ondialogaccept="return onAccept();"
-        ondialoghelp="return doHelpButton();">
+        ondialogaccept="return onAccept();">
 <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
 <script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
@ -24,7 +23,6 @@
 <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/am-help.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>

  <hbox flex="1">
    <vbox style="&accountTree.width;">
--- a/mailnews/base/resources/content/junkMailInfo.xul
+++ b/mailnews/base/resources/content/junkMailInfo.xul
@ -51,11 +51,7 @@
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        title="&window.title;"
        windowtype="mailnews:junkmailinfo"
-        buttons="accept,help"
-        ondialogaccept="return window.close();"
-        ondialoghelp="return openHelp('mail-junk');">
-
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
+        buttons="accept">

  <vbox flex="1" width="&window.width;">
      <spacer/>
--- a/mailnews/base/resources/content/msgSelectOffline.xul
+++ b/mailnews/base/resources/content/msgSelectOffline.xul
@ -51,11 +51,10 @@
        title="&MsgSelect.label;"
        width="450" height="400"
        persist="width height"
-        buttons="accept,cancel,help"
+        buttons="accept,cancel"
        onload="selectOnLoad();"
        ondialogaccept="return selectOkButton();"
-        ondialogcancel="return selectCancelButton();"
-        ondialoghelp="return doHelpButton();">
+        ondialogcancel="return selectCancelButton();">
 		
 <script src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
@ -66,8 +65,7 @@
 <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/msgSynchronize.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
-	
+
    <keyset id="keyset"/>
    <description class="desc">&MsgSelectDesc.label;</description>

--- a/mailnews/base/resources/content/subscribe.xul
+++ b/mailnews/base/resources/content/subscribe.xul
@ -46,19 +46,17 @@
        title="&subscribeDialog.title;"
        style="width: 44em; height: 33em;"
        persist="width height screenX screenY"
-        buttons="accept,cancel,help"
+        buttons="accept,cancel"
        onload="SubscribeOnLoad()"
        onunload="SubscribeOnUnload()"
        ondialogaccept="return subscribeOK();"
-        ondialogcancel="return subscribeCancel();"
-        ondialoghelp="return doHelpButton();">   
-     
+        ondialogcancel="return subscribeCancel();">
+
 <stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/subscribe.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>

  <grid flex="1" style="width: 40em; height: 25em;">
    <columns>
--- a/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mailnews/base/search/resources/content/FilterEditor.xul
@ -51,11 +51,10 @@
  style="width: 52em; height: 34em;"
  windowtype="mailnews:filtereditor"
  persist="width height screenX screenY"
-  buttons="accept,cancel,help"
+  buttons="accept,cancel"
  onload="filterEditorOnLoad();"
  onunload="filterEditorOnUnload();"
-  ondialogaccept="return onAccept();"
-  ondialoghelp="return doHelpButton();">
+  ondialogaccept="return onAccept();">

  <dummy class="usesMailWidgets"/>
  <stringbundleset id="stringbundleset">
@ -68,7 +67,6 @@
  <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
  <script type="application/x-javascript" src="chrome://messenger/content/FilterEditor.js"/>
  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>

  <hbox align="center">
    <label value="&filterName.label;" accesskey="&filterName.accesskey;" control="filterName"/>
--- a/mailnews/extensions/mailviews/resources/content/mailViewList.xul
+++ b/mailnews/extensions/mailviews/resources/content/mailViewList.xul
@ -53,13 +53,10 @@
        windowtype="mailnews:mailviewlist"
        title="&mailViewListTitle.label;"
        width="400" height="340"
-        buttons="accept,help"
-        ondialogaccept="window.close();"
-        ondialoghelp="return openHelp('message-views-using');"
+        buttons="accept"
        persist="screenX screenY width height">

  <script type="application/x-javascript" src="chrome://messenger/content/mailViewList.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>

  <vbox flex="1">
    <hbox flex="1">
--- a/mailnews/extensions/mailviews/resources/content/mailViewSetup.xul
+++ b/mailnews/extensions/mailviews/resources/content/mailViewSetup.xul
@ -49,8 +49,7 @@
        onload="mailViewOnLoad();"
        onunload="mailViewOnUnLoad();"
        ondialogaccept="return onOK();"
-        ondialoghelp="doHelpButton();"
-        buttons="accept,cancel,help"
+        buttons="accept,cancel"
        buttonalign="right"
        windowtype="mailnews:mailview"
        title="&mailViewSetupTitle.label;"
@ -65,7 +64,6 @@
  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
  <script type="application/x-javascript" src="chrome://messenger/content/mailViewSetup.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>

  <dummy class="usesMailWidgets"/>
    
--- a/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.xul
+++ b/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.xul
@ -44,11 +44,9 @@
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  style="width: 50em;"
  persist="width height"
-  buttons="accept,help"
-  ondialoghelp="doHelpButton();"
+  buttons="accept"
  onload="onLoad();">

-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
  <script type="application/x-javascript" src="chrome://messenger-smime/content/msgCompSecurityInfo.js"/>

  <stringbundle id="bundle_smime_comp_info" src="chrome://messenger-smime/locale/msgCompSecurityInfo.properties"/> 
--- a/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.xul
+++ b/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.xul
@ -43,11 +43,9 @@
 <dialog id="msgReadSecurityInfo" title="&status.label;"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
  style="width: 40em;"
-  buttons="accept,help"
-  ondialoghelp="doHelpButton();"
+  buttons="accept"
  onload="onLoad();">

-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
  <script type="application/x-javascript" src="chrome://messenger-smime/content/msgReadSecurityInfo.js"/>

  <stringbundle id="bundle_smime_read_info" src="chrome://messenger-smime/locale/msgSecurityInfo.properties"/> 
--- a/toolkit/content/widgets/dialog.xml
+++ b/toolkit/content/widgets/dialog.xml
@ -289,11 +289,7 @@
                          disclosure: false, extra1: false, extra2: false };
            for (i = 0; i < list.length; ++i)
              shown[list[i].replace(/ /g, "")] = true;
-            
-#ifdef MOZ_THUNDERBIRD
-          shown['help'] = false;
-          buttons.help.hidden = true; 
-#endif
+
            // hide/show the buttons we want
            for (dlgtype in buttons) 
              buttons[dlgtype].hidden = !shown[dlgtype];