From 3dca19e772ed3174630c6151312476fe12fa5ba4 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Fri, 17 Oct 2003 20:02:31 +0000
Subject: [PATCH] Bug 89212 Account Settings should be fixed size
 p=stefan@borggraefe.com r=me sr=bienvenu

---
 .../base/prefs/resources/content/AccountManager.xul |  6 +++---
 .../base/prefs/resources/content/accountUtils.js    |  2 +-
 .../base/prefs/resources/content/am-addressing.xul  |  6 +++---
 .../base/prefs/resources/content/am-offline.xul     | 10 +++++-----
 .../prefs/resources/locale/en-US/AccountManager.dtd |  3 +--
 .../prefs/resources/locale/en-US/am-addressing.dtd  | 13 +++++--------
 .../prefs/resources/locale/en-US/am-offline.dtd     |  2 +-
 7 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/mailnews/base/prefs/resources/content/AccountManager.xul b/mailnews/base/prefs/resources/content/AccountManager.xul
index 26e01e014383..e9df29b0b005 100644
--- a/mailnews/base/prefs/resources/content/AccountManager.xul
+++ b/mailnews/base/prefs/resources/content/AccountManager.xul
@@ -3,11 +3,11 @@
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/AccountManager.dtd" >
-<dialog id="account-manager" 
+<dialog id="accountManager" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&accountManagerTitle.label;"
-        width="&account-manager.width;" height="&account-manager.height;"
-        persist="screenX screenY width height"
+        style="&accountManager.size;"
+        persist="screenX screenY"
         buttons="accept,cancel,help"
         onload="onLoad(event);"
         ondialogaccept="return onAccept();"
diff --git a/mailnews/base/prefs/resources/content/accountUtils.js b/mailnews/base/prefs/resources/content/accountUtils.js
index 6e161c69d719..7ecbd73c7362 100644
--- a/mailnews/base/prefs/resources/content/accountUtils.js
+++ b/mailnews/base/prefs/resources/content/accountUtils.js
@@ -238,7 +238,7 @@ function MsgAccountManager(selectPage)
     } catch (ex) { /* functions might not be defined */}
     
     window.openDialog("chrome://messenger/content/AccountManager.xul",
-                      "AccountManager", "chrome,modal,titlebar,resizable",
+                      "AccountManager", "chrome,centerscreen,modal,titlebar",
                       { server: server, selectPage: selectPage });
 }
 
diff --git a/mailnews/base/prefs/resources/content/am-addressing.xul b/mailnews/base/prefs/resources/content/am-addressing.xul
index f496d8c2350c..3c6646d0eaa3 100644
--- a/mailnews/base/prefs/resources/content/am-addressing.xul
+++ b/mailnews/base/prefs/resources/content/am-addressing.xul
@@ -96,9 +96,9 @@ Contributors:
     <radiogroup class="indent" id="ldapAutocomplete" wsm_persist="true" oncommand="enabling();">
       <observes element="identity.overrideGlobalPref" attribute="disabled"/>
       <radio id="useGlobalPref" value="0" label="&useGlobal.label;"/>
-      <hbox align="center">
-        <radio id="directories" value="1" label="&directories.label;"/>
-        <menulist id="directoriesList" wsm_persist="true" flex="1" width="&directoriesList.width;">
+      <radio id="directories" value="1" label="&directories.label;"/>
+      <hbox class="indent">
+        <menulist id="directoriesList" wsm_persist="true" style="min-width: 16em;">
           <menupopup onpopupshowing="createDirectoriesList(false);" id="directoriesListPopup"/>
         </menulist>
         <button id="editButton" label="&editDirectories.label;" oncommand="onEditDirectories();"/>
diff --git a/mailnews/base/prefs/resources/content/am-offline.xul b/mailnews/base/prefs/resources/content/am-offline.xul
index 339450d84935..e8922483bb0b 100644
--- a/mailnews/base/prefs/resources/content/am-offline.xul
+++ b/mailnews/base/prefs/resources/content/am-offline.xul
@@ -80,7 +80,7 @@ Contributors:
     <hbox align="center">
         <checkbox  wsm_persist="true" id="offline.notDownload"
             label="&offlineNotDownload.label;" accesskey="&offlineNotDownload.accesskey;" oncommand="onCheckItem('bc_notDownload', 'offline.notDownload');"/>
-        <textbox wsm_persist="true" id="offline.notDownloadMin" size="5" value="50"  observes="bc_notDownload"/> 
+        <textbox wsm_persist="true" id="offline.notDownloadMin" size="2" value="50"  observes="bc_notDownload"/> 
         <label value="&kb.label;"/>
     </hbox>
         
@@ -88,7 +88,7 @@ Contributors:
          wsm_persist="true" id="nntp.downloadUnread" label="&nntpDownloadUnread.label;" accesskey="&nntpDownloadUnread.accesskey;"/>
     <hbox iscontrolcontainer="true" align="center" hidable="true" hidefor="movemail,pop3,imap">
         <checkbox wsm_persist="true" id="nntp.downloadMsg" label="&nntpDownloadMsg.label;" accesskey="&nntpDownloadMsg.accesskey;" oncommand="onCheckItem('bc_downloadMsg', 'nntp.downloadMsg');"/>
-        <textbox wsm_persist="true" id="nntp.downloadMsgMin" size="5" value="30" observes="bc_downloadMsg"/>
+        <textbox wsm_persist="true" id="nntp.downloadMsgMin" size="2" value="30" observes="bc_downloadMsg"/>
         <label value="&daysAgo.label;"/>
     </hbox>
 
