Bug 456872: create Advanced -> Display preference tab; move all relevant preferences to it. r=mkmelin
authorBryan W Clark (:clarkbw) <clarkbw@gnome.org>
Fri, 10 Oct 2008 20:58:55 +0300
changeset 575 6454eb36661af7e71d4386679beed93df682cbf7
parent 574 da42f7f36f7b2e29a9a82076fc261b28ba9a1cb2
child 577 0c8a7645484fdf5252260c8a7949f8e2bfad1e2b
push idunknown
push userunknown
push dateunknown
reviewersmkmelin
bugs456872
Bug 456872: create Advanced -> Display preference tab; move all relevant preferences to it. r=mkmelin
mail/components/preferences/advanced.xul
mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
--- a/mail/components/preferences/advanced.xul
+++ b/mail/components/preferences/advanced.xul
@@ -92,92 +92,115 @@
       <preference id="security.disable_button.openDeviceManager"
                   name="security.disable_button.openDeviceManager"
                   type="bool"/>
     </preferences>
 
     <tabbox id="advancedPrefs" flex="1" onselect="gAdvancedPane.tabSelectionChanged();">
       <tabs>
         <tab label="&itemGeneral.label;"/>
+        <tab label="&itemDisplay.label;"/>
         <tab id="networkingTab" label="&itemNetworking.label;"/>
         <tab label="&itemUpdate.label;"/>
         <tab label="&itemCertificates.label;"/>
       </tabs>
 
       <tabpanels flex="1">
         <!-- General -->
         <tabpanel orient="vertical">
-          <hbox>
-            <checkbox id="showCondensedAddresses" label="&showCondensedAddresses.label;"
-                      accesskey="&showCondensedAddresses.accesskey;"  preference="mail.showCondensedAddresses"/>
-          </hbox>
-
-          <vbox>
-            <hbox>
-              <checkbox id="automaticallyMarkAsRead"
-                        preference="mailnews.mark_message_read.auto"
-                        label="&autoMarkAsRead.label;"
-                        accesskey="&autoMarkAsRead.accesskey;"
-                        oncommand="gAdvancedPane.updateMarkAsReadOptions(this.checked)"/>
-            </hbox>
-
-            <radiogroup id="markAsReadAutoPreferences" orient="vertical" class="indent"
-                        preference="mailnews.mark_message_read.delay">
-              <radio id="mark_read_immediately" value="false"
-                     label="&markAsReadNoDelay.label;"
-                     accesskey="&markAsReadNoDelay.accesskey;"/>
-              <hbox align="center">
-                <radio id="markAsReadAfterDelay" value="true"
-                       label="&markAsReadDelay.label;"
-                       accesskey="&markAsReadDelay.accesskey;"/>
-                <textbox id="markAsReadDelay" size="2"
-                         preference="mailnews.mark_message_read.delay.interval"
-                         aria-labelledby="markAsReadAfterDelay markAsReadDelay secondsLabel"/>
-                <label id="secondsLabel" value="&secondsLabel.label;"/>
-              </hbox>
-            </radiogroup>
-          </vbox>
-
-          <hbox>
-            <checkbox id="showFolderPaneColumns" label="&showFolderColumns.label;"
-                      accesskey="&showFolderColumns.accesskey;" preference="mail.showFolderPaneColumns"/>
-          </hbox>
-
-          <separator class="thin"/>
-
-          <vbox>
-            <hbox align="center" pack="start">
-              <label value="&openMsgIn.label;" control="mailnewsDoubleClick2NewWindow"/>
-            </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">&returnReceiptsInfo.label;</description>
             <button label="&showReturnReceipts.label;"
                     accesskey="&showReturnReceipts.accesskey;"
                     oncommand="gAdvancedPane.showReturnReceipts();"/>
           </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>
 
