From 7ffd7b9ce3d10f04d946840dcc74323fa291129c Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Tue, 5 Apr 2005 23:29:48 +0000
Subject: [PATCH] Bug #288097 --> Add a Anti-Virus Tab to the Privacy Options
 Pane, move the security tab into the privacy panel

Bug #289210 --> Promote Offline and Disk Space to a top level tab under Advanced
---
 mail/components/preferences/advanced.js       |  30 -----
 mail/components/preferences/advanced.xul      | 108 ++++++++++--------
 mail/components/preferences/jar.mn            |   1 -
 mail/components/preferences/offline.xul       |   0
 mail/components/preferences/privacy.js        |  24 ++++
 mail/components/preferences/privacy.xul       |  44 ++++++-
 .../chrome/messenger/preferences/advanced.dtd |  62 ++++++----
 .../chrome/messenger/preferences/offline.dtd  |   0
 .../chrome/messenger/preferences/privacy.dtd  |  18 +++
 mail/locales/jar.mn                           |   1 -
 10 files changed, 182 insertions(+), 106 deletions(-)
 delete mode 100644 mail/components/preferences/offline.xul
 delete mode 100644 mail/locales/en-US/chrome/messenger/preferences/offline.dtd

diff --git a/mail/components/preferences/advanced.js b/mail/components/preferences/advanced.js
index a9c4888ac15..0a12b961331 100644
--- a/mail/components/preferences/advanced.js
+++ b/mail/components/preferences/advanced.js
@@ -58,36 +58,6 @@ var gAdvancedPane = {
     }
   },
 
