polish changes to the account manager, filter and search dialogs. r=alecf

2000-08-12 06:33:18 +00:00 · 2000-08-12 06:33:18 +00:00 · 9e4e18669b
--- a/mailnews/base/prefs/resources/content/AccountManager.xul
+++ b/mailnews/base/prefs/resources/content/AccountManager.xul
@ -20,7 +20,7 @@

 	<keyset id="keyset"/>

-	<box orient="horizontal" flex="1" style="padding: 5px">
+	<box flex="1">
 		<box orient="vertical" flex="1">
         <tree rdf:datasources="rdf:msgaccountmanager" style="width:0px" flex="1"
          rdf:containment="http://home.netscape.com/NC-rdf#Settings"
@ -60,6 +60,5 @@
        <spring style="width: 5px"/>
        <iframe name="contentFrame" flex="6" style="width: 0px"/>
 	</box>
-    <separator class="groove"/>
-    <box id="okCancelButtons"/>
+    <box id="okCancelButtonsRight"/>
 </window>
--- a/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
+++ b/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
@ -41,7 +41,7 @@
 <script language="javascript" src="SmtpServerEdit.js"/>
 <keyset id="keyset"/>
 <box id="smtpServerEditor"/>
-<separator class="groove"/>
-<box id="okCancelButtons"/>
+<separator/>
+<box id="okCancelButtonsRight"/>

 </window>
--- a/mailnews/base/prefs/resources/content/SmtpServerList.xul
+++ b/mailnews/base/prefs/resources/content/SmtpServerList.xul
@ -33,9 +33,9 @@
  title="&smtpListTitle.label;"
  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  align="vertical"
+  orient="vertical"
  onload="onLoad();"
-  width="30em"
+  style="width: 30em;"
 >

 <script language="javascript" src="chrome://global/content/strres.js"/>
@ -43,17 +43,18 @@

 <keyset id="keyset"/>

-<box align="horizontal">
-  <html flex="1">&smtpListDesc.label;</html>
-</box>
-<box align="horizontal" style="min-height: 10em; min-width: 30em">
-  <tree id="smtpTree" onselect="onSelectionChange(event);" class="inset" flex="1" style="height: 30px">
+<html flex="1">&smtpListDesc.label;</html>
+
+<separator class="thin"/>
+
+<box>
+  <tree id="smtpTree" onselect="onSelectionChange(event);" class="inset" flex="1" style="height: 0px;">
    <treecolgroup>
      <treecol flex="1"/>
    </treecolgroup>
    <treechildren id="smtpTreeChildren" flex="1"/>
  </tree>
-  <box align="vertical">
+  <box orient="vertical">
    <button id="addButton"
       oncommand="onAdd(event);" value="&smtpListAdd.label;"/>
    <button id="editButton" disabled="true"
@ -64,6 +65,9 @@
       oncommand="onSetDefault(event);" value="&smtpListSetDefault.label;"/>
  </box>
 </box>
-<separator class="groove"/>
-<box id="okCancelButtons" />
+
+<separator/>
+
+<box id="okCancelButtonsRight" />
+
 </window>
--- a/mailnews/base/prefs/resources/content/am-copies.xul
+++ b/mailnews/base/prefs/resources/content/am-copies.xul
@ -8,7 +8,7 @@
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd" >
 <window xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      class="dialog"
+      class="color-dialog"
      onload="parent.onPanelLoaded('am-copies.xul');"
      align="vertical">

@ -23,7 +23,7 @@

  <box class="box-smallheader" title="&copyAndFolderTitle.label;"/>
  <titledbox orient="vertical">
-  <title><text class="header label" value="&sendingPrefix.label;"/></title>
+  <title value="&sendingPrefix.label;"/>

  <box>
    <checkbox wsm_persist="true" id="identity.doFcc"
@ -45,7 +45,7 @@
  </titledbox>

 <titledbox orient="vertical">
-<title><text class="header label" value="&specialFolderTitle.label;"/></title>
+<title value="&specialFolderTitle.label;"/>
 <grid>
  <columns>
    <column flex="1"/>
--- a/mailnews/base/prefs/resources/content/am-identity-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-identity-advanced.xul
@ -61,7 +61,8 @@
    </menulist>
  </box>
        
-  <separator class="groove"/>
-  <box id="okCancelButtons"/>
+  <separator/>
+          
+  <box id="okCancelButtonsRight"/>

 </window>
--- a/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mailnews/base/prefs/resources/content/am-main.xul
@ -7,90 +7,74 @@

 <window xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-     flex="100%"
-     class="dialog"
+     flex="1" class="color-dialog"
     onload="parent.onPanelLoaded('am-main.xul');"
-     align="vertical">
+     orient="vertical">

    <script src="chrome://global/content/strres.js"/>
    <script src="chrome://communicator/content/pref/prefutilities.js"/>
    <script src="chrome://messenger/content/am-main.js"/>
+
    <box class="box-smallheader" title="&accountTitle.label;"/>
