From 6b7332d6bf0e36c47fe2f63573ff79e57ab9b19a Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com" <mozilla.mano%sent.com>
Date: Wed, 20 Apr 2005 11:24:46 +0000
Subject: [PATCH] Bug 285570 - add entities for changing window style
 (height,width) of preferences windows. patch from Reuven Gonen
 <linxspider@yahoo.com>, r=mconnor a=asa

---
 .../components/preferences/changeaction.xul   |  2 +-
 browser/components/preferences/colors.xul     |  2 +-
 browser/components/preferences/connection.xul |  2 +-
 browser/components/preferences/cookies.xul    |  2 +-
 .../preferences/downloadactions.xul           |  2 +-
 browser/components/preferences/fonts.xul      |  2 +-
 browser/components/preferences/languages.xul  |  2 +-
 .../components/preferences/permissions.xul    |  2 +-
 browser/components/preferences/sanitize.xul   |  2 +-
 .../browser/preferences/changeaction.dtd      | 22 -------------------
 .../chrome/browser/preferences/colors.dtd     |  1 +
 .../chrome/browser/preferences/connection.dtd |  2 ++
 .../chrome/browser/preferences/cookies.dtd    |  2 ++
 .../browser/preferences/downloadactions.dtd   |  3 +++
 .../chrome/browser/preferences/fonts.dtd      |  1 +
 .../chrome/browser/preferences/languages.dtd  |  2 ++
 .../browser/preferences/permissions.dtd       |  2 ++
 .../chrome/browser/preferences/sanitize.dtd   |  1 +
 18 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/browser/components/preferences/changeaction.xul b/browser/components/preferences/changeaction.xul
index 85a3e56bfaa..5435dd87ef3 100644
--- a/browser/components/preferences/changeaction.xul
+++ b/browser/components/preferences/changeaction.xul
@@ -47,7 +47,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="gChangeActionDialog.init();" 
         ondialogaccept="return gChangeActionDialog.onAccept();" 
-        style="width: 36em;"
+        style="width: &window.width;;"
         persist="screenX screenY">
 
   <script type="application/x-javascript" src="chrome://mozapps/content/preferences/actionsshared.js"/>
diff --git a/browser/components/preferences/colors.xul b/browser/components/preferences/colors.xul
index 792e2fb0d56..2de530eb4eb 100644
--- a/browser/components/preferences/colors.xul
+++ b/browser/components/preferences/colors.xul
@@ -44,7 +44,7 @@
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&colorsDialog.title;"
             dlgbuttons="accept,cancel"
-            style="width: 38em !important;">
+            style="width: &window.width; !important;">
 
   <prefpane id="ColorsDialogPane">
   
diff --git a/browser/components/preferences/connection.xul b/browser/components/preferences/connection.xul
index e3db58450c8..cf933b404b0 100644
--- a/browser/components/preferences/connection.xul
+++ b/browser/components/preferences/connection.xul
@@ -45,7 +45,7 @@
             title="&connectionsDialog.title;"
             dlgbuttons="accept,cancel"
             onbeforeaccept="return gConnectionsDialog.beforeAccept();"
-            style="width: 37em !important;">
+            style="width: &window.width; !important;">
 
   <prefpane id="ConnectionsDialogPane">
     <preferences>
diff --git a/browser/components/preferences/cookies.xul b/browser/components/preferences/cookies.xul
index 886225957e1..c6884b4c182 100644
--- a/browser/components/preferences/cookies.xul
+++ b/browser/components/preferences/cookies.xul
@@ -44,7 +44,7 @@
 <window id="CookiesDialog" windowtype="Browser:Cookies"
         class="windowDialog" title="&window.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        style="width: 36em;"
+        style="width: &window.width;;"
         onload="gCookiesWindow.init();"
         onunload="gCookiesWindow.uninit();"
         persist="screenX screenY width height">
diff --git a/browser/components/preferences/downloadactions.xul b/browser/components/preferences/downloadactions.xul
index ee394f7b51e..2f5c3b902bd 100644
--- a/browser/components/preferences/downloadactions.xul
+++ b/browser/components/preferences/downloadactions.xul
@@ -52,7 +52,7 @@
         onload="gDownloadActionsWindow.init();"
         onunload="gDownloadActionsWindow.uninit();"
         title="&downloadactionsWindow.title;"
-        width="480" height="310" persist="width height screenX screenY">
+        width="&window.width;" height="&window.height;" persist="width height screenX screenY">
 
   <script type="application/x-javascript" src="chrome://mozapps/content/preferences/actionsshared.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/preferences/downloadactions.js"/>
