update filter UI from pre-beta1 days

not part of build!

mailnews/base/search/resources/content/FilterEditor.xul

@@ -3,7 +3,7 @@
 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/FilterEditor.dtd" >
-<window
+<window class="dialog"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

mailnews/base/search/resources/content/FilterListDialog.xul

@@ -1,101 +1,112 @@
 <?xml version="1.0"?>
+<!--
+The contents of this file are subject to the Netscape Public
+License Version 1.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/NPL/
+
+Software distributed under the License is distributed on an "AS
+IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+implied. See the License for the specific language governing
+rights and limitations under the License.
+
+The Original Code is Mozilla Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/FilterListDialog.dtd" >
-<window
+<window class="dialog"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  orient="vertical"
   title="&window.title;">
 
-<html:script language="JavaScript" src="chrome://messenger/content/FilterListDialog.js"/>
+<script language="JavaScript" src="chrome://messenger/content/FilterListDialog.js"/>
 
-<box align="vertical" style="width: 100%">
-  <box align="horizontal" flex="100%">
-    <box align="vertical" style="width:100%;" flex="100%" class="cleanborder">
-    <html:div>&filterHeader.label;</html:div>
-    <tree id="filterTree" flex="100%" style="width: 100%;">
-      <treecol id="numColumn" style="width: 10%"/>
-      <treecol rdf:resource="http://home.netscape.com/NC-rdf#Name" id="nameColumn" style="width: 80%"/>
-      <treecol id="activeColumn" style="width: 10%"/>
+  <box orient="horizontal">
+    <text value="Filters for:"/>
+    <menulist>
+      <menupopup rdf:datasources="rdf:msgaccountmanager"
+                 rdf:containment="http://home.netscape.com/NC-rdf#child"
+                 ref="msgaccounts:/">
+        <template>
+          <menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+        </template>
+      </menupopup>
+    </menulist>
+  </box>
+  <box orient="horizontal" >
+    <box orient="vertical" style="width:100%;" >
+    <text value="&filterHeader.label;"/>
+    <box orient="horizontal">
+    <tree id="filterTree" class="inset" style="width: 35em">
+
+      <treecol style="width: 85%" rdf:resource="http://home.netscape.com/NC-rdf#Name" id="nameColumn"/>
+      <treecol style="width: 15%" id="activeColumn"/>
 
       <treehead>
         <treerow>
-         <treecell>&numberColumn.label;</treecell>
-         <treecell>&nameColumn.label;</treecell>
-         <treecell>&activeColumn.label;</treecell>
+           <treecell persist="hidden width" value="&nameColumn.label;"/>
+           <treecell persist="hidden width" value="&activeColumn.label;"/>
         </treerow>
       </treehead>
       <treechildren>
-        <treeitem open="true">
-		  <treerow>
-		    <treecell/>
-		    <treecell><treeindentation/>Sample Server 1</treecell>
-		    <treecell/>
-		  </treerow>
-          <treechildren>
-            <treeitem>
-			  <treerow>
-                <treecell/>
-                <treecell><treeindentation/>People from work</treecell>
-                <treecell/>
-			  </treerow>
-            </treeitem>
-            <treeitem>
-			  <treerow>
-                <treecell/>
-                <treecell><treeindentation/>People from work</treecell>
-                <treecell/>
-			  </treerow>
-            </treeitem>
-          </treechildren>
+        <treeitem>
+          <treerow indent="true">
+            <treecell value="People from work"/>
+            <treecell><checkbox/></treecell>
+          </treerow>
         </treeitem>
-
-        <treeitem open="true">
-		  <treerow>
-            <treecell/>
-            <treecell><treeindentation/>Sample Server 2</treecell>
-            <treecell/>
-		  </treerow>
-          <treechildren>
-            <treeitem>
-			  <treerow>
-                <treecell/>
-                <treecell><treeindentation/>People from college</treecell>
-                <treecell/>
-			  </treerow>
-            </treeitem>
-            <treeitem>
-			  <treerow>
-                <treecell/>
-                <treecell><treeindentation/>SPAM</treecell>
-                <treecell/>
-			  </treerow>
-            </treeitem>
-          </treechildren>
-        </treeitem>
-
+        <treeitem>
+          <treerow indent="true">
+            <treecell value="People from work"/>
+            <treecell><checkbox/></treecell>
+	    </treerow>
+      </treeitem>
+      <treeitem>
+        <treerow indent="true">
+          <treecell value="People from college"/>
+          <treecell><checkbox/></treecell>
+		</treerow>
+      </treeitem>
+      <treeitem>
+		<treerow indent="true">
+          <treecell value="SPAM"/>
+          <treecell><checkbox/></treecell>
+	    </treerow>
+      </treeitem>
     </treechildren>
 
     </tree>
+    <box orient="vertical">
+      <scrollbarbutton type="increment">
+        <image src="chrome://global/skin/scroll-up.gif"/>
+      </scrollbarbutton>
+      <scrollbarbutton type="decrement">
+        <image src="chrome://global/skin/scroll-down.gif"/>
+      </scrollbarbutton>
     </box>
-    <box align="vertical" class="padded">
-      <titledbutton class="push" value="&newButton.label;" onclick="NewFilter();"/>
-      <titledbutton class="push" value="&editButton.label;" onclick="EditFilter();"/>
-      <titledbutton class="push" value="&deleteButton.label;" onclick="DeleteFilter();"/>
+    </box>
+    </box>
+    <box orient="vertical">
+      <button value="&newButton.label;" onclick="NewFilter();"/>
+      <button value="&editButton.label;" onclick="EditFilter();"/>
+      <button value="&deleteButton.label;" onclick="DeleteFilter();"/>
     </box>
   </box>
-  <box align="horizontal" class="padded">
-    <checkbox/>
-    <spring class="spacer"/>
-    <html:div>&logFilterUseCheckbox.label;</html:div>
+  <box orient="horizontal">
+    <button value="&runFiltersNow.label;" width="0em"/>
     <spring flex="100%"/>
-    <titledbutton class="push" value="&viewLogButton.label;"/>
   </box>
-  <box align="vertical" class="cleanborder">
-    <html:div>&description.label;</html:div>
-    <html:div>(description goes here..)</html:div>
-  </box>
-</box>
+  <separator class="groove"/>
+  <box id="okCancelButtons"/>
 
 </window>

mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd

@@ -1,11 +1,12 @@
 <!ENTITY window.title "Message Filters">
 <!ENTITY numberColumn.label "Number">
-<!ENTITY nameColumn.label "Name">
-<!ENTITY activeColumn.label "Active">
+<!ENTITY nameColumn.label "Description">
+<!ENTITY activeColumn.label "Enabled">
 <!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 will be applied in the following order:">
+<!ENTITY filterHeader.label "Filters which are Enabled will be run in the order shown below.">
+<!ENTITY runFiltersNow.label "Run Filter(s) Now">