+    
+    <html class="secDesc">&accountSettingsDesc.label;</html>
+    <box autostretch="never">
+      <text class="label" value="&accountName.label;" for="server.prettyName"/>
+      <textfield wsm_persist="true" type="text" size="30" id="server.prettyName" flex="1"/>
+    </box>
+    
+    <separator class="thin"/>
+    
+    <titledbox orient="vertical" flex="1">
+      <title value="&identityTitle.label;"/>
+      <html class="secDesc">&identityDesc.label;</html>
+      <separator class="thin"/>
+      <grid flex="1">
+        <columns>
+          <column/>
+          <column flex="1"/>
+        </columns>
+        <rows>
+          <row>
+            <text class="label" value="&name.label;" for="identity.fullName"/>
+            <textfield wsm_persist="true" id="identity.fullName" size="30"/>
+          </row>
+          <row>
+            <text class="label" value="&email.label;" for="identity.email"/>
+            <textfield wsm_persist="true" id="identity.email" />
+          </row>
+          <row>
+            <text class="label" value="&replyTo.label;" for="identity.replyTo"/>
+            <textfield wsm_persist="true" id="identity.replyTo"/>
+          </row>
+          <row>
+            <text class="label" value="&organization.label;" for="identity.organization"/>
+            <textfield wsm_persist="true" id="identity.organization"/>
+          </row>
+        </rows>
+      </grid>

-	    <html class="secDesc">&accountSettingsDesc.label;</html>
-	    <html>&accountNameDesc.label;</html>
-        <grid width="100%">
-          <columns>
-            <column flex="1"/>
-            <column flex="2"/>
-          </columns>
-          <rows>
-            <row autostretch="never">
-              <text class="label" value="&accountName.label;" for="server.prettyName"/>
-              <textfield wsm_persist="true" type="text" size="30" id="server.prettyName" flex="100%"/>
-            </row>
-          </rows>
-        </grid>
-    <spring class="spacer"/>
-    <titledbox orient="vertical">
-    <title><text class="header label" value="&identityTitle.label;"/></title>
-
-    <html class="secDesc">&identityDesc.label;</html>
-    <grid width="100%">
-    <columns>
-      <column flex="2"/>
-      <column flex="3"/>
-    </columns>
-    <rows>
-      <row autostretch="never">
-        <text class="label" value="&name.label;" for="identity.fullName"/>
-        <textfield wsm_persist="true" id="identity.fullName" size="30"/>
-      </row>
-      <row autostretch="never">
-        <text class="label" value="&email.label;" for="identity.email"/>
-        <textfield wsm_persist="true" id="identity.email" />
-      </row>
-      <row autostretch="never">
-        <text class="label" value="&replyTo.label;" for="identity.replyTo"/>
-        <textfield wsm_persist="true" id="identity.replyTo"/>
-      </row>
-      <row autostretch="never">
-        <text class="label" value="&organization.label;" for="identity.organization"/>
-        <textfield wsm_persist="true" id="identity.organization"/>
-      </row>
-    </rows>
-    </grid>
-    </titledbox>
-<!-- no vcard in PR1
-    <row class="checkboxrow">
-      <html:td colspan="2">
-        <checkbox wsm_persist="true" id="identity.attachVCard" type="checkbox" value="&attachVCard.label;"/>
-      <button value="&editVCard.label;"/>
-      </html:td>
-      </row>    
-->
      <box orient="horizontal" autostretch="never">
        <checkbox wsm_persist="true" id="identity.attachSignature" value="&signature.label;" flex="1"/>
+      </box>
+      <box autostretch="never">
        <textfield wsm_persist="true" id="identity.signature" datatype="nsIFileSpec" flex="1" name="identity.signature"/>
-        <button class="dialog push" name="browse" type="button" value="&choose.label;" onclick="prefNavSelectFile('identity.signature', 'choosefile', true)"/>
+        <button class="dialog push" name="browse" type="button" value="&choose.label;"  
+                oncommand="prefNavSelectFile('identity.signature', 'choosefile', true)"/>
      </box>

-<!--
-      <html:select wsm_persist="true" flex="100%">
-         <html:option value="sig1">&sampleSig1.label;</html:option>
-         <html:option value="sig2">&sampleSig2.label;</html:option>
-         <html:option value="sig3">&sampleSig3.label;</html:option>
-      </html:select>
-      <button value="&edit.label;"/>
+      <box autostretch="never">
+        <checkbox wsm_persist="true" id="identity.composeHtml" value="&useHtml.label;"/>
+      </box>

-->
-
-    <checkbox wsm_persist="true" id="identity.composeHtml"
-              value="&useHtml.label;"/>
-
-    <box orient="horizontal">
      <spring flex="1"/>
-      <button onclick="onAdvanced();" value="&advancedButton.label;"/>
-      <text hidden="true" wsm_persist="true" id="identity.smtpServerKey"/>
-    </box>
+
+      <box>
+        <spring flex="1"/>
+        <button onclick="onAdvanced();" value="&advancedButton.label;"/>
+        <text hidden="true" wsm_persist="true" id="identity.smtpServerKey"/>
+      </box>
+
+    </titledbox>
+
 </window>