+        <!-- Reading and Display -->
+        <tabpanel orient="vertical">
+          <groupbox>
+            <caption label="&reading.caption;"/>
+
+            <vbox>
+              <hbox>
+                <checkbox id="automaticallyMarkAsRead"
+                          preference="mailnews.mark_message_read.auto"
+                          label="&autoMarkAsRead.label;"
+                          accesskey="&autoMarkAsRead.accesskey;"
+                          oncommand="gAdvancedPane.updateMarkAsReadOptions(this.checked)"/>
+              </hbox>
+
+              <radiogroup id="markAsReadAutoPreferences" orient="vertical"
+                          class="indent"
+                          preference="mailnews.mark_message_read.delay">
+                <radio id="mark_read_immediately" value="false"
+                       label="&markAsReadNoDelay.label;"
+                       accesskey="&markAsReadNoDelay.accesskey;"/>
+                <hbox align="center">
+                  <radio id="markAsReadAfterDelay" value="true"
+                         label="&markAsReadDelay.label;"
+                         accesskey="&markAsReadDelay.accesskey;"/>
+                  <textbox id="markAsReadDelay" size="2"
+                           preference="mailnews.mark_message_read.delay.interval"
+                           aria-labelledby="markAsReadAfterDelay markAsReadDelay secondsLabel"/>
+                  <label id="secondsLabel" value="&secondsLabel.label;"/>
+                </hbox>
+              </radiogroup>
+            </vbox>
+
+            <vbox>
+              <hbox>
+                <label value="&openMsgIn.label;"
+                       control="mailnewsDoubleClick2NewWindow"/>
+              </hbox>
+
+              <hbox>
+                <radiogroup id="mailnewsDoubleClick2NewWindow" class="indent"
+                            preference="mailnews.reuse_message_window"
+                            orient="horizontal">
+                  <radio id="new" value="false" label="&reuseExpRadio0.label;"
+                         accesskey="&reuseExpRadio0.accesskey;"/>
+                  <radio id="existing" value="true"
+                         label="&reuseExpRadio1.label;"
+                         accesskey="&reuseExpRadio1.accesskey;"/>
+                </radiogroup>
+              </hbox>
+            </vbox>
+
+          </groupbox>
+
+          <groupbox>
+            <caption label="&display.caption;"/>
+
+            <hbox>
+              <checkbox id="showCondensedAddresses"
+                        label="&showCondensedAddresses.label;"
+                        accesskey="&showCondensedAddresses.accesskey;"
+                        preference="mail.showCondensedAddresses"/>
+            </hbox>
+
+            <hbox>
+              <checkbox id="showFolderPaneColumns"
+                        label="&showFolderColumns.label;"
+                        accesskey="&showFolderColumns.accesskey;"
+                        preference="mail.showFolderPaneColumns"/>
+            </hbox>
+
+          </groupbox>
+
+        </tabpanel>
+
         <tabpanel orient="vertical">
           <!-- Networking & Disk Space -->
           <groupbox>
             <caption label="&connectionsInfo.caption;"/>
             <hbox align="center">
               <description flex="1" control="catProxiesButton">&proxiesConfigure.label;</description>
               <button id="catProxiesButton" icon="network" label="&showSettings.label;"
                       accesskey="&showSettings.accesskey;"
--- a/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
@@ -1,9 +1,10 @@
 <!ENTITY itemGeneral.label       "General">
+<!ENTITY itemDisplay.label       "Reading &amp; Display">
 <!ENTITY itemUpdate.label        "Update">
 <!ENTITY itemNetworking.label    "Network &amp; Disk Space">
 <!ENTITY itemCertificates.label  "Certificates">
 
 <!-- General Settings -->
 
 <!ENTITY showCondensedAddresses.label  "Show only display name for people in my address book">
 <!ENTITY showCondensedAddresses.accesskey "p">
@@ -29,16 +30,20 @@
 <!ENTITY reuseExpRadio2.accesskey      "Z">
 <!ENTITY configEditDesc.label          "Advanced Configuration">
 <!ENTITY configEdit.label              "Config Editor…">
 <!ENTITY configEdit.accesskey          "g">
 <!ENTITY returnReceiptsInfo.label      "Determine how &brandShortName; handles return receipts">
 <!ENTITY showReturnReceipts.label      "Return Receipts…">
 <!ENTITY showReturnReceipts.accesskey  "R">
 
+<!-- Display and Reading Settings -->
+<!ENTITY reading.caption                "Reading">
+<!ENTITY display.caption                "Display">
+
 <!-- Update -->
 <!ENTITY autoCheck.label                "Automatically check for updates to:">
 <!ENTITY enableAppUpdate.label          "&brandShortName;">
 <!ENTITY enableAppUpdate.accesskey      "h">
 <!ENTITY enableAddonsUpdate.label       "Installed Add-ons">
 <!ENTITY enableAddonsUpdate.accesskey   "t">
 <!ENTITY checkNow.label                 "Check Now…">
 <!ENTITY whenUpdatesFound.label         "When updates to &brandShortName; are found,">