Bug #284144 --> add options and disk space UI to the advanced options panel

mail/components/preferences/advanced.js

@@ -82,6 +82,12 @@ var gAdvancedPane = {
                                         "width=600,height=400", null);
   },
 
+  showOfflineSettings: function()
+  {
+    document.documentElement.openSubDialog("chrome://messenger/content/preferences/offline.xul",
+                                           "", null);
+  },
+
   updateAppUpdateUI: function ()
   {
     var preference = document.getElementById("app.update.autoUpdateEnabled");

mail/components/preferences/advanced.xul

@@ -107,17 +107,26 @@
           <separator class="thin"/>
 
           <vbox>
-          <hbox align="center" pack="start">
-            <label value="&reuseExp.label;"/>
-          </hbox>
+            <hbox align="center" pack="start">
+              <label value="&reuseExp.label;"/>
+            </hbox>
           
-          <hbox class="indent">  
-            <radiogroup id="mailnewsDoubleClick2NewWindow" preference="mailnews.reuse_message_window" orient="horizontal">
-              <radio value="false" label="&reuseExpRadio0.label;" accesskey="&reuseExpRadio0.accesskey;" id="new"/>
-              <radio value="true" label="&reuseExpRadio1.label;" accesskey="&reuseExpRadio1.accesskey;" id="existing"/>
-            </radiogroup>
-          </hbox>
+            <hbox class="indent">  
+              <radiogroup id="mailnewsDoubleClick2NewWindow" preference="mailnews.reuse_message_window" orient="horizontal">
+                <radio value="false" label="&reuseExpRadio0.label;" accesskey="&reuseExpRadio0.accesskey;" id="new"/>
+                <radio value="true" label="&reuseExpRadio1.label;" accesskey="&reuseExpRadio1.accesskey;" id="existing"/>
+              </radiogroup>
+            </hbox>
           </vbox>
+          
+          <separator class="thin"/>
+
+          <hbox align="center">
+            <description flex="1">&offline.label;</description>
+            <button label="&showOfflineSettings.label;" 
+                    accesskey="&showOfflineSettings.accesskey;" 
+                    oncommand="gAdvancedPane.showOfflineSettings();"/>
+          </hbox>
         </tabpanel>
         
         <!-- Update --> 

mail/components/preferences/jar.mn

@@ -30,3 +30,4 @@ messenger.jar:
 *   content/messenger/preferences/fonts.xul
 *   content/messenger/preferences/notifications.xul
 *   content/messenger/preferences/notifications.js
+*   content/messenger/preferences/offline.xul

mail/extensions/offline/content/contents.rdf

@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-offline"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger-offline"
-        chrome:displayName="Offline Support"
-        chrome:author="Team Thunderbird"
-        chrome:authorURL="http://www.mozilla.org/projects/thunderbird/specs/offline.html"
-        chrome:name="messenger-offline"
-        chrome:description="This extension adds offline support to Mozilla Thunderbird." 
-        chrome:settingsURL="chrome://messenger-offline/content/pref-offline.xul"
-#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"
-#expand chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
-    <RDF:li resource="chrome://messenger/content/pref-advanced.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
-    <RDF:li>chrome://messenger-offline/content/msgOfflineOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/pref-advanced.xul">
-    <RDF:li>chrome://messenger-offline/content/msgOfflineOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>

mail/extensions/offline/content/msgOfflineOverlay.xul

@@ -75,12 +75,4 @@
     <menuseparator insertafter="offlineMenuItem"/>
   </menupopup>
 
-  <expander id="connections" label="&prefOfflineConnection.label;">
-    <hbox insertbefore="proxyConnectionSettings" align="center" pack="end">
-        <label class="expanderDescription" value="&prefOfflineDesc.label;" flex="1"/>
-        <button label="&prefOfflineButton.label;" accesskey="&prefOfflineButton.accesskey;" 
-         oncommand="window.openDialog('chrome://messenger-offline/content/pref-offline.xul', '', 'chrome,dialog,modal,resizable');"/>
-    </hbox>
-  </expander>
-
 </overlay>

mail/extensions/offline/jar.mn

@@ -2,6 +2,5 @@ offline.jar:
 *   content/messenger-offline/msgOfflineOverlay.xul                (content/msgOfflineOverlay.xul)
 *   content/messenger-offline/mail-offline.js                      (content/mail-offline.js)
 *   content/messenger-offline/contents.rdf                         (content/contents.rdf)
-*   content/messenger-offline/pref-offline.xul                     (content/pref-offline.xul)
 
 

mail/locales/en-US/chrome/messenger/preferences/advanced.dtd

@@ -23,6 +23,9 @@
 <!ENTITY reuseExpRadio0.accesskey      "n">
 <!ENTITY reuseExpRadio1.label          "An existing message window">
 <!ENTITY reuseExpRadio1.accesskey      "x">
+<!ENTITY showOfflineSettings.label     "Offline Settings...">
+<!ENTITY showOfflineSettings.accesskey "f">
+<!ENTITY offline.label                 "Configure Offline Settings">
 
 <!-- Update -->
 <!ENTITY softwareupdateinfo.label       "Periodically check for updates to:">

mail/locales/jar.mn

@@ -120,6 +120,7 @@
   locale/@AB_CD@/messenger/preferences/advanced.dtd                     (@AB_CD@/chrome/messenger/preferences/advanced.dtd)
   locale/@AB_CD@/messenger/preferences/receipts.dtd                     (@AB_CD@/chrome/messenger/preferences/receipts.dtd)
   locale/@AB_CD@/messenger/preferences/connection.dtd                   (@AB_CD@/chrome/messenger/preferences/connection.dtd)
+  locale/@AB_CD@/messenger/preferences/offline.dtd                      (@AB_CD@/chrome/messenger/preferences/offline.dtd)
   locale/@AB_CD@/messenger/preferences/downloads.dtd                    (@AB_CD@/chrome/messenger/preferences/downloads.dtd)
   locale/@AB_CD@/messenger/preferences/downloadactions.dtd              (@AB_CD@/chrome/messenger/preferences/downloadactions.dtd)
   locale/@AB_CD@/messenger/preferences/changeaction.dtd                 (@AB_CD@/chrome/messenger/preferences/changeaction.dtd)
@@ -150,7 +151,6 @@
 * locale/@AB_CD@/messenger-offline/contents.rdf                         (generic/chrome/messenger-offline/contents.rdf)
   locale/@AB_CD@/messenger-offline/offline.properties                   (@AB_CD@/chrome/messenger-offline/offline.properties)
   locale/@AB_CD@/messenger-offline/offline.dtd                          (@AB_CD@/chrome/messenger-offline/offline.dtd)
-  locale/@AB_CD@/messenger-offline/pref-offline.dtd                     (@AB_CD@/chrome/messenger-offline/pref-offline.dtd)
 * locale/@AB_CD@/messenger-region/contents.rdf                          (generic/chrome/messenger-region/contents.rdf)
   locale/@AB_CD@/messenger-region/region.properties                     (@AB_CD@/chrome/messenger-region/region.properties)
 * locale/@AB_CD@/mozldap/contents.rdf                                   (generic/chrome/mozldap/contents.rdf)