--- a/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mailnews/base/prefs/resources/content/am-server.xul
@ -6,7 +6,7 @@

 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:html="http://www.w3.org/1999/xhtml"
-        class="dialog"
+        class="color-dialog"
        onload="parent.onPanelLoaded('am-server.xul');"
        orient="vertical">

@ -44,9 +44,10 @@
    </rows>
  </grid>
  <spring class="spacer"/>
+
  <titledbox>
-  <title><text class="header label" value="&serverSettings.label;"/></title>
-  <box id="serverPrefContainer" orient="vertical">
+  <title value="&serverSettings.label;"/>
+  <box id="serverPrefContainer" orient="vertical" flex="1">

  <checkbox wsm_persist="true" id="server.isSecure" value="&isSecure.label;" hidefor="pop3"/>
 <!--
@ -89,11 +90,11 @@
  <checkbox wsm_persist="true" id="server.emptyTrashOnExit" iscontrolcontainer="true"
            value="&emptyTrashOnExit.label;" hidefor="nntp"/>

-  <box iscontrolcontainer="true">
-    <box orient="horizontal">
-      <spring flex="100%"/>
+  <box iscontrolcontainer="true" flex="1">
+    <box flex="1">
+      <spring flex="1"/>
      <button value="&advancedButton.label;"
-                    onclick="openImapAdvanced(event);"/>
+              oncommand="openImapAdvanced(event);"/>
    </box>

    <checkbox hidden="true" wsm_persist="true" id="imap.dualUseFolders"/>
--- a/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
+++ b/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
@ -7,7 +7,7 @@

 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:html="http://www.w3.org/1999/xhtml"
-        class="dialog"
+        class="color-dialog"
        onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');"
        align="vertical">

--- a/mailnews/base/prefs/resources/content/am-smtp.xul
+++ b/mailnews/base/prefs/resources/content/am-smtp.xul
@ -9,20 +9,29 @@
 <window xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	flex="100%"
-	class="dialog"
-    onload="onLoad();"
-	align="vertical">
+	class="color-dialog"
+  onload="onLoad();"
+	orient="vertical">

  <script language="javascript" src="am-smtp.js"/>

  <box class="box-smallheader" title="&smtpServer.label;"/>

+  <titledbox orient="vertical">
+
  <html>&smtpDesc.label;</html>

+  <separator/>
+
  <box id="smtpServerEditor"/>

-  <box align="horizontal">
-    <spring flex="100%"/>
+  <separator/>
+  
+  <box>
+    <spring flex="1"/>
    <button value="&advanced.label;" oncommand="onAdvanced(event);"/>
  </box>
+  
+  </titledbox>
+  
 </window>
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@ -17,9 +17,9 @@
                       "mailnewsStartPageEnabled", "mailnewsStartPageUrl"];
  ]]>
  </script>
-  <script language="javascript" src="chrome://global/content/strres.js"></script>
-  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
-  <script language="javascript" src="chrome://messenger/content/pref-mailnews.js"></script>
+  <script language="javascript" src="chrome://global/content/strres.js"/>
+  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script language="javascript" src="chrome://messenger/content/pref-mailnews.js"/>
  
  <box class="box-smallheader" title="&pane.title;"/>

--- a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@ -52,8 +52,8 @@
  ]]>
  </script>
        
-  <script language="javascript" src="chrome://global/content/strres.js"></script>
-  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
+  <script language="javascript" src="chrome://global/content/strres.js"/>
+  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"/>

  <box class="box-smallheader" title="&pane.title;"/>

--- a/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
+++ b/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
@ -32,21 +32,23 @@
  <script src="smtpEditOverlay.js"/>

  <box id="smtpServerEditor" orient="vertical">
-    <box orient="horizontal" autostretch="never">
+    <box autostretch="never">
      <text class="label" value="&serverName.label;"/>
-      <textfield wsm_persist="true" id="smtp.hostname"/>
+      <textfield wsm_persist="true" id="smtp.hostname" flex="1"/>
    </box>
    <!-- use a grid here when it's implemented -->
    <box orient="vertical">
      <!-- This hidden one will hold the integer version
           of smtp.useUsername -->
      <text hidden="true" id="smtp.authMethod" wsm_persist="true"/>
+      <box autostretch="never">
      <checkbox id="smtp.useUsername" value="&alwaysUseUsername.label;"
                oncommand="onUseUsername(event.target,true);"/>
+      </box>                
      <box orient="vertical" style="margin-left: 2em">
-        <box orient="horizontal" autostretch="never">
+        <box autostretch="never">
          <text class="label" value="&userName.label;"/>
-          <textfield wsm_persist="true" id="smtp.username"/>
+          <textfield wsm_persist="true" id="smtp.username" flex="1"/>
        </box>
      </box>
     </box>