@@ -99,13 +99,13 @@ Contributors:
     <radiogroup wsm_persist="true" id="nntp.keepMsg">
         <hbox flex="1" align="center">
             <radio wsm_persist="true" id="nntp.keepOldMsg" value="2" label="&nntpKeepMsg.label;" oncommand="onCheckKeepMsg();"/>
-            <textbox wsm_persist="true" id="nntp.keepOldMsgMin" size="5" value="30" observes="bc_keepMsg"/>
+            <textbox wsm_persist="true" id="nntp.keepOldMsgMin" size="2" value="30" observes="bc_keepMsg"/>
             <label value="&days.label;"/>
         </hbox>
         <radio wsm_persist="true" id="nntp.keepAllMsg" value="1" label="&nntpKeepAll.label;" oncommand="onCheckKeepMsg();"/>
         <hbox flex="1" align="center">
             <radio wsm_persist="true" id="nntp.keepNewMsg" value="3" label="&nntpKeepNew.label;" oncommand="onCheckKeepMsg();"/>
-            <textbox wsm_persist="true" id="nntp.keepNewMsgMin" size="5" value="30" observes="bc_keepMsg"/>
+            <textbox wsm_persist="true" id="nntp.keepNewMsgMin" size="2" value="30" observes="bc_keepMsg"/>
             <label value="&message.label;"/>
         </hbox>
     </radiogroup>
@@ -113,7 +113,7 @@ Contributors:
     <checkbox  wsm_persist="true" id="nntp.keepUnread" label="&nntpKeepUnread.label;" checked="true"/>
     <hbox flex="1" align="center">
         <checkbox wsm_persist="true" id="nntp.removeBody" label="&nntpRemoveBody.label;" oncommand="onCheckItem('bc_removeBody','nntp.removeBody');"/>
-        <textbox wsm_persist="true" id="nntp.removeBodyMin" size="5" value="30" observes="bc_removeBody"/>
+        <textbox wsm_persist="true" id="nntp.removeBodyMin" size="2" value="30" observes="bc_removeBody"/>
         <label value="&days.label;"/>
     </hbox>
     </vbox>
diff --git a/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd b/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd
index 9313490b8ec4..065fc1fb4b9d 100644
--- a/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd
@@ -17,5 +17,4 @@
      panel content to fit. 1em = the width of the letter 'm' in the selected font.
      XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct size of
      this window for en-US. -->
-<!ENTITY account-manager.width "640">
-<!ENTITY account-manager.height "470">
+<!ENTITY accountManager.size "width: 55em; height: 44em;">
diff --git a/mailnews/base/prefs/resources/locale/en-US/am-addressing.dtd b/mailnews/base/prefs/resources/locale/en-US/am-addressing.dtd
index 481708c2140d..d4d26b6bb215 100644
--- a/mailnews/base/prefs/resources/locale/en-US/am-addressing.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/am-addressing.dtd
@@ -10,9 +10,6 @@
 <!ENTITY directories.label         "Use a different LDAP server:">
 
 <!-- am-addressing.xul -->
-<!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the directoriesList 
-     drop down List box, which specifies the width of the dropdown listbox. -->
-<!ENTITY directoriesList.width "512">
 
 <!ENTITY compositionGroupTitle.label "Composition">
 <!-- LOCALIZATION NOTE (useHtml.label) : do not translate "html" in below line -->
@@ -22,15 +19,15 @@
 <!-- LOCALIZATION NOTE (then.label): This will concatenate with the 4 strings that follow. -->
 <!ENTITY then.label                           "Then,">
 <!ENTITY then.accesskey                       "t">
-<!ENTITY aboveQuote.label                     "start my reply above the quoted text">
+<!ENTITY aboveQuote.label                     "start my reply above the quote">
 <!ENTITY aboveQuote.accesskey                 "v">
-<!ENTITY belowQuote.label                     "start my reply below the quoted text">
+<!ENTITY belowQuote.label                     "start my reply below the quote">
 <!ENTITY belowQuote.accesskey                 "b">
-<!ENTITY selectAndQuote.label                 "select the quoted text">
+<!ENTITY selectAndQuote.label                 "select the quote">
 <!ENTITY selectAndQuote.accesskey             "e">
 <!ENTITY place.label                          "and place my signature">
 <!ENTITY place.accesskey                      "p">
-<!ENTITY belowText.label                      "below the quoted text (recommended)">
+<!ENTITY belowText.label                      "below the quote (recommended)">
 <!ENTITY belowText.accesskey                  "b">
-<!ENTITY aboveText.label                      "below my reply (above quoted text)">
+<!ENTITY aboveText.label                      "below my reply (above the quote)">
 <!ENTITY aboveText.accesskey                  "v">
diff --git a/mailnews/base/prefs/resources/locale/en-US/am-offline.dtd b/mailnews/base/prefs/resources/locale/en-US/am-offline.dtd
index 4abece98d3f5..8af5329867ba 100644
--- a/mailnews/base/prefs/resources/locale/en-US/am-offline.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/am-offline.dtd
@@ -3,7 +3,7 @@
 <!ENTITY offlineMsg.label "To save download time and disk space:">
 <!ENTITY offlineNewFolder.label "When I create new folders, select them for offline">
 <!ENTITY offlineNewFolder.accesskey "h">
-<!ENTITY offlineNotDownload.label "Do not download messages locally that are larger than">
+<!ENTITY offlineNotDownload.label "Do not download messages that are larger than">
 <!ENTITY offlineNotDownload.accesskey "d">
 <!ENTITY kb.label "KB">
 <!ENTITY days.label "days">