diff --git a/browser/components/preferences/fonts.xul b/browser/components/preferences/fonts.xul
index d27ffce3bb5..67b5b1fb78a 100644
--- a/browser/components/preferences/fonts.xul
+++ b/browser/components/preferences/fonts.xul
@@ -46,7 +46,7 @@
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&fontsDialog.title;"
             dlgbuttons="accept,cancel"
-            style="width: 39em !important;">
+            style="width: &window.width; !important;">
 
   <prefpane id="FontsDialogPane">
   
diff --git a/browser/components/preferences/languages.xul b/browser/components/preferences/languages.xul
index 342c704593c..4de74bb3d1d 100644
--- a/browser/components/preferences/languages.xul
+++ b/browser/components/preferences/languages.xul
@@ -45,7 +45,7 @@
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&languages.customize.Header;"
             dlgbuttons="accept,cancel"
-            style="width: 30em;">
+            style="width: &window.width;;">
 
   <prefpane id="LanguagesDialogPane" onpaneload="gLanguagesDialog.init();">   
     <preferences>
diff --git a/browser/components/preferences/permissions.xul b/browser/components/preferences/permissions.xul
index 42ad13b017e..acac3b66bff 100644
--- a/browser/components/preferences/permissions.xul
+++ b/browser/components/preferences/permissions.xul
@@ -46,7 +46,7 @@
         windowtype="Browser:Permissions"
         title="&window.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        style="width: 36em;"
+        style="width: &window.width;;"
         onload="gPermissionManager.onLoad();"
         onunload="gPermissionManager.uninit();"
         persist="screenX screenY width height">
diff --git a/browser/components/preferences/sanitize.xul b/browser/components/preferences/sanitize.xul
index 103320fa5af..134e9f444fb 100644
--- a/browser/components/preferences/sanitize.xul
+++ b/browser/components/preferences/sanitize.xul
@@ -49,7 +49,7 @@
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             dlgbuttons="accept,cancel"
             title="&sanitizeDialog.title;"
-            style="width: 30em !important;">
+            style="width: &window.width; !important;">
 
   <prefpane id="SanitizeDialogPane">  
     <script type="application/x-javascript" src="chrome://browser/content/preferences/sanitize.js"/>
diff --git a/browser/locales/en-US/chrome/browser/preferences/changeaction.dtd b/browser/locales/en-US/chrome/browser/preferences/changeaction.dtd
index 01f5534cea7..e69de29bb2d 100644
--- a/browser/locales/en-US/chrome/browser/preferences/changeaction.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/changeaction.dtd
@@ -1,22 +0,0 @@
-<!ENTITY  changeAction.title                  "Change Action">
-
-<!ENTITY  whenDownloading.label               "When downloading files like this:">
-
-<!ENTITY  openDefault.label                   "Open them with the default application:">
-<!ENTITY  openDefault.accesskey               "O">
-<!ENTITY  openApplication.label               "Open them with this application:">
-<!ENTITY  openApplication.accesskey           "e">
-<!ENTITY  changeApp.label                     "Browse...">
-<!ENTITY  changeApp.accesskey                 "B">
-<!ENTITY  saveToDisk.label                    "Save them on my computer">
-<!ENTITY  saveToDisk.accesskey                "S">
-<!ENTITY  saveToDefaultFolder.label           "in the default download folder">
-<!ENTITY  saveToDefaultFolder.accesskey       "d">
-<!ENTITY  saveToThisFolder.label              "in this folder:">
-<!ENTITY  saveToThisFolder.accesskey          "h">
-<!ENTITY  chooseFolder.label                  "Browse...">
-<!ENTITY  chooseFolder.accesskey              "w">
-<!ENTITY  saveToAskMe.label                   "ask me where to save the file">
-<!ENTITY  saveToAskMe.accesskey               "a">
-<!ENTITY  usePlugin.label                     "Use this Plugin:">
-<!ENTITY  usePlugin.accesskey                 "P">
diff --git a/browser/locales/en-US/chrome/browser/preferences/colors.dtd b/browser/locales/en-US/chrome/browser/preferences/colors.dtd
index 13b37c6e304..fc4b89b1a9a 100644
--- a/browser/locales/en-US/chrome/browser/preferences/colors.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/colors.dtd
@@ -1,4 +1,5 @@
 <!ENTITY  colorsDialog.title              "Colors">