--- a/mailnews/base/prefs/resources/locale/en-US/am-main.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/am-main.dtd
@ -10,7 +10,7 @@
 <!ENTITY email.label "Email Address:">
 <!ENTITY replyTo.label "Reply-to Address:">
 <!ENTITY organization.label "Organization:">
-<!ENTITY signature.label "Attach this signature">
+<!ENTITY signature.label "Attach this signature:">
 <!ENTITY edit.label "Edit...">
 <!ENTITY choose.label "Choose...">
 <!-- LOCALIZATION NOTE (editVCard.label) : do not translate "vCard" in below line -->
--- a/mailnews/base/resources/content/mailWidgets.xml
+++ b/mailnews/base/resources/content/mailWidgets.xml
@ -42,8 +42,8 @@

  <binding id="search-menulist-abstract" name="searchMenulistAbstract" extends="xul:box">
    <content>
-      <xul:menulist inherits="flex" oncommand="this.parentNode.onSelect(event)">
-        <xul:menupopup/>
+      <xul:menulist class="search-menulist" inherits="flex" oncommand="this.parentNode.onSelect(event)">
+        <xul:menupopup class="search-menulist-popup"/>
      </xul:menulist>
    </content>

@ -232,20 +232,20 @@
  <binding id="searchvalue" name="searchValue" extends="xul:deck">
    <!-- yeah yeah, this stuff needs to be localized. I'm working on it! -->
    <content>
-      <xul:textfield flex="1" />
-      <xul:menulist flex="1" >
-        <xul:menupopup>
-          <xul:menuitem value="Lowest"/>
-          <xul:menuitem value="Low"/>
-          <xul:menuitem value="Normal"/>
-          <xul:menuitem value="High"/>
-          <xul:menuitem value="Highest"/>
+      <xul:textfield flex="1" class="search-value-textfield"/>
+      <xul:menulist flex="1" class="search-value-menulist">
+        <xul:menupopup class="search-value-popup">
+          <xul:menuitem value="Lowest" class="search-value-menuitem"/>
+          <xul:menuitem value="Low" class="search-value-menuitem"/>
+          <xul:menuitem value="Normal" class="search-value-menuitem"/>
+          <xul:menuitem value="High" class="search-value-menuitem"/>
+          <xul:menuitem value="Highest" class="search-value-menuitem"/>
        </xul:menupopup>
      </xul:menulist>
-      <xul:menulist flex="1" >
-        <xul:menupopup>
-          <xul:menuitem value="read"/>
-          <xul:menuitem value="replied"/>
+      <xul:menulist flex="1" class="search-value-menulist">
+        <xul:menupopup class="search-value-popup">
+          <xul:menuitem value="read" class="search-value-menuitem"/>
+          <xul:menuitem value="replied" class="search-value-menuitem"/>
        </xul:menupopup>
      </xul:menulist>
    </content>
--- a/mailnews/base/resources/content/subscribe.xul
+++ b/mailnews/base/resources/content/subscribe.xul
@ -78,6 +78,10 @@ Rights Reserved.
          </rows>
        </grid>
        <spring/>
+      </row>
+      <row>
+        <separator class="thin"/>
+        <spring/>
      </row>
 	    <row flex="1">
        <tree class="inset"	flex="1"
@ -116,19 +120,20 @@ Rights Reserved.
          <button id="subscribe" class="dialog" value="&subscribeButton.label;" oncommand="SetSubscribeState(true)"/>
          <button id="unsubscribe" class="dialog" value="&unsubscribeButton.label;" oncommand="SetSubscribeState(false)"/>
          <button id="refresh" class="dialog" value="&refreshButton.label;" oncommand="RefreshList()"/>
+          <spring flex="1"/>
          <button id="stop" class="dialog" value="&stopButton.label;" oncommand="Stop()"/>
        </box>
      </row>
    </rows>
  </grid>

-  <separator class="groove"/>
+  <separator/>
+
+  <box autostretch="never">
+    <progressmeter id="statusbar-icon" value="0"/>
+    <text id="statusText" value="this space for rent" crop="right" flex="1"/>
+    <spring flex="1"/>
+    <box id="okCancelButtonsRight"/>
+  </box>  
  
-  <statusbar id="status-bar" class="chromeclass-status">
-    <statusbarpanel id="offline-status"/>
-    <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0" style="width:100px;height:10px"/>
-    <statusbarpanel id="statusText" value="this space for rent" crop="right" flex="1"/>
-    <statusbarpanel id="security-button"/>
-    <box id="okCancelButtons"/>
-  </statusbar>
 </window>
--- a/mailnews/base/resources/locale/en-US/subscribe.dtd
+++ b/mailnews/base/resources/locale/en-US/subscribe.dtd
@ -20,8 +20,8 @@ Rights Reserved.

 <!ENTITY subscribeButton.label				"Subscribe">
 <!ENTITY unsubscribeButton.label			"Unsubscribe">
