From d9a0ea319dce8e592735e2ec989504315013b086 Mon Sep 17 00:00:00 2001
From: Ian Neal <iann_cvs@blueyonder.co.uk>
Date: Sun, 27 Sep 2009 23:59:18 +0100
Subject: [PATCH] Bug 515227 - Help button in Message Filter dialog lacks Help
 icon r=mnyromyr/stefanh sr=neil a-SM2.0=KaiRo

---
 .../chrome/mailnews/FilterListDialog.dtd      |   4 +-
 suite/mailnews/search/FilterListDialog.js     |   1 +
 suite/mailnews/search/FilterListDialog.xul    | 274 ++++++++++--------
 .../themes/classic/messenger/filterDialog.css |  11 +
 .../themes/modern/messenger/filterDialog.css  |   4 +
 5 files changed, 166 insertions(+), 128 deletions(-)

diff --git a/suite/locales/en-US/chrome/mailnews/FilterListDialog.dtd b/suite/locales/en-US/chrome/mailnews/FilterListDialog.dtd
index 5ec1500bd8..2a790c4aa5 100644
--- a/suite/locales/en-US/chrome/mailnews/FilterListDialog.dtd
+++ b/suite/locales/en-US/chrome/mailnews/FilterListDialog.dtd
@@ -1,4 +1,4 @@
-<!ENTITY window.title "Message Filters">
+<!ENTITY filterListDialog.title "Message Filters">
 <!ENTITY nameColumn.label "Filter Name">
 <!ENTITY activeColumn.label "Enabled">
 <!ENTITY newButton.label "New…">
@@ -24,5 +24,3 @@
 <!ENTITY folderPickerPrefix.accesskey "c">
 <!ENTITY choosethis.label "choose this folder">
 <!ENTITY choosethisnewsserver.label "choose this news server">