+<!ENTITY window.width                     "38em">
 
 <!ENTITY  allowPagesToUse.label           "Allow pages to choose their own colors, instead of my selections above">
 <!ENTITY  allowPagesToUse.accesskey       "h">
diff --git a/browser/locales/en-US/chrome/browser/preferences/connection.dtd b/browser/locales/en-US/chrome/browser/preferences/connection.dtd
index 36f32294622..7bd149322af 100644
--- a/browser/locales/en-US/chrome/browser/preferences/connection.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/connection.dtd
@@ -1,5 +1,7 @@
 
 <!ENTITY  connectionsDialog.title       "Connection Settings">
+<!ENTITY window.width                   "37em">
+
 <!ENTITY  proxyTitle.label              "Configure Proxies to Access the Internet">
 <!ENTITY  directTypeRadio.label         "Direct connection to the Internet">
 <!ENTITY  directTypeRadio.accesskey     "d">
diff --git a/browser/locales/en-US/chrome/browser/preferences/cookies.dtd b/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
index 42f2c2d5e95..11571288a71 100644
--- a/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
@@ -1,3 +1,5 @@
+<!ENTITY window.width                       "36em">
+
 <!ENTITY     cookiesonsystem.label          "The following cookies are stored on your computer:">
 <!ENTITY     cookiename.label               "Cookie Name">
 <!ENTITY     cookiedomain.label             "Site"> 
diff --git a/browser/locales/en-US/chrome/browser/preferences/downloadactions.dtd b/browser/locales/en-US/chrome/browser/preferences/downloadactions.dtd
index 2cce7cb7e46..ff5d971ba27 100644
--- a/browser/locales/en-US/chrome/browser/preferences/downloadactions.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/downloadactions.dtd
@@ -1,4 +1,7 @@
 <!ENTITY  downloadactionsWindow.title         "Download Actions">
+<!ENTITY window.width                         "480">
+<!ENTITY window.height                        "310">
+
 <!ENTITY  fileTypesDescription.label          "Automatically perform the associated Action with each of the following file types:">
 
 <!ENTITY  fileHandlerColumn.label             "Action">
diff --git a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
index acdcc3df3fd..0c27f66599a 100644
--- a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
@@ -1,4 +1,5 @@
 <!ENTITY  fontsDialog.title                       "Fonts">
+<!ENTITY  window.width                            "39em">
 
 <!ENTITY  language.label                          "Fonts for:">
 <!ENTITY  language.accesskey                      "t">
diff --git a/browser/locales/en-US/chrome/browser/preferences/languages.dtd b/browser/locales/en-US/chrome/browser/preferences/languages.dtd
index 196801b6e42..667ebbe9606 100644
--- a/browser/locales/en-US/chrome/browser/preferences/languages.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/languages.dtd
@@ -1,3 +1,5 @@
+<!ENTITY window.width                                   "30em">
+
 <!ENTITY languages.customize.Header                     "Languages">
 <!ENTITY languages.customize.label                      "Languages">
 <!ENTITY languages.customize.prefLangDescript           "Web pages are sometimes offered in more than one language. Choose languages for displaying these web pages, in order of preference.">
diff --git a/browser/locales/en-US/chrome/browser/preferences/permissions.dtd b/browser/locales/en-US/chrome/browser/preferences/permissions.dtd
index efc0fc49818..ac85ed1bfbf 100644
--- a/browser/locales/en-US/chrome/browser/preferences/permissions.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/permissions.dtd
@@ -1,4 +1,6 @@
 <!ENTITY window.title                 "Exceptions">
+<!ENTITY window.width                 "36em">
+
 <!ENTITY treehead.sitename.label      "Site">
 <!ENTITY treehead.status.label        "Status">
 <!ENTITY addpermission.label          "New Site">
diff --git a/browser/locales/en-US/chrome/browser/preferences/sanitize.dtd b/browser/locales/en-US/chrome/browser/preferences/sanitize.dtd
index 7079e1ba6c5..5bf9a9986e1 100644
--- a/browser/locales/en-US/chrome/browser/preferences/sanitize.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/sanitize.dtd
@@ -1,4 +1,5 @@
 <!ENTITY sanitizeDialog.title         "Sanitize">
+<!ENTITY window.width                 "30em">
 
 <!ENTITY items.label                  "Sanitize Items">
 <!ENTITY sanitizeItems.label          "Clear the following items when Sanitizing &brandShortName;:">