-<!ENTITY refreshButton.label				"Refresh">
-<!ENTITY stopButton.label				"Stop">
-<!ENTITY server.label						"Server:">
+<!ENTITY refreshButton.label          "Refresh">
+<!ENTITY stopButton.label             "Stop">
+<!ENTITY server.label                 "Server:">
 <!ENTITY subscribedHeader.label				"Subscribe">
-<!ENTITY messagesHeader.label				"Messages">
+<!ENTITY messagesHeader.label         "Messages">
--- a/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mailnews/base/search/resources/content/FilterEditor.xul
@ -31,17 +31,20 @@ Rights Reserved.
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  title="&window.title;"
  orient="vertical"
-  persist="width heigh screenX screenY"
+  style="width: 40em;"
+  persist="width height screenX screenY"
  onload="filterEditorOnLoad('msgFccFolderPicker');">

-<script language="JavaScript" src="chrome://global/content/strres.js"/>
-<script language="JavaScript" src="chrome://messenger/content/FilterEditor.js"/>
+  <script language="JavaScript" src="chrome://global/content/strres.js"/>
+  <script language="JavaScript" src="chrome://messenger/content/FilterEditor.js"/>

-<keyset id="keyset"/>
-  <box orient="horizontal" class="padded">
-    <text value="&filterName.label;"/>
+  <keyset id="keyset"/>
+  
+  <box autostretch="never">
+    <text class="label" value="&filterName.label;"/>
    <textfield flex="1" id="filterName"/>
  </box>
+
  <titledbox id="searchTermListBox"/>
  <titledbox>
    <title>
@ -59,19 +62,40 @@ Rights Reserved.
      <menulist id="actionTargetFolder" flex="1"
                oncommand="onTargetFolderSelected(event);"/>

-      <menulist id="actionValuePriority">
+  <titledbox id="searchTermListBox" flex="1"/>
+
+  <titledbox autostretch="never">
+    <title value="&filterAction.label;"/>
+    
+      <menulist id="actionMenu" flex="1" oncommand="onActionChanged(event)">
        <menupopup>
-          <!-- see MailNewsTypes2.idl -->
-          <menuitem data="6" value="&highestPriorityCmd.label;"/>
-          <menuitem data="5" value="&highPriorityCmd.label;"/>
-          <menuitem data="4" value="&normalPriorityCmd.label;"/>
-          <menuitem data="3" value="&lowPriorityCmd.label;"/>
-          <menuitem data="2" value="&lowestPriorityCmd.label;"/>
+          <menuitem data="1" actionvalueindex="0" value="&moveToFolder.label;"/>
+          <menuitem data="2" actionvalueindex="1" value="&changePriority.label;"/>
+          <menuitem data="3" actionvalueindex="2" value="&delete.label;"/>
+          <menuitem data="4" actionvalueindex="2" value="&markRead.label;"/>
+          <menuitem data="5" actionvalueindex="2" value="&ignoreThread.label;"/>
+          <menuitem data="6" actionvalueindex="2" value="&watchThread.label;"/>
        </menupopup>
      </menulist>
-      <text id="actionValueNone"/>
-    </deck>
+      <deck id="actionValueDeck" flex="1">
+        <menulist id="actionTargetFolder" flex="1"
+                  oncommand="onTargetFolderSelected(event);"/>
+        <menulist id="actionValuePriority">
+          <menupopup>
+            <!-- see MailNewsTypes2.idl -->
+            <menuitem data="6" value="&highestPriorityCmd.label;"/>
+            <menuitem data="5" value="&highPriorityCmd.label;"/>
+            <menuitem data="4" value="&normalPriorityCmd.label;"/>
+            <menuitem data="3" value="&lowPriorityCmd.label;"/>
+            <menuitem data="2" value="&lowestPriorityCmd.label;"/>
+          </menupopup>
+        </menulist>
+        <text id="actionValueNone"/>
+      </deck>
  </titledbox>
-  <separator class="groove"/>
-  <box id="okCancelButtons"/>
+
+  <separator/>
+
+  <box id="okCancelButtonsRight"/>
+
 </window>
--- a/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mailnews/base/search/resources/content/FilterListDialog.xul
@ -28,92 +28,111 @@ Rights Reserved.
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  orient="vertical"
  onload="onLoad();"
+  style="width: 34em;"
  title="&window.title;">

-<script language="JavaScript" src="chrome://messenger/content/FilterListDialog.js"/>
-<script language="JavaScript" src="chrome://global/content/strres.js"/>
-<!-- <script src="resource:/res/samples/DumpDOM.js"/> -->
-<keyset id="keyset"/>
+  <script language="JavaScript" src="chrome://messenger/content/FilterListDialog.js"/>
+  <script language="JavaScript" src="chrome://global/content/strres.js"/>