-<!ENTITY helpButton.label "Help">
-<!ENTITY helpButton.accesskey "H">
diff --git a/suite/mailnews/search/FilterListDialog.js b/suite/mailnews/search/FilterListDialog.js
index aa1d093342..43b1787338 100644
--- a/suite/mailnews/search/FilterListDialog.js
+++ b/suite/mailnews/search/FilterListDialog.js
@@ -165,6 +165,7 @@ const nsMsgFilterMotion = Components.interfaces.nsMsgFilterMotion;
 
 function onLoad()
 {
+    setHelpFileURI("chrome://communicator/locale/help/suitehelp.rdf");
     gFilterListMsgWindow = Components.classes["@mozilla.org/messenger/msgwindow;1"].createInstance(Components.interfaces.nsIMsgWindow);
     gFilterListMsgWindow.domWindow = window; 
     gFilterListMsgWindow.rootDocShell.appType = Components.interfaces.nsIDocShell.APP_TYPE_MAIL;   
diff --git a/suite/mailnews/search/FilterListDialog.xul b/suite/mailnews/search/FilterListDialog.xul
index 85cc9ea306..7e4daa9da4 100644
--- a/suite/mailnews/search/FilterListDialog.xul
+++ b/suite/mailnews/search/FilterListDialog.xul
@@ -23,6 +23,7 @@
  Contributor(s):
    Håkan Waara <hwaara@chello.se>
    Seth Spitzer <sspitzer@netscape.com>
+   Ian Neal <iann_bugzilla@blueyonder.co.uk>
 
  Alternatively, the contents of this file may be used under the terms of
  either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -43,21 +44,25 @@
 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://messenger/locale/FilterListDialog.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/FilterListDialog.dtd">
 
-<window id="filterListDialog"
-  xmlns:nc="http://home.netscape.com/NC-rdf#"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  windowtype="mailnews:filterlist"
-  style="width: 45em; height: 31em;"
-  onload="onLoad();"
-  onunload="onFilterUnload();"
-  onclose="return onFilterClose();"
-  persist="width height screenX screenY"
-  title="&window.title;">
+<dialog id="filterListDialog"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:nc="http://home.netscape.com/NC-rdf#"
+        windowtype="mailnews:filterlist"
+        title="&filterListDialog.title;"
+        style="width: 45em; height: 31em;"
+        persist="width height screenX screenY"
+        buttons="help"
+        ondialoghelp="return openHelp('mail-filters');"
+        onload="onLoad();"
+        onunload="onFilterUnload();"
+        onclose="return onFilterClose();">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/FilterListDialog.js"/>
-  <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
+  <script type="application/x-javascript"
+          src="chrome://messenger/content/FilterListDialog.js"/>
+  <stringbundle id="bundle_filter"
+                src="chrome://messenger/locale/filter.properties"/>
 
   <commandset id="filterListCommands">
     <command id="cmd_close" oncommand="if (onFilterClose()) window.close();"/>
@@ -67,150 +72,169 @@
     <key id="key_close"/>
   </keyset>
 
-  <hbox align="center">
-    <label value="&filtersForPrefix.label;" 
-           accesskey="&filtersForPrefix.accesskey;" control="serverMenu"/>
-
-      <menulist id="serverMenu"
-                class="folderMenuItem"
-                IsServer="true"
-                IsSecure="false"
-                ServerType="none"
-                datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
-                sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-                sortDirection="ascending"
-                ref="msgaccounts:/"
-                oncommand="onFilterServerClick(event.target);">
-          <template>
-            <rule iscontainer="true" isempty="false" nc:ServerType="nntp">
-              <menupopup>
-                <menu uri="..." 
-                                class="folderMenuItem menu-iconic" 
-                                IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
-                                IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
-                                ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
-                                label="rdf:http://home.netscape.com/NC-rdf#Name"
-                                itemUri="rdf:*">
-                  <menupopup class="menulist-menupopup">
-                    <menuitem label="&choosethisnewsserver.label;"
-                              itemUri="rdf:*"/>
-                    <menuseparator/>
-                  </menupopup>
-                </menu>
-              </menupopup>
-            </rule>
-            <rule nc:ServerType="nntp">
-              <menupopup>
-                <menuitem uri="..." value="..."
-                 class="folderMenuItem menuitem-iconic"
-                 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
-                 IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
-                 ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
-                 label="rdf:http://home.netscape.com/NC-rdf#Name"
-                 itemUri="rdf:*"/>
-              </menupopup>
-            </rule>
-            <rule nc:SupportsFilters="true">
-              <menupopup>
-                <menuitem uri="..." value="..."
-                 class="folderMenuItem menuitem-iconic"
-                 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
-                 IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
-                 ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
-                 label="rdf:http://home.netscape.com/NC-rdf#Name"
-                 itemUri="rdf:*"/>
-              </menupopup>
-            </rule>
-          </template>
-          <menupopup/>
-      </menulist>
-      <spacer flex="1"/> 
-      <vbox>
-        <button label="&viewLogButton.label;" accesskey="&viewLogButton.accesskey;" oncommand="viewLog();"/>
-      </vbox>
-  </hbox>
-
   <grid flex="1">
     <columns>
       <column flex="1"/>
       <column/>
     </columns>
     <rows>
+      <row>
+        <hbox align="center">
+          <label value="&filtersForPrefix.label;"
+                 accesskey="&filtersForPrefix.accesskey;"
+                 control="serverMenu"/>
+
+          <menulist id="serverMenu"
+                    class="folderMenuItem"
+                    IsServer="true"
+                    IsSecure="false"
+                    ServerType="none"
+                    datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
+                    sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+                    sortDirection="ascending"
+                    ref="msgaccounts:/"
+                    oncommand="onFilterServerClick(event.target);">
+            <template>
+              <rule iscontainer="true" isempty="false" nc:ServerType="nntp">
+                <menupopup>
+                  <menu uri="..."
+                        class="folderMenuItem menu-iconic"
+                        IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+                        IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
+                        ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+                        label="rdf:http://home.netscape.com/NC-rdf#Name"
+                        itemUri="rdf:*">
+                    <menupopup class="menulist-menupopup">
+                      <menuitem label="&choosethisnewsserver.label;"
+                                itemUri="rdf:*"/>
+                      <menuseparator/>
+                    </menupopup>
+                  </menu>
+                </menupopup>
+              </rule>
+              <rule nc:ServerType="nntp">
+                <menupopup>
+                  <menuitem uri="..."
+                            value="..."
+                            class="folderMenuItem menuitem-iconic"
+                            IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+                            IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
+                            ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+                            label="rdf:http://home.netscape.com/NC-rdf#Name"
+                            itemUri="rdf:*"/>
+                </menupopup>
+              </rule>
+              <rule nc:SupportsFilters="true">
+                <menupopup>
+                  <menuitem uri="..."
+                            value="..."
+                            class="folderMenuItem menuitem-iconic"
+                            IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+                            IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
+                            ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+                            label="rdf:http://home.netscape.com/NC-rdf#Name"
+                            itemUri="rdf:*"/>
+                </menupopup>
+              </rule>
+            </template>
+            <menupopup/>
+          </menulist>
+          <spacer flex="1"/>
+        </hbox>
+        <button label="&viewLogButton.label;"
+                accesskey="&viewLogButton.accesskey;"
+                oncommand="viewLog();"/>
+      </row>
+
       <row>
         <separator/>
       </row>
+
       <row>
-        <label control="filterTree" id="filterHeader">&filterHeader.label;</label>
+        <label id="filterHeader" control="filterTree">&filterHeader.label;</label>
       </row>
 
-
       <row flex="1">
+        <tree id="filterTree"
+              hidecolumnpicker="true"
+              onselect="onFilterSelect(event);"
+              onkeypress="onFilterTreeKeyPress(event);"
+              ondblclick="onFilterDoubleClick(event);">
+
+          <treecols>
+            <treecol id="nameColumn"
+                     flex="1"
+                     label="&nameColumn.label;"
+                     sort="?Name"/>
+            <treecol id="activeColumn"
+                     label="&activeColumn.label;"
+                     cycler="true"/>
+          </treecols>
+
+          <treechildren/>
+        </tree>
         <vbox>
-          <tree id="filterTree" flex="1" hidecolumnpicker="true"
-                onselect="onFilterSelect(event);"
-                onkeypress="onFilterTreeKeyPress(event);"
-                ondblclick="onFilterDoubleClick(event);">
-
-            <treecols>
-              <treecol id="nameColumn" flex="1" label="&nameColumn.label;" sort="?Name"/>
-              <treecol id="activeColumn" label="&activeColumn.label;" cycler="true"/>
-            </treecols>
-
-            <treechildren/>
-          </tree>
-        </vbox>
-
-        <vbox>
-          <button id="newButton" label="&newButton.label;" accesskey="&newButton.accesskey;"
+          <button id="newButton"
+                  label="&newButton.label;"
+                  accesskey="&newButton.accesskey;"
                   oncommand="onNewFilter(null);"/>
-          <button id="editButton" label="&editButton.label;" accesskey="&editButton.accesskey;" 
+          <button id="editButton"
+                  label="&editButton.label;"
+                  accesskey="&editButton.accesskey;"
                   oncommand="onEditFilter();"/>
-          <button id="deleteButton" label="&deleteButton.label;" accesskey="&deleteButton.accesskey;" 
+          <button id="deleteButton"
+                  label="&deleteButton.label;"
+                  accesskey="&deleteButton.accesskey;"
                   oncommand="onDeleteFilter();"/>
-          <button label="&helpButton.label;" accesskey="&helpButton.accesskey;" 
-                  oncommand="openHelp('mail-filters', 'chrome://communicator/locale/help/suitehelp.rdf');"/>
           <spacer flex="1"/>
-          <button id="reorderUpButton" label="&reorderUpButton.label;" accesskey="&reorderUpButton.accesskey;" 
+          <button id="reorderUpButton"
+                  label="&reorderUpButton.label;"
+                  accesskey="&reorderUpButton.accesskey;"
                   class="up"
                   oncommand="onUp(event);"/>
-          <button id="reorderDownButton" label="&reorderDownButton.label;" accesskey="&reorderDownButton.accesskey;" 
+          <button id="reorderDownButton"
+                  label="&reorderDownButton.label;"
+                  accesskey="&reorderDownButton.accesskey;"
                   class="down"
                   oncommand="onDown(event);"/>
           <spacer flex="1"/>
         </vbox>
       </row>
-      <row>
-        <vbox>
-          <hbox align="center">
-            <label id="folderPickerPrefix" value="&folderPickerPrefix.label;" 
-                   accesskey="&folderPickerPrefix.accesskey;"
-                   disabled="true" control="runFiltersFolder"/>
 
-            <menulist id="runFiltersFolder" disabled="true"/>
-          </hbox>
-        </vbox>
-        <vbox>
-          <button id="runFiltersButton" 
-                  label="&runFilters.label;" 
-                  accesskey="&runFilters.accesskey;" 
-                  runlabel="&runFilters.label;" 
-                  runaccesskey="&runFilters.accesskey;" 
-                  stoplabel="&stopFilters.label;" 
+      <row align="center">
+        <hbox align="center">
+          <label id="folderPickerPrefix"
+                 value="&folderPickerPrefix.label;"
+                 accesskey="&folderPickerPrefix.accesskey;"
+                 disabled="true"
+                 control="runFiltersFolder"/>
+
+          <menulist id="runFiltersFolder" disabled="true"/>
+          <spacer flex="1"/>
+          <button id="runFiltersButton"
+                  label="&runFilters.label;"
+                  accesskey="&runFilters.accesskey;"
+                  runlabel="&runFilters.label;"
+                  runaccesskey="&runFilters.accesskey;"
+                  stoplabel="&stopFilters.label;"
                   stopaccesskey="&stopFilters.accesskey;"
-                  oncommand="runSelectedFilters();" disabled="true"/>
+                  disabled="true"
+                  oncommand="runSelectedFilters();"/>
+        </hbox>
+        <vbox align="center">
+          <button dlgtype="help" class="dialog-button"/>
         </vbox>
       </row>
     </rows>
   </grid>
 
-  <separator/>
-
-  <statusbar class="chromeclass-status" id="status-bar">    
+  <statusbar class="chromeclass-status" id="status-bar">
     <statusbarpanel class="statusbarpanel-progress">
-      <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
+      <progressmeter id="statusbar-icon"
+                     class="progressmeter-statusbar"
+                     mode="normal"
+                     value="0"/>
     </statusbarpanel>
     <statusbarpanel id="statusText" crop="right" flex="1"/>
-  </statusbar> 
-
-</window>
-
+  </statusbar>
+</dialog>
diff --git a/suite/themes/classic/messenger/filterDialog.css b/suite/themes/classic/messenger/filterDialog.css
index 2404304e41..8c1a66184a 100644
--- a/suite/themes/classic/messenger/filterDialog.css
+++ b/suite/themes/classic/messenger/filterDialog.css
@@ -41,6 +41,8 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+/* This should not be needed on trunk once Mac styles are moved to button.css */
+@import url("chrome://global/skin/dialog.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -81,6 +83,15 @@ textbox {
   min-height:1px;
 }
 
+#filterListDialog {
+  padding: 0px;
+}
+
+/* This should not be needed on trunk once Mac styles are moved to button.css */
+.dialog-button {
+  margin-top: 1px !important;
+}
+
 .filler {
   -moz-padding-end: 22px;
 }
diff --git a/suite/themes/modern/messenger/filterDialog.css b/suite/themes/modern/messenger/filterDialog.css
index af432c1285..9e0dead35f 100644
--- a/suite/themes/modern/messenger/filterDialog.css
+++ b/suite/themes/modern/messenger/filterDialog.css
@@ -80,6 +80,10 @@ textbox {
   min-height:1px;
 }
 
+#filterListDialog {
+  padding: 0px;
+}
+
 .filler {
   -moz-padding-end: 22px;
 }