-  showCertificates: function ()
-  {
-    document.documentElement.openSubDialog("chrome://pippki/content/certManager.xul",
-                                        "width=600,height=400", null);
-  },
-  
-  showCRLs: function ()
-  {
-    document.documentElement.openSubDialog("chrome://pippki/content/crlManager.xul",
-                                        "width=600,height=400", null);
-  },
-  
-  showOCSP: function ()
-  {
-    document.documentElement.openSubDialog("chrome://mozapps/content/preferences/ocsp.xul",
-                                           "", null);
-  },
-  
-  showSecurityDevices: function ()
-  {
-    document.documentElement.openSubDialog("chrome://pippki/content/device_manager.xul",
-                                        "width=600,height=400", null);
-  },
-
-  showOfflineSettings: function()
-  {
-    document.documentElement.openSubDialog("chrome://messenger/content/preferences/offline.xul",
-                                           "", null);
-  },
-
   showConfigEdit: function()
   {
     document.documentElement.openSubDialog("chrome://global/content/config.xul",
diff --git a/mail/components/preferences/advanced.xul b/mail/components/preferences/advanced.xul
index 48269d7f313..f37385e7b23 100644
--- a/mail/components/preferences/advanced.xul
+++ b/mail/components/preferences/advanced.xul
@@ -60,22 +60,18 @@
       <preference id="app.update.autoUpdateEnabled"    name="app.update.autoUpdateEnabled"    type="bool"/>
       <preference id="extensions.update.autoUpdateEnabled" name="extensions.update.autoUpdateEnabled" type="bool"/>
       <preference id="mailnews.tcptimeout" name="mailnews.tcptimeout" type="int"/>
-      <preference id="security.disable_button.openCertManager"
-                  name="security.disable_button.openCertManager"
-                  type="bool"/>
-      <preference id="security.OCSP.disable_button.managecrl"
-                  name="security.OCSP.disable_button.managecrl"
-                  type="bool"/>
-      <preference id="security.disable_button.openDeviceManager"
-                  name="security.disable_button.openDeviceManager"
-                  type="bool"/>
+      <preference id="offline.startup_state"                 name="offline.startup_state"     type="int"/>
+      <preference id="offline.send.unsent_messages"          name="offline.send.unsent_messages" type="int"/>
+      <preference id="offline.download.download_messages"    name="offline.download.download_messages"    type="int"/>
+      <preference id="mail.prompt_purge_threshhold"          name="mail.prompt_purge_threshhold"    type="bool"/>
+      <preference id="mail.purge_threshhold"                 name="mail.purge_threshhold"    type="int"/> 
     </preferences>
 
     <tabbox id="advancedPrefs" flex="1" onselect="gAdvancedPane.tabSelectionChanged();">
       <tabs>
         <tab label="&itemGeneral.label;"/>
+        <tab label="&itemOffline.label;"/>
         <tab label="&itemUpdate.label;"/>
-        <tab label="&itemSecurity.label;"/>
       </tabs>
       
       <tabpanels flex="1">
@@ -105,6 +101,12 @@
                       accesskey="&showFolderColumns.accesskey;" preference="mail.showFolderPaneColumns"/>
           </hbox> 
           
+          <hbox align="center" pack="start">
+            <label value="&connectionTimeout.label;" accesskey="&connectionTimeout.accesskey;" control="connectionTimeoutBox" />
+            <textbox  id="connectionTimeoutBox" size="3" preference="mailnews.tcptimeout"/>
+            <label value="&connectionSeconds.label;"/>
+          </hbox>
+                    
           <separator class="thin"/>
 
           <vbox>
@@ -122,24 +124,58 @@
           
           <separator class="thin"/>
 
-          <hbox align="center" pack="start">
-            <label value="&connectionTimeout.label;" accesskey="&connectionTimeout.accesskey;" control="connectionTimeoutBox" />
-            <textbox  id="connectionTimeoutBox" size="3" preference="mailnews.tcptimeout"/>
-            <label value="&connectionSeconds.label;"/>
-          </hbox>
-
-          <hbox align="center">
-            <description flex="1">&offline.label;</description>
-            <button label="&showOfflineSettings.label;" 
-                    accesskey="&showOfflineSettings.accesskey;" 
-                    oncommand="gAdvancedPane.showOfflineSettings();"/>
-          </hbox>
           <hbox align="center" pack="start">
             <description flex="1">&configEditDesc.label;</description>
             <button id="configEditor" label="&configEdit.label;" 
                     accesskey="&configEdit.accesskey;" oncommand="gAdvancedPane.showConfigEdit();"/>
           </hbox>
         </tabpanel>
+
+        <tabpanel orient="vertical">
+          <!-- Offline --> 
+          <groupbox>
+            <caption label="&offline.label;"/>
+
+            <label value="&textStartUp;"/>
+              <radiogroup id="whenStartingUp" class="indent" preference="offline.startup_state">
+                <radio value="0" label="&radioRememberPrevState;" accesskey="&radioRememberPrevState.accesskey;"/>
+                <radio value="1" label="&radioAskMe;" accesskey="&radioAskMe.accesskey;"/>
+                <radio value="2" label="&radioAlwaysOnline;" accesskey="&radioAlwaysOnline.accesskey;"/>
+              </radiogroup>
+
+            <separator class="thin"/>
+
+            <label value="&textGoingOnline;"/>
+              <radiogroup id="whengoingOnlinestate" orient="horizontal" class="indent"
+                          preference ="offline.send.unsent_messages">
+                <radio value="1" label="&radioAutoSend;"  accesskey="&radioAutoSend.accesskey;"/>
+                <radio value="2" label="&radioNotSend;"   accesskey="&radioNotSend.accesskey;"/>
+                <radio value="0" label="&radioAskUnsent;" accesskey="&radioAskUnsent.accesskey;"/>
+              </radiogroup>
+
+            <separator class="thin"/>
+
+            <label value="&textGoingOffline;"/>
+               <radiogroup id="whengoingOfflinestate" orient="horizontal" class="indent" 
+                           preference="offline.download.download_messages">
+                  <radio value="1" label="&radioAutoDownload;" accesskey="&radioAutoDownload.accesskey;"/>
+                  <radio value="2" label="&radioNotDownload;"  accesskey="&radioNotDownload.accesskey;"/>
+                  <radio value="0" label="&radioAskDownload;"  accesskey="&radioAskDownload.accesskey;"/>
+              </radiogroup>
+          </groupbox>
+
+          <separator class="thin"/>
+
+          <groupbox>
+            <caption label="&Diskspace;"/>	    
+            <hbox align="center">
+                <checkbox id="offlineCompactFolder" label="&offlineCompact.label;" accesskey="&offlineCompact.accesskey;"
+                          preference="mail.prompt_purge_threshhold"/> 
+                <textbox id="offlineCompactFolderMin" size="5" value="100" preference="mail.purge_threshhold"/>
+                <label value="&kb.label;"/>
+            </hbox>
+          </groupbox>
+        </tabpanel>
         
         <!-- Update --> 
         <tabpanel orient="vertical">
@@ -175,33 +211,7 @@
               </hbox>
             </vbox>
           </vbox>
-        </tabpanel>
-        
-        <!-- Security --> 
-        <tabpanel orient="vertical"> 
-          <groupbox>
-            <caption label="&certificates.label;"/>
-
-            <description>&certificatesInfo.label;</description>
-            
-            <separator class="thin"/>
-
-            <description>
-              <button label="&viewCertificates.label;" accesskey="&viewCertificates.accesskey;" 
-                      oncommand="gAdvancedPane.showCertificates();"
-                      preference="security.disable_button.openCertManager"/>
-              <button label="&viewCRLs.label;" accesskey="&viewCRLs.accesskey;" 
-                      oncommand="gAdvancedPane.showCRLs();"
-                      preference="security.OCSP.disable_button.managecrl"/>
-              <button label="&viewOCSP.label;" accesskey="&viewOCSP.accesskey;" 
-                      oncommand="gAdvancedPane.showOCSP();"/>
-              <button label="&viewSecurityDevices.label;" accesskey="&viewSecurityDevices.accesskey;" 
-                      oncommand="gAdvancedPane.showSecurityDevices();"
-                      preference="security.disable_button.openDeviceManager"/>
-            </description>
-          </groupbox>
-        </tabpanel>
-
+        </tabpanel> 
       </tabpanels>
     </tabbox>
 
diff --git a/mail/components/preferences/jar.mn b/mail/components/preferences/jar.mn
index 89988029516..3bd625c3e0d 100644
--- a/mail/components/preferences/jar.mn
+++ b/mail/components/preferences/jar.mn
@@ -30,7 +30,6 @@ messenger.jar:
 *   content/messenger/preferences/fonts.xul
 *   content/messenger/preferences/notifications.xul
 *   content/messenger/preferences/notifications.js
-*   content/messenger/preferences/offline.xul
 *   content/messenger/AccountManager.xul                            (/mailnews/base/prefs/resources/content/AccountManager.xul)
     content/messenger/AccountManager.js                             (/mailnews/base/prefs/resources/content/AccountManager.js)
     content/messenger/am-main.xul                                   (/mailnews/base/prefs/resources/content/am-main.xul)
diff --git a/mail/components/preferences/offline.xul b/mail/components/preferences/offline.xul
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mail/components/preferences/privacy.js b/mail/components/preferences/privacy.js
index a0cf44ddae9..16ed64fea99 100644
--- a/mail/components/preferences/privacy.js
+++ b/mail/components/preferences/privacy.js
@@ -137,4 +137,28 @@ var gPrivacyPane = {
       document.getElementById("setMasterPassword").focus();
     }
   },
+
+  showCertificates: function ()
+  {
+    document.documentElement.openSubDialog("chrome://pippki/content/certManager.xul",
+                                        "width=600,height=400", null);
+  },
+  
+  showCRLs: function ()
+  {
+    document.documentElement.openSubDialog("chrome://pippki/content/crlManager.xul",
+                                        "width=600,height=400", null);
+  },
+  
+  showOCSP: function ()
+  {
+    document.documentElement.openSubDialog("chrome://mozapps/content/preferences/ocsp.xul",
+                                           "", null);
+  },
+  
+  showSecurityDevices: function ()
+  {
+    document.documentElement.openSubDialog("chrome://pippki/content/device_manager.xul",
+                                        "width=600,height=400", null);
+  },
 };