-  <box orient="horizontal">
-    <text class="label" value="&filtersForPrefix.label;"/>
-    <menulist oncommand="onServerClick(event);" id="serverMenu">
-      <menupopup rdf:datasources="rdf:msgaccountmanager"
-                 rdf:containment="http://home.netscape.com/NC-rdf#child"
-                 ref="msgaccounts:/">
-        <template>
-          <menuitem uri="..." data="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
-        </template>
-      </menupopup>
-    </menulist>
-    <text class="label" value="&filtersForPostfix.label;"/>
-  </box>
-  <box orient="horizontal" >
-    <box orient="vertical" style="width:100%;" >
-    <text value="&filterHeader.label;"/>
-    <box orient="horizontal" style="min-height: 200px; min-width: 200px">
-    <tree id="filterTree" class="inset" flex="1"
-       onselect="onFilterSelect(event);"
-       rdf:datasources="rdf:msgfilters rdf:msgaccountmanager "
-       rdf:containment="http://home.netscape.com/NC-rdf#child">
-          <template>
-          <rule>
-            <treechildren flex="1">
-            <treeitem uri="..." open="true"
-                   Enabled="rdf:http://home.netscape.com/NC-rdf#Enabled">
-                  <treerow >
-                    <treecell indent="true" value="rdf:http://home.netscape.com/NC-rdf#Name"/>
-                    <treecell allowevents="true"
-                              class="enabledcol treecell-image"
-                              value="rdf:http://home.netscape.com/NC-rdf#Enabled"
-                              onclick="onToggleEnabled(event);"/>
-                  </treerow>
-            </treeitem>
-            </treechildren>
-          </rule>
-          </template>
+  <!-- <script src="resource:/res/samples/DumpDOM.js"/> -->

-      <treecolgroup>
-        <treecol style="width: 0px" flex="85" rdf:resource="http://home.netscape.com/NC-rdf#Name" id="nameColumn"/>
-        <treecol style="width: 0px" flex="15" id="activeColumn"/>
-      </treecolgroup>
+  <keyset id="keyset"/>

-      <treehead>
-        <treerow>
-           <treecell persist="hidden width" class="treecell-header treecell-inset-header" value="&nameColumn.label;"/>
-           <treecell persist="hidden width" class="treecell-header treecell-inset-header" value="&activeColumn.label;"/>
-        </treerow>
-      </treehead>
-      </tree>
+  <grid flex="1">
+    <columns>
+      <column flex="1"/>
+      <column/>
+      <column/>
+    </columns>
+    <rows>
+      <row>
+        <text class="label" value="&filtersForPrefix.label;"/>
+        <spring/>
+        <spring/>
+      </row>
+      <row>
+        <menulist oncommand="onServerClick(event);" id="serverMenu">
+          <menupopup rdf:datasources="rdf:msgaccountmanager"
+                     rdf:containment="http://home.netscape.com/NC-rdf#child"
+                     ref="msgaccounts:/">
+            <template>
+              <menuitem uri="..." data="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+            </template>
+          </menupopup>
+        </menulist>
+        <spring/>
+        <spring/>
+      </row>
+      <row>
+        <separator class="thin"/>
+        <spring/>
+        <spring/>
+      </row>
+      <row>
+        <box orient="vertical">
+          <html>&filterHeader.label;</html>
+          <tree id="filterTree" class="inset" flex="1"
+                onselect="onFilterSelect(event);"
+                rdf:datasources="rdf:msgfilters rdf:msgaccountmanager "
+                rdf:containment="http://home.netscape.com/NC-rdf#child">

->
-    <box orient="vertical">
-      <spring flex="3"/>
-      <scrollbarbutton type="increment" oncommand="onUp(event)">
-        <image src="chrome://global/skin/scroll-up.gif"/>
-      </scrollbarbutton>
-      <spring flex="1"/>
-      <scrollbarbutton type="decrement" oncommand="onDown(event)">
-        <image src="chrome://global/skin/scroll-down.gif"/>
-      </scrollbarbutton>
-      <spring flex="3"/>
-    </box>
-    </box>
-    </box>
-    <box orient="vertical">
-      <button id="newButton" value="&newButton.label;" onclick="onNewFilter();"/>
-      <button id="editButton" value="&editButton.label;" onclick="onEditFilter();"/>
-      <button id="deleteButton" value="&deleteButton.label;" onclick="onDeleteFilter();"/>
-    </box>
-  </box>
-<!--
-  take out for PR2
-  <box orient="horizontal">
-    <button value="&runFiltersNow.label;" width="0em"/>
-  </box>
-->
-<!--  <button onclick="DumpDOM(document.getElementById('filterTree'));" value="dump"/> -->
-  <separator class="groove"/>
-  <box id="okCancelButtons"/>
+            <treehead>
+              <treerow>
+                <treecell class="treecell-header treecell-inset-header" 
+                          persist="hidden width" value="&nameColumn.label;"/>
+                <treecell class="treecell-header treecell-inset-header" 
+                          persist="hidden width" value="&activeColumn.label;"/>
+              </treerow>
+            </treehead>
+
+            <template>
+              <rule>
+                <treechildren>
+                  <treeitem uri="..." open="true"
+                            Enabled="rdf:http://home.netscape.com/NC-rdf#Enabled">
+                    <treerow >
+                      <treecell indent="true" value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                      <treecell allowevents="true"
+                                class="enabledcol treecell-image"
+                                value="rdf:http://home.netscape.com/NC-rdf#Enabled"
+                                onclick="onToggleEnabled(event);"/>
+                    </treerow>
+                  </treeitem>
+                </treechildren>
+              </rule>
+            </template>
+          
+            <treecolgroup>
+              <treecol style="width: 0px" flex="75" rdf:resource="http://home.netscape.com/NC-rdf#Name" id="nameColumn"/>
+              <treecol style="width: 0px" flex="25" id="activeColumn"/>
+            </treecolgroup>
+          
+            <treechildren flex="1"/>
+            
+          </tree>
+        </box>
+        <box orient="vertical">
+          <spring flex="1"/>
+          <button class="reorder-up top" oncommand="onUp(event);"/>
+          <button class="reorder-down top" oncommand="onDown(event);"/>
+          <spring flex="1"/>
+        </box>
+        <box orient="vertical">
+          <button id="newButton" value="&newButton.label;" onclick="onNewFilter();"/>
+          <button id="editButton" value="&editButton.label;" onclick="onEditFilter();"/>
+          <button id="deleteButton" value="&deleteButton.label;" onclick="onDeleteFilter();"/>
+          <spring flex="1"/>
+          <!-- take out for PR2
+            <button value="&runFiltersNow.label;" width="0em"/>
+            <button onclick="DumpDOM(document.getElementById('filterTree'));" value="dump"/>
+          -->
+        </box>
+      </row>
+    </rows>
+  </grid>
+     
+  <separator/>
+
+  <box id="okCancelButtonsRight"/>

 </window>
