183994 - filter/search dialog ui nits, 169938 - clean up filter list statusbar, 186217 - filter not saved after action error, 195313 - menulists in filter/search dialogs dynamically change width. r/sr=sspitzer

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

@@ -127,7 +127,7 @@ function filterEditorOnLoad()
       var count = 1;
       var name = stub;
 
-      // Set the default filter name to be "untitled filter"
+      // Set the default filter name to be "Untitled Filter"
       while (duplicateFilterNameExists(name)) 
       {
         count++;
@@ -490,6 +490,10 @@ function saveFilter()
   {
     str = gFilterBundle.getString("mustSelectAction");
     window.alert(str);
+
+    // reset gFilter so that filter is still saved next time around
+    // see bug #186217
+    gFilter = null;
     return false;
   }
 

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

@@ -36,7 +36,6 @@ Contributor(s):
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&window.title;"
   windowtype="mailnews:filtereditor"
-  width="560" height="460"
   persist="width height screenX screenY"
   buttons="accept,cancel,help"
   onload="filterEditorOnLoad();"
@@ -67,101 +66,105 @@ Contributor(s):
 
   <vbox flex="1">
     <label value="&conditionDesc.label;"/>
-    <vbox id="searchTermListBox" flex="1"/>
+    <hbox flex="1">
+      <vbox id="searchTermListBox" flex="1"/>
+    </hbox>
   </vbox>
 
   <separator/>
 
-  <vbox>
+  <vbox flex="1">
     <label value="&filterActionDesc.label;" accesskey="&filterActionDesc.accesskey;"/>
-    <hbox align="start" height="100">
-    <listbox flex="1" id="filterActionList">
-      <listcols>
-        <listcol flex="1"/>
-        <listcol flex="1"/>
-        <listcol flex="1"/>
-      </listcols>
-      <listitem allowevents="true">
-        <listcell>
-          <checkbox id="moveToFolder" enablefornews="false" label="&moveToFolder.label;"/>
-        </listcell>
-        <listcell> 
-          <menulist id="actionTargetFolder" enablefornews="false" flex="1"/>
-        </listcell>
-        <listcell> 
-          <button id="newFolderButton" enablefornews="false" label="&newFolderButton.label;" 
-              accesskey="&newFolderButton.accesskey;" 
-              oncommand="MsgNewFolder(SearchNewFolderOkCallback);"/>
-        </listcell>
-      </listitem>
+    <hbox flex="1">
+      <vbox flex="1">
+        <listbox flex="1" id="filterActionList">
+          <listcols>
+            <listcol flex="1"/>
+            <listcol flex="1"/>
+            <listcol flex="1"/>
+          </listcols>
+          <listitem allowevents="true">
+            <listcell>
+              <checkbox id="moveToFolder" enablefornews="false" label="&moveToFolder.label;"/>
+            </listcell>
+            <listcell> 
+              <menulist id="actionTargetFolder" enablefornews="false" flex="1"/>
+            </listcell>
+            <listcell> 
+              <button id="newFolderButton" enablefornews="false" label="&newFolderButton.label;" 
+                  accesskey="&newFolderButton.accesskey;" 
+                  oncommand="MsgNewFolder(SearchNewFolderOkCallback);"/>
+            </listcell>
+          </listitem>
 
-      <listitem allowevents="true">
-        <listcell>
-        <checkbox id="label" label="&label.label;"/>
-        </listcell>
-        <listcell> 
-          <menulist id="actionValueLabel" flex="1">
-            <menupopup>
-              <!-- see MailNewsTypes2.idl -->
-              <menuitem id="labelMenuItem1" value="1"/>
-              <menuitem id="labelMenuItem2" value="2"/>
-              <menuitem id="labelMenuItem3" value="3"/>
-              <menuitem id="labelMenuItem4" value="4"/>
-              <menuitem id="labelMenuItem5" value="5"/>
-            </menupopup>
-          </menulist>
-        </listcell>
-      </listitem>
+          <listitem allowevents="true">
+            <listcell>
+            <checkbox id="label" label="&label.label;"/>
+            </listcell>
+            <listcell> 
+              <menulist id="actionValueLabel" flex="1">
+                <menupopup>
+                  <!-- see MailNewsTypes2.idl -->
+                  <menuitem id="labelMenuItem1" value="1"/>
+                  <menuitem id="labelMenuItem2" value="2"/>
+                  <menuitem id="labelMenuItem3" value="3"/>
+                  <menuitem id="labelMenuItem4" value="4"/>
+                  <menuitem id="labelMenuItem5" value="5"/>
+                </menupopup>
+              </menulist>
+            </listcell>
+          </listitem>
 
-      <listitem allowevents="true">
-        <listcell>
-          <checkbox id="changePriority" label="&changePriority.label;"/>
-        </listcell>
-        <listcell> 
-          <menulist id="actionValuePriority" flex="1">
-            <menupopup>
-              <!-- see MailNewsTypes2.idl -->
-              <menuitem value="6" label="&highestPriorityCmd.label;"/>
-              <menuitem value="5" label="&highPriorityCmd.label;"/>
-              <menuitem value="4" label="&normalPriorityCmd.label;"/>
-              <menuitem value="3" label="&lowPriorityCmd.label;"/>
-              <menuitem value="2" label="&lowestPriorityCmd.label;"/>
-            </menupopup>
-          </menulist>
-        </listcell>
-      </listitem>
+          <listitem allowevents="true">
+            <listcell>
+              <checkbox id="changePriority" label="&changePriority.label;"/>
+            </listcell>
+            <listcell> 
+              <menulist id="actionValuePriority" flex="1">
+                <menupopup>
+                  <!-- see MailNewsTypes2.idl -->
+                  <menuitem value="6" label="&highestPriorityCmd.label;"/>
+                  <menuitem value="5" label="&highPriorityCmd.label;"/>
+                  <menuitem value="4" label="&normalPriorityCmd.label;"/>
+                  <menuitem value="3" label="&lowPriorityCmd.label;"/>
+                  <menuitem value="2" label="&lowestPriorityCmd.label;"/>
+                </menupopup>
+              </menulist>
+            </listcell>
+          </listitem>
 
-      <listitem allowevents="true">
-        <listcell>
-          <checkbox id="markRead" label="&markRead.label;"/>
-        </listcell>
-      </listitem>
+          <listitem allowevents="true">
+            <listcell>
+              <checkbox id="markRead" label="&markRead.label;"/>
+            </listcell>
+          </listitem>
 
-      <listitem allowevents="true">
-        <listcell>
-          <checkbox id="markFlagged" label="&markFlagged.label;"/>
-        </listcell>
-      </listitem>
+          <listitem allowevents="true">
+            <listcell>
+              <checkbox id="markFlagged" label="&markFlagged.label;"/>
+            </listcell>
+          </listitem>
 
-      <listitem allowevents="true">
-        <listcell>
-          <checkbox id="delete" label="&delete.label;"/>
-        </listcell>
-      </listitem>
+          <listitem allowevents="true">
+            <listcell>
+              <checkbox id="delete" label="&delete.label;"/>
+            </listcell>
+          </listitem>
 
-      <listitem allowevents="true">
-        <listcell>
-          <checkbox id="kill" enablefornews="true" label="&killThread.label;"/>
-        </listcell>
-      </listitem>
+          <listitem allowevents="true">
+            <listcell>
+              <checkbox id="kill" enablefornews="true" label="&killThread.label;"/>
+            </listcell>
+          </listitem>
 
-      <listitem allowevents="true">
-        <listcell>
-          <checkbox id="watch" enablefornews="true" label="&watchThread.label;"/>
-        </listcell>
-      </listitem>
+          <listitem allowevents="true">
+            <listcell>
+              <checkbox id="watch" enablefornews="true" label="&watchThread.label;"/>
+            </listcell>
+          </listitem>
 
-    </listbox>
+        </listbox>
+      </vbox>
     </hbox>
   </vbox>
 

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

@@ -32,6 +32,7 @@ Contributor(s):  Hkan Waara <hwaara@chello.se>
   xmlns:nc="http://home.netscape.com/NC-rdf#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   windowtype="mailnews:filterlist"
+  width="480" height="360"
   onload="onLoad();"
   onclose="return onFilterClose();"
   persist="width height screenX screenY"
@@ -195,10 +196,12 @@ Contributor(s):  Hkan Waara <hwaara@chello.se>
 
   <separator/>
 
-  <hbox id="statusContainerBox" align="center">
-    <spacer flex="1"/>
-    <label id="statusText" crop="right" flex="1"/> 
-    <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
-  </hbox>
+  <statusbar class="chromeclass-status" id="status-bar">    
+    <statusbarpanel class="statusbarpanel-progress">
+      <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
+    </statusbarpanel>
+    <statusbarpanel id="statusText" crop="right" flex="1"/>
+  </statusbar> 
+
 </window>
 

mailnews/base/search/resources/content/searchTermOverlay.js

@@ -332,7 +332,10 @@ function createSearchRow(index, scope, searchTerm)
     var listcells = searchrow.childNodes;
     var j=0;
     for (var i=0; i<listcells.length; i+=2) {
-        stringNodes[j++] = listcells[i];
+      stringNodes[j++] = listcells[i];
+
+      // see bug #183994 for why these cells are hidden
+      listcells[i].hidden = true;
     }
     searchTermObj.booleanNodes = stringNodes;
 

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

@@ -41,13 +41,14 @@
       <hbox id="searchterms"/>
       <listbox flex="1" id="searchTermList">
         <listcols>
-          <listcol flex="&searchTermListSpace1FlexValue;"/>
+          // see bug #183994 for why these cells are hidden
+          <listcol flex="&searchTermListSpace1FlexValue;" hidden="true"/>
           <listcol flex="&searchTermListAttributesFlexValue;"/>
-          <listcol flex="&searchTermListSpace2FlexValue;"/>
+          <listcol flex="&searchTermListSpace2FlexValue;" hidden="true"/>
           <listcol flex="&searchTermListOperatorsFlexValue;"/>
-          <listcol flex="&searchTermListSpace3FlexValue;"/>
+          <listcol flex="&searchTermListSpace3FlexValue;" hidden="true"/>
           <listcol flex="&searchTermListValueFlexValue;"/>
-          <listcol flex="&searchTermListSpace4FlexValue;"/>
+          <listcol flex="&searchTermListSpace4FlexValue;" hidden="true"/>
         </listcols>
 
         <!-- this is what the listitems will look like:

mailnews/base/search/resources/locale/en-US/filter.properties

@@ -6,7 +6,7 @@ mustSelectAction=You must select at least one filter action.
 cannotHaveDuplicateFilterTitle=Duplicate Filter Name
 cannotHaveDuplicateFilterMessage=The filter name you entered already exists. Please enter a different filter name.
 deleteFilterConfirmation=Are you sure you want to delete this filter?
-untitledFilterName=untitled filter
+untitledFilterName=Untitled Filter
 filterListBackUpMsg=Your filters do not work because the msgFilterRules.dat file, which contains your filters, could not be read. A new msgFilterRules.dat file will be created and a backup of the old file, called rulesbackup.dat, will be created in the same directory.
 customHeaderOverflow=You've exceeded the limit of 50 custom headers. Please remove one or more custom headers and try again.
 filterCustomHeaderOverflow=Your filters have exceeded the limit of 50 custom headers. Please edit the msgFilterRules.dat file, which contains your filters, to use fewer custom headers.

mailnews/extensions/mailviews/resources/content/mailViewSetup.xul

@@ -22,6 +22,7 @@ Rights Reserved.
 -->
 
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/searchDialog.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>
@@ -33,7 +34,7 @@ Rights Reserved.
         onunload="mailViewOnUnLoad();"
         windowtype="mailnews:mailview"
         title="&mailViewSetupTitle.label;"
-        width="640" height="300"
+        width="560" height="300"
         persist="screenX screenY width height">
 
   <stringbundleset id="stringbundleset">

themes/classic/messenger/filterDialog.css

@@ -39,3 +39,24 @@ treechildren:-moz-tree-image(activeColumn) {
 treechildren:-moz-tree-image(activeColumn, Enabled-true) {
  list-style-image: url("chrome://messenger/skin/icons/check.gif");
 }
+
+menulist {
+  min-width: 15em;
+}
+
+menulist > menupopup > menuitem {
+  padding-right: 2px;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
+listbox {
+  padding-top: 2px;
+}
+
+#FilterEditor {
+  width: 560px;
+  min-height:1px;
+}

themes/classic/messenger/searchDialog.css

@@ -42,5 +42,21 @@
 #searchResultListBox {
   margin: 5px;
   height: 100px;
-
 }
+
+menulist {
+  min-width: 15em;
+}
+
+menulist > menupopup > menuitem {
+  padding-right: 2px;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
+listbox {
+  padding-top: 2px;
+}
+

themes/modern/messenger/filterDialog.css

@@ -52,3 +52,25 @@ treechildren:-moz-tree-image(activeColumn) {
 treechildren:-moz-tree-image(activeColumn, Enabled-true) {
   list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
 }
+
+menulist {
+  min-width: 15em;
+}
+
+menulist > menupopup > menuitem {
+  padding-right: 2px;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
+listbox {
+  padding-top: 2px;
+}
+
+#FilterEditor {
+  width: 560px;
+  min-height:1px;
+}
+

themes/modern/messenger/searchDialog.css

@@ -58,3 +58,20 @@
   margin: 5px;
   height: 100px;
 }
+
+menulist {
+  min-width: 15em;
+}
+
+menulist > menupopup > menuitem {
+  padding-right: 2px;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
+listbox {
+  padding-top: 2px;
+}
+