From 27bef6707adc77f87d7ebc086e66f7730d8d5902 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Mon, 27 Jun 2005 21:17:42 +0000
Subject: [PATCH] Bug #298796 --> add entities for changing window style
 (height,width) of preferences windows

Patch by Reuven Gonen <linxspider@gmail.com>
---
 mail/components/preferences/changeaction.xul                   | 2 +-
 mail/components/preferences/connection.xul                     | 2 +-
 mail/components/preferences/downloadactions.xul                | 2 +-
 mail/components/preferences/fonts.xul                          | 2 +-
 mail/components/preferences/notifications.xul                  | 2 +-
 .../en-US/chrome/messenger/preferences/changeaction.dtd        | 1 +
 mail/locales/en-US/chrome/messenger/preferences/connection.dtd | 3 ++-
 .../en-US/chrome/messenger/preferences/downloadactions.dtd     | 3 +++
 mail/locales/en-US/chrome/messenger/preferences/fonts.dtd      | 1 +
 .../en-US/chrome/messenger/preferences/notifications.dtd       | 2 ++
 10 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/mail/components/preferences/changeaction.xul b/mail/components/preferences/changeaction.xul
index a5454fab17e6..ae77a6ff273d 100644
--- a/mail/components/preferences/changeaction.xul
+++ b/mail/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://messenger/content/preferences/actionsshared.js"/>
diff --git a/mail/components/preferences/connection.xul b/mail/components/preferences/connection.xul
index b514d8d7098b..00708af581b7 100644
--- a/mail/components/preferences/connection.xul
+++ b/mail/components/preferences/connection.xul
@@ -46,7 +46,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/mail/components/preferences/downloadactions.xul b/mail/components/preferences/downloadactions.xul
index cde66059bc74..20d168ccd9e4 100644
--- a/mail/components/preferences/downloadactions.xul
+++ b/mail/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://messenger/content/preferences/actionsshared.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/preferences/downloadactions.js"/>
diff --git a/mail/components/preferences/fonts.xul b/mail/components/preferences/fonts.xul
index 0ee30867768b..497d174c601a 100644
--- a/mail/components/preferences/fonts.xul
+++ b/mail/components/preferences/fonts.xul
@@ -47,7 +47,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/mail/components/preferences/notifications.xul b/mail/components/preferences/notifications.xul
index b64f376036dd..d8e61d125d00 100644
--- a/mail/components/preferences/notifications.xul
+++ b/mail/components/preferences/notifications.xul
@@ -48,7 +48,7 @@
 <prefwindow id="SoundNotificationsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             dlgbuttons="accept,cancel"
-            style="width: 30em !important;"
+            style="width: &window.width; !important;"
             title="&notificationsDialog.title;">
 
   <prefpane id="NotificationsDialogPane" onpaneload="gNotificationsDialog.init();">
diff --git a/mail/locales/en-US/chrome/messenger/preferences/changeaction.dtd b/mail/locales/en-US/chrome/messenger/preferences/changeaction.dtd
index 01f5534cea7e..a167bc5b0f94 100644
--- a/mail/locales/en-US/chrome/messenger/preferences/changeaction.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/changeaction.dtd
@@ -1,4 +1,5 @@
 <!ENTITY  changeAction.title                  "Change Action">
+<!ENTITY  window.width                         "36em">
 
 <!ENTITY  whenDownloading.label               "When downloading files like this:">
 
diff --git a/mail/locales/en-US/chrome/messenger/preferences/connection.dtd b/mail/locales/en-US/chrome/messenger/preferences/connection.dtd
index 36f32294622b..4b41007ac0b0 100644
--- a/mail/locales/en-US/chrome/messenger/preferences/connection.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/connection.dtd
@@ -1,5 +1,6 @@
-
 <!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/mail/locales/en-US/chrome/messenger/preferences/downloadactions.dtd b/mail/locales/en-US/chrome/messenger/preferences/downloadactions.dtd
index 51932c82ab92..8900988dd18c 100644
--- a/mail/locales/en-US/chrome/messenger/preferences/downloadactions.dtd
+++ b/mail/locales/en-US/chrome/messenger/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/mail/locales/en-US/chrome/messenger/preferences/fonts.dtd b/mail/locales/en-US/chrome/messenger/preferences/fonts.dtd
index 98cc1ff90136..cd9c66c491e8 100644
--- a/mail/locales/en-US/chrome/messenger/preferences/fonts.dtd
+++ b/mail/locales/en-US/chrome/messenger/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/mail/locales/en-US/chrome/messenger/preferences/notifications.dtd b/mail/locales/en-US/chrome/messenger/preferences/notifications.dtd
index 627822afa7fd..00b04d3da21d 100644
--- a/mail/locales/en-US/chrome/messenger/preferences/notifications.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/notifications.dtd
@@ -1,4 +1,6 @@
 <!ENTITY notificationsDialog.title        "New Mail Sound">
+<!ENTITY window.width                     "30em">
+
 <!ENTITY soundNotification.caption        "Configure Sound for New Mail">
 <!ENTITY preview.label                    "Preview Sound">
 <!ENTITY preview.accesskey                "v">