--- a/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mailnews/base/search/resources/content/SearchDialog.xul
@ -26,6 +26,7 @@ Rights Reserved.
 <?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!DOCTYPE window SYSTEM "chrome://messenger/locale/SearchDialog.dtd" >

@ -33,34 +34,46 @@ Rights Reserved.
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    onload="searchOnLoad();"
    title="&searchDialogTitle.label;"
-    class="dialog"
+    width="620" height="470"
+    persist="screenX screenY width height"
    orient="vertical">

+  <keyset id="keyset"/>
+  
  <script src="chrome://global/content/strres.js"/>
  <script src="chrome://messenger/content/mailWindow.js"/>
  <script src="chrome://messenger/content/SearchDialog.js"/>
-  <box>
-    <text class="label" value="&searchHeading.label;"/>
-    <menulist id="searchableFolders" flex="2"
-              oncommand="onChooseFolder(event)"/>
-    <spring flex="1"/>
-<!--
-    <checkbox value="&searchSubfolders.label;"/>
-->
-  </box>
+  
+  <box orient="vertical" class="dialog box-padded">
+    <box autostretch="never">
+      <text class="label" value="&searchHeading.label;"/>
+      <menulist id="searchableFolders" flex="2"
+                oncommand="onChooseFolder(event)"/>
+      <spring flex="1"/>
+      <!--
+        <checkbox value="&searchSubfolders.label;"/>
+      -->
+    </box>

-  <box>
-    <titledbox id="searchTermListBox" flex="1"/>
-    <box orient="vertical">
-      <button value="&searchButton.label;" oncommand="onSearch(event)"/>
-      <button value="&resetButton.label;" oncommand="onReset(event)"/>
+    <box flex="1">
+      <titledbox id="searchTermListBox" flex="1"/>
+      <box orient="vertical">
+        <button value="&searchButton.label;" oncommand="onSearch(event)"/>
+        <button value="&resetButton.label;" oncommand="onReset(event)"/>
+        <spring flex="1"/>
+        <button value="&closeButton.label;" onclick="window.close()"/>
+        <separator class="thin"/>
+      </box>
    </box>
  </box>
+    
+  <splitter id="searchfields-splitter" collapse="before" persist="state hidden"
+            autostretch="never" orient="vertical">
+    <grippy/>
+  </splitter>
+  
+  <tree id="threadTree" flex="1" style="height: 0px" context="threadPaneContext"/>

-  <tree id="threadTree" class="inset" flex="1" style="height: 50px" context="threadPaneContext"/>
-  <box>
-    <spring flex="100%"/>
-    <button value="&closeButton.label;" onclick="window.close()"/>
-  </box>
-  <box id="status-bar"/>
+  <statusbar id="status-bar"/>
+  
 </window>
--- a/mailnews/base/search/resources/content/searchTermOverlay.xul
+++ b/mailnews/base/search/resources/content/searchTermOverlay.xul
@ -25,67 +25,70 @@
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/searchTermOverlay.dtd" >

 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script src="chrome://messenger/content/searchTermOverlay.js"/>

