131762 - can open multiple occurrences of download manager. reversal. r=hewitt sr=ben a=asa

suite/common/pref/pref-download.xul

@@ -21,30 +21,121 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
-<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-download.dtd" >
+<!DOCTYPE window SYSTEM "chrome://pref/locale/pref-download.dtd" >
 
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<page xmlns:html="http://www.w3.org/1999/xhtml"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-download.xul');"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      headertitle="&lHeader;">
+      orient="vertical"
+      headertitle="&lHeader;"
+      onload="if( parent.handle ) parent.handle.onpageload( 'pref-download' ); else parent.queuedTag = 'pref-download';">
 
   <script type="application/x-javascript">
-  <![CDATA[
+  // startup function called by the prefs architecture.
-    var _elementIDs = ["downloadBehavior"];
+  function Startup()
-  ]]>
+  {
-  </script>browser.downloadmanager.behavior
+    DoEnabling();
-  
+  }
-  <groupbox>
-    <caption label="&downloadBehavior.label;"/>
-    <radiogroup id="downloadBehavior" prefstring="browser.downloadmanager.behavior">
-      <radio value="0" label="&openDM.label;" accesskey="&openDM.accesskey;"/>
-      <radio value="1" label="&openProgressDialog.label;" accesskey="&openProgressDialog.accesskey;"/>
-      <radio value="2" label="&doNothing.label;" accesskey="&doNothing.accesskey;"/>
-    </radiogroup>
 
-  </groupbox>
+  function DoEnabling()
+  {
+    var increments = document.getElementById("offlineNewsDownloadIncrements");
+    var textbox = document.getElementById("offlineNewsDownloadDays");
+    var radio0 = document.getElementById("offlineNewsDownloadUseDays0");
+    var radio1 = document.getElementById("offlineNewsDownloadUseDays1");
+    var downloadByDate = document.getElementById("offlineNewsDownloadByDate");
+    if( !downloadByDate.checked ) {
+      increments.setAttribute( "disabled", "true" );
+      textbox.setAttribute( "disabled", "true" );
+      radio0.setAttribute( "disabled", "true" );
+      radio1.setAttribute( "disabled", "true" );
+    }
+    else {
+      radio0.removeAttribute("disabled");
+      radio1.removeAttribute("disabled");
+      if( radio0.checked ) {
+        increments.removeAttribute( "disabled" );
+        textbox.setAttribute( "disabled", "true" );
+      } 
+      else if( radio1.checked ) {
+        textbox.removeAttribute( "disabled" );
+        increments.setAttribute( "disabled", "true" );
+      }
+    }
+  }
+  </script>
+  
+  <html:fieldset>
+    <html:legend align="left">&newmes;</html:legend>
+    <html:div class="hspace-both">
+      <html:input type="checkbox" id="offlineNewsDownloadUnreadOnly"
+                  pref="true" preftype="bool" prefstring="offline.news.download.unread_only"/>
+      <html:label for="offlineNewsDownloadUnreadOnly" accesskey="offlineNewsDownloadUnreadOnly.accesskey" tabindex="0">
+        &downOnlyCheck;     
+      </html:label>
+    </html:div>
+    <html:div class="hspace-both">
+      <html:input type="checkbox" id="offlineNewsDownloadByDate"
+                  onclick="DoEnabling();"
+                  pref="true" preftype="bool" prefstring="offline.news.download.by_date"/>
+      <html:label for="offlineNewsDownloadByDate" accesskey="offlineNewsDownloadByDate.accesskey" tabindex="0">     
+        &downDateCheck;
+      </html:label>
+    </html:div>
+    <html:div class="hspace-both" style="padding-left: 35px;">
+      <html:table cellpadding="0" cellspacing="0">
+        <html:tr>
+          <html:td valign="middle">
+            <html:input type="radio" name="offline" id="offlineNewsDownloadUseDays0"
+                        onclick="DoEnabling()" style="margin-bottom: 5px;"
+                        pref="true" preftype="int" prefindex="0" prefstring="offline.news.download.use_days"/>
+            <html:label for="offlineNewsDownloadUseDays0" accesskey="offlineNewsDownloadUseDays0.accesskey" tabindex="0">     
+              &fromRadio.label;
+            </html:label> 
+          </html:td>
+          <html:td valign="middle">
+            <html:select id="offlineNewsDownloadIncrements"
+                         pref="true" preftype="int" prefstring="offline.news.download.increments">
+              <html:option value="0">&yesterday.select;</html:option>
+              <html:option value="1">&oneW.select;</html:option>
+              <html:option value="2">&twoW.select;</html:option>
+              <html:option value="3">&oneM.select;</html:option>
+              <html:option value="4">&sixM.select;</html:option>
+              <html:option value="5">&oneY.select;</html:option>
+            </html:select> 
+          </html:td>
+        </html:tr>
+        <html:tr>
+          <html:td valign="middle">
+            <html:input type="radio" name="offline" id="offlineNewsDownloadUseDays1"
+                        onclick="DoEnabling()" style="margin-bottom: 5px;"
+                        pref="true" preftype="int" prefindex="1" prefstring="offline.news.download.use_days"/>
+            <html:label for="offlineNewsDownloadUseDays1" accesskey="offlineNewsDownloadUseDays1.accesskey" tabindex="0">     
+              &sinceRadio.label;
+            </html:label>
+          </html:td>
+          <html:td valign="middle">
+            <html:input type="text" size="5" id="offlineNewsDownloadDays"
+                        style="margin-right: 5px; margin-left: 0px;"
+                        pref="true" preftype="int" prefstring="offline.news.download.days"/>
+            <html:label>&daysAgo;</html:label>
+          </html:td>
+        </html:tr>
+      </html:table>
+    </html:div>  
+  </html:fieldset>
+
+  <html:fieldset>
+    <html:legend align="left">&Allmsg;</html:legend>
+    <vbox flex="100%" style="width: 100%; height: 100%">
+      <html:div class="hspace-both">&offlineMsgs;</html:div>
+      <html:div class="hspace-both vspace">
+        <button class="dialog push" label="&select;" align="left"/>
+      </html:div>
+    </vbox>
+    <spacer style="height: 30px;"/>
+  </html:fieldset>
 
 </page>
 

suite/common/pref/preftree.xul

@@ -100,11 +100,6 @@
             <outlinercell url="chrome://communicator/content/pref/pref-tabs.xul" label="&tabWindows.label;"/>
           </outlinerrow>
         </outlineritem>
-        <outlineritem>
-          <outlinerrow>
-            <outlinercell url="chrome://communicator/content/pref/pref-download.xul" label="&download.label;"/>
-          </outlinerrow>
-        </outlineritem>
         <!-- Taking out Policies panel b/c bug 44121
         <outlineritem>
           <outlinerrow>

suite/locales/en-US/chrome/common/pref/preftree.dtd

@@ -29,7 +29,6 @@
 <!ENTITY debug.label  "Debug">
 <!ENTITY debug1.label "Events">
 <!ENTITY debug2.label "Networking">
-<!ENTITY download.label "Downloads">
 <!ENTITY search.label "Internet Search">
 <!ENTITY policies.label "Security Policies">
 <!ENTITY mousewheel.label "Mouse Wheel">