diff --git a/mail/components/preferences/privacy.xul b/mail/components/preferences/privacy.xul
index b73888ef413..e49b7256cd3 100644
--- a/mail/components/preferences/privacy.xul
+++ b/mail/components/preferences/privacy.xul
@@ -69,20 +69,34 @@
                   type="bool"/>
       <preference id="mail.phishing.detection.enabled"
                   name="mail.phishing.detection.enabled"
-                  type="bool"/>  
+                  type="bool"/> 
+      <preference id="mailnews.downloadToTempFile"
+                  name="mailnews.downloadToTempFile"
+                  type="bool"/>                   
       <preference id="wallet.crypto"
                   name="wallet.crypto"
                   type="bool"/>
       <preference id="pref.privacy.disable_button.view_passwords"
                   name="pref.privacy.disable_button.view_passwords"
                   type="bool"/>
+      <preference id="security.disable_button.openCertManager"
+                  name="security.disable_button.openCertManager"
+                  type="bool"/>
+      <preference id="security.OCSP.disable_button.managecrl"
+                  name="security.OCSP.disable_button.managecrl"
+                  type="bool"/>
+      <preference id="security.disable_button.openDeviceManager"
+                  name="security.disable_button.openDeviceManager"
+                  type="bool"/>
     </preferences>
 
     <tabbox id="privacyPrefs" flex="1" onselect="gPrivacyPane.tabSelectionChanged();">
       <tabs>
         <tab label="&itemGeneral.label;"/>
         <tab label="&itemPhishing.label;"/>