-  <titledbox orient="vertical" id="searchTermListBox">
-    <title>
-      <text value="&conditions.label;"/>
-    </title>
-    <text value="&conditionDesc.label;"/>
-    <radiogroup id="booleanAndGroup" selectedItem="or" oncommand="booleanChanged(event);">
+  <script src="chrome://messenger/content/searchTermOverlay.js"/>
+
+  <titledbox orient="vertical" id="searchTermListBox" value="&conditions.label;" flex="1">
+
+    <text class="label" value="&conditionDesc.label;"/>
+
+    <radiogroup class="indent" id="booleanAndGroup" orient="vertical" autostretch="never"
+                selectedItem="or" oncommand="booleanChanged(event);">
      <radio group="booleanAndGroup" data="and" value="&matchAll.label;"/>
      <radio group="booleanAndGroup" checked="true" data="or" value="&matchAny.label;"/>
    </radiogroup>

-    <spring class="spacer"/>
+    <separator class="thin"/>
+    
+    <box flex="1">
+      <box id="searchterms"/>
+      <tree class="inset" flex="1" id="searchTermTree" style="height: 0px;">
+        <treecolgroup>
+          <treecol flex="1"/>
+          <treecol flex="4"/>
+          <treecol flex="0"/>
+          <treecol flex="4"/>
+          <treecol flex="0"/>
+          <treecol flex="4"/>
+          <treecol flex="0"/>
+        </treecolgroup>
+
+        <treechildren flex="1" id="searchTermList">
+
+        <!-- this is what the treerows will look like:
+          <treeitem id="searchListItem">
+            <treerow>
+              <treecell id="preSearchAttr"/>
+              <treecell allowevents="true">
+                <searchattribute id="searchAttr" for="searchOp,searchValue" flex="1"/>
+              </treecell>
+              <treecell id="preSearchOp"/>
+              <treecell allowevents="true">
+                <searchoperator id="searchOp" flex="1"/>
+              </treecell>
+              <treecell id="preSearchValue"/>
+              <treecell allowevents="true" >
+                <searchvalue id="searchValue" flex="1"/>
+              </treecell>
+              <treecell id="postSearchValue"/>
+            </treerow>
+          </treeitem>
+          <treeitem>
+            <treerow>
+              <treecell value="the.."/>
+              <treecell value="contains.."/>
+              <treecell value="text here"/>
+            </treerow>
+          </treeitem>
+        -->
+        
+        </treechildren>
+      </tree>
+    </box>
    <box>
-    <box id="searchterms"/>
-    <tree rows="5" class="inset" flex="1" id="searchTermTree">
-      <treecolgroup>
-        <treecol flex="1"/>
-        <treecol flex="4"/>
-        <treecol flex="0"/>
-        <treecol flex="4"/>
-        <treecol flex="0"/>
-        <treecol flex="4"/>
-        <treecol flex="0"/>
-      </treecolgroup>
-
-      <treechildren flex="1" id="searchTermList">
-
-<!-- this is what the treerows will look like:
-        <treeitem id="searchListItem">
-          <treerow>
-            <treecell id="preSearchAttr"/>
-            <treecell allowevents="true">
-              <searchattribute id="searchAttr" for="searchOp,searchValue" flex="1"/>
-            </treecell>
-            <treecell id="preSearchOp"/>
-            <treecell allowevents="true">
-              <searchoperator id="searchOp" flex="1"/>
-            </treecell>
-            <treecell id="preSearchValue"/>
-            <treecell allowevents="true" >
-              <searchvalue id="searchValue" flex="1"/>
-            </treecell>
-            <treecell id="postSearchValue"/>
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell value="the.."/>
-            <treecell value="contains.."/>
-            <treecell value="text here"/>
-          </treerow>
-        </treeitem>
-->
-       </treechildren>
-      
-    </tree>
-  </box>
-  <box>
-    <button id="more" value="&more.label;" onclick="onMore(event);"/>
-    <button id="less" value="&less.label;" disabled="true" onclick="onLess(event);"/>
-  </box>
+      <button id="more" value="&more.label;" onclick="onMore(event);"/>
+      <button id="less" value="&less.label;" disabled="true" onclick="onLess(event);"/>
+    </box>
  </titledbox>
+
 </overlay>
--- a/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
+++ b/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
@ -2,13 +2,13 @@
 <!ENTITY numberColumn.label "Number">
 <!ENTITY nameColumn.label "Description">
 <!ENTITY activeColumn.label "Enabled">
-<!ENTITY newButton.label "New">
-<!ENTITY editButton.label "Edit">
+<!ENTITY newButton.label "New...">
+<!ENTITY editButton.label "Edit...">
 <!ENTITY deleteButton.label "Delete">
 <!ENTITY logFilterUseCheckbox.label "Log Filter Use">
 <!ENTITY viewLogButton.label "View Log">
 <!ENTITY description.label "Description">
-<!ENTITY filterHeader.label "Filters which are Enabled will be run in the order shown below.">
+<!ENTITY filterHeader.label "Filters which are Enabled will be run in the order shown below:">
 <!ENTITY runFiltersNow.label "Run Filter(s) Now">
 <!ENTITY filtersForPrefix.label "Filters for:">
 <!ENTITY filtersForPostfix.label "">