more changes, not visible to the end user yet, for spam UI. bug #169638.

mailnews/base/resources/content/junkMail.js

@@ -125,13 +125,26 @@ function storeSettings(aSettings, aLoggingEnabled)
 
 function conditionallyEnableUI(id)
 {
-  var enabled;
+  if (!document.getElementById("level").checked) {
+    document.getElementById("useWhiteList").disabled = true;
+    document.getElementById("whiteListAbURI").disabled = true;
+    document.getElementById("moveOnSpam").disabled = true;
 
-  if (!id || id == "level") {
-    enabled = document.getElementById("level").checked;
-    dump("XXX enabled = " + enabled + "\n");
+    document.getElementById("moveTargetMode0").disabled = true;
+    document.getElementById("actionTargetAccount").disabled = true;
+    document.getElementById("moveTargetMode1").disabled = true;
+    document.getElementById("actionTargetFolder").disabled = true;
+
+    document.getElementById("purge").disabled = true;
+    document.getElementById("purgeInterval").disabled = true;
+    document.getElementById("purgeLabel").disabled = true;
+    return;
   }
 
+  document.getElementById("useWhiteList").disabled = false;
+  document.getElementById("moveOnSpam").disabled = false;
+
+  var enabled;
   if (!id || id == "moveOnSpam") {
     enabled = document.getElementById("moveOnSpam").checked;
     document.getElementById("moveTargetMode").disabled = !enabled;
@@ -140,6 +153,11 @@ function conditionallyEnableUI(id)
  
     document.getElementById("actionTargetAccount").disabled = !enabled || (choice == 1);
     document.getElementById("actionTargetFolder").disabled = !enabled || (choice == 0);
+
+    var checked = document.getElementById("purge").checked;
+    document.getElementById("purge").disabled = !enabled;
+    document.getElementById("purgeInterval").disabled = !enabled || !checked;
+    document.getElementById("purgeLabel").disabled = !enabled || !checked;
   }
 
   if (!id || id == "purge") {

mailnews/base/resources/content/junkMail.xul

@@ -56,7 +56,7 @@
   <description>&info2.label;</description>
   <separator/>
 
-  <checkbox id="level" oncommand="conditionallyEnableUI('label');" accesskey="&level.accesskey;" label="&level.label;"/>
+  <checkbox id="level" oncommand="conditionallyEnableUI(null);" accesskey="&level.accesskey;" label="&level.label;"/>
 
   <separator/>
 
@@ -87,7 +87,7 @@
       <grid class="specialFolderPickerGrid">
         <columns>
           <column flex="1"/>
-          <column flex="2"/>
+          <column flex="1"/>
         </columns>
         <rows>
           <row align="center">
@@ -110,7 +110,6 @@
     </radiogroup>
   </vbox>
 
-
 </vbox>
 
 </dialog>

mailnews/base/resources/locale/en-US/junkMail.dtd

@@ -10,7 +10,7 @@
 <!ENTITY move.label "Move incoming messages determined to be junk to:">
 <!ENTITY otherFolder.label "Other:">
 <!ENTITY junkFolderOn.label "&quot;Junk Mail&quot; folder on:">
-<!ENTITY purge1.label "Automatically delete messages identified as junk after">
+<!ENTITY purge1.label "Automatically delete messages marked as junk mail after">
 <!ENTITY purge1.accesskey "u">
 <!ENTITY purge2.label "days">
 <!ENTITY whitelist.label "Do not mark messages as junk mail if the sender is my address book:">