+        <tab label="&itemAntiVirus.label;"/>
         <tab label="&itemPasswords.label;"/>
+        <tab label="&itemSecurity.label;"/>
       </tabs>
       
       <tabpanels flex="1">
@@ -133,6 +147,16 @@
                     preference="mail.phishing.detection.enabled"/>
 
         </tabpanel>
+
+        <!-- Anti Virus --> 
+        <tabpanel orient="vertical">
+          <description>&antiVirus.intro;</description>
+          <class separator="thin"/>
+          <checkbox id="enableAntiVirusQuaruntine"
+                    label="&antiVirus.label;" accesskey="&antiVirus.accesskey;"
+                    preference="mailnews.downloadToTempFile"/>
+
+        </tabpanel>
         
         <!-- Password --> 
 
@@ -160,6 +184,24 @@
           </hbox>
         </tabpanel>
 
+        <!-- Security --> 
+        <tabpanel orient="vertical"> 
+          <description>&certificatesInfo.label;</description>           
+          <separator class="thin"/>
+          <description class="indent">
+            <button label="&viewCertificates.label;" accesskey="&viewCertificates.accesskey;" 
+                    oncommand="gPrivacyPane.showCertificates();"
+                    preference="security.disable_button.openCertManager"/>
+            <button label="&viewCRLs.label;" accesskey="&viewCRLs.accesskey;" 
+                    oncommand="gPrivacyPane.showCRLs();"
+                    preference="security.OCSP.disable_button.managecrl"/>
+            <button label="&viewOCSP.label;" accesskey="&viewOCSP.accesskey;" 
+                    oncommand="gPrivacyPane.showOCSP();"/>
+            <button label="&viewSecurityDevices.label;" accesskey="&viewSecurityDevices.accesskey;" 
+                    oncommand="gPrivacyPane.showSecurityDevices();"
+                    preference="security.disable_button.openDeviceManager"/>
+          </description>
+        </tabpanel>
       </tabpanels>
     </tabbox>
 
diff --git a/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd b/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
index b1e6f3543ae..7ca2865b699 100644
--- a/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
@@ -1,11 +1,11 @@
 <!ENTITY itemGeneral.label       "General">
 <!ENTITY itemUpdate.label        "Update">
-<!ENTITY itemSecurity.label      "Security">
+<!ENTITY itemOffline.label       "Offline &amp; Disk Space">
 
 <!-- General Settings -->
 
 <!ENTITY showCondensedAddresses.label  "Show only display name for people in my address book">
-<!ENTITY showCondensedAddresses.accesskey "S">
+<!ENTITY showCondensedAddresses.accesskey "p">
 
 <!-- LOCALIZATION NOTE (markAsRead.label): This will concatenate with
      "xxx seconds before marking a message as read", using a number and
@@ -15,21 +15,18 @@
 <!ENTITY markAsReadEnd.label           "seconds before marking a message as read">
 <!ENTITY markAsReadEnd.accesskey       "d">
 <!ENTITY showFolderColumns.label       "Show expanded columns in the folder pane">
-<!ENTITY showFolderColumns.accesskey   "h">
+<!ENTITY showFolderColumns.accesskey   "f">
 <!ENTITY rememberLastMsg.label         "Remember the last selected message">
-<!ENTITY rememberLastMsg.accesskey     "e">
+<!ENTITY rememberLastMsg.accesskey     "b">
 <!ENTITY reuseExp.label                "Open new messages in:">
 <!ENTITY reuseExpRadio0.label          "A new message window">
-<!ENTITY reuseExpRadio0.accesskey      "n">
+<!ENTITY reuseExpRadio0.accesskey      "i">
 <!ENTITY reuseExpRadio1.label          "An existing message window">
 <!ENTITY reuseExpRadio1.accesskey      "x">
-<!ENTITY showOfflineSettings.label     "Offline Settings...">
-<!ENTITY showOfflineSettings.accesskey "f">
-<!ENTITY connectionTimeout.label "Connection timeout: ">
+<!ENTITY connectionTimeout.label       "Connection timeout: ">
 <!ENTITY connectionTimeout.accesskey   "C">
-<!ENTITY connectionSeconds.label "seconds">
-<!ENTITY offline.label                 "Configure Offline Settings">
-<!ENTITY configEditDesc.label          "&brandShortName;'s Configuration File">
+<!ENTITY connectionSeconds.label       "seconds">
+<!ENTITY configEditDesc.label          "Advanced Configuration">
 <!ENTITY configEdit.label              "Config Editor...">
 <!ENTITY configEdit.accesskey          "g">
 
@@ -38,19 +35,36 @@
 <!ENTITY enableSmartUpdate.label        "&brandShortName;">
 <!ENTITY enableSmartUpdate.accesskey    "T">
 <!ENTITY enableExtensionUpdate.label    "My Extensions and Themes">
-<!ENTITY enableExtensionUpdate.accesskey "y">
+<!ENTITY enableExtensionUpdate.accesskey "M">
 <!ENTITY checkNow.label                 "Check Now...">
 <!ENTITY appCheckNow.accesskey          "k">
-<!ENTITY extensionsCheckNow.accesskey   "o">
+<!ENTITY extensionsCheckNow.accesskey   "h">
 
-<!-- Security -->
-<!ENTITY certificates.label             "Certificates">
-<!ENTITY certificatesInfo.label         "Manage certificates, revocation lists, certificate verification and security devices">
-<!ENTITY viewCertificates.label         "View Certificates">
-<!ENTITY viewCertificates.accesskey     "i">
-<!ENTITY viewCRLs.label                 "Revocation Lists">
-<!ENTITY viewCRLs.accesskey             "R">
-<!ENTITY viewOCSP.label                 "Verification">
-<!ENTITY viewOCSP.accesskey             "V">
-<!ENTITY viewSecurityDevices.label      "Security Devices">
-<!ENTITY viewSecurityDevices.accesskey  "u">
+<!-- Offline and Disk Space -->
+<!ENTITY offline.label  "Offline">
+<!ENTITY textStartUp   "When starting up:">
+<!ENTITY radioRememberPrevState "Remember previous online state">
+<!ENTITY radioRememberPrevState.accesskey "R">
+<!ENTITY radioAskMe "Ask me for online state at startup">
+<!ENTITY radioAskMe.accesskey "u">
+<!ENTITY radioAlwaysOnline "Always start up online">
+<!ENTITY radioAlwaysOnline.accesskey "l">
+
+<!ENTITY textGoingOnline "Send unsent messages when going online?">
+<!ENTITY radioAutoSend "Yes">
+<!ENTITY radioAutoSend.accesskey "Y">
+<!ENTITY radioNotSend "No">
+<!ENTITY radioNotSend.accesskey "N">
+<!ENTITY radioAskUnsent "Ask me">
+<!ENTITY radioAskUnsent.accesskey "s">
+<!ENTITY textGoingOffline "Download messages for offline use when going offline?">
+<!ENTITY radioAutoDownload "Yes">
+<!ENTITY radioAutoDownload.accesskey "e">
+<!ENTITY radioNotDownload "No">
+<!ENTITY radioNotDownload.accesskey "o">
+<!ENTITY radioAskDownload "Ask me">
+<!ENTITY radioAskDownload.accesskey "a">
+<!ENTITY Diskspace "Disk Space">
+<!ENTITY offlineCompact.label "Compact folders when it will save over">
+<!ENTITY offlineCompact.accesskey "v">
+<!ENTITY kb.label "KB">
diff --git a/mail/locales/en-US/chrome/messenger/preferences/offline.dtd b/mail/locales/en-US/chrome/messenger/preferences/offline.dtd
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd b/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
index 56f2a01d26c..8e46f70dd69 100644
--- a/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
@@ -1,6 +1,8 @@
 <!ENTITY itemGeneral.label       "General">
 <!ENTITY itemPhishing.label      "E-mail Scams">
 <!ENTITY itemPasswords.label     "Passwords">
+<!ENTITY itemAntiVirus.label     "Anti-Virus">
+<!ENTITY itemSecurity.label      "Security">
 
 <!ENTITY disableImageInMailNews.label  "Block loading of remote images in mail messages">
 <!ENTITY disableImageInMailNews.accesskey "B">
@@ -26,3 +28,19 @@
 <!ENTITY  viewPasswords.label         "View Saved Passwords">
 <!ENTITY  viewPasswords.accesskey     "V">
 
+<!-- Security -->
+<!ENTITY certificates.label             "Certificates">
+<!ENTITY certificatesInfo.label         "Manage certificates, revocation lists, certificate verification and security devices.">
+<!ENTITY viewCertificates.label         "View Certificates">
+<!ENTITY viewCertificates.accesskey     "i">
+<!ENTITY viewCRLs.label                 "Revocation Lists">
+<!ENTITY viewCRLs.accesskey             "e">
+<!ENTITY viewOCSP.label                 "Verification">
+<!ENTITY viewOCSP.accesskey             "f">
+<!ENTITY viewSecurityDevices.label      "Security Devices">
+<!ENTITY viewSecurityDevices.accesskey  "u">
+
+<!-- Anti Virus -->
+<!ENTITY antiVirus.intro      "&brandShortName; can make it easy for anti-virus software to analyze incoming mail messages for viruses before they are stored locally.">
+<!ENTITY antiVirus.label      "Allow anti-virus clients to quarantine individual incoming messages">
+<!ENTITY antiVirus.accesskey  "l">
diff --git a/mail/locales/jar.mn b/mail/locales/jar.mn
index 881b53fa042..93246b0de01 100644
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -120,7 +120,6 @@
   locale/@AB_CD@/messenger/preferences/advanced.dtd                     (%chrome/messenger/preferences/advanced.dtd)
   locale/@AB_CD@/messenger/preferences/receipts.dtd                     (%chrome/messenger/preferences/receipts.dtd)
   locale/@AB_CD@/messenger/preferences/connection.dtd                   (%chrome/messenger/preferences/connection.dtd)
-  locale/@AB_CD@/messenger/preferences/offline.dtd                      (%chrome/messenger/preferences/offline.dtd)
   locale/@AB_CD@/messenger/preferences/downloads.dtd                    (%chrome/messenger/preferences/downloads.dtd)
   locale/@AB_CD@/messenger/preferences/downloadactions.dtd              (%chrome/messenger/preferences/downloadactions.dtd)
   locale/@AB_CD@/messenger/preferences/changeaction.dtd                 (%chrome/messenger/preferences/changeaction.dtd)