Bug 394299 - UI to provide access to extension options from app options cut off (also fixes bug 393945). r=mano
authorrob_strong@exchangecode.com
Fri, 31 Aug 2007 03:39:06 -0700
changeset 5501 7afd6ed1539708351aaa30dddf15da481304ec73
parent 5500 1c7f85e5ac7f148b9731bd93fe13a7ac7d0aafe9
child 5502 42aa9c125afa2b5c95dff0dba92034073e9fd640
push idunknown
push userunknown
push dateunknown
reviewersmano
bugs394299, 393945
milestone1.9a8pre
Bug 394299 - UI to provide access to extension options from app options cut off (also fixes bug 393945). r=mano
browser/components/preferences/main.xul
browser/components/preferences/security.xul
browser/locales/en-US/chrome/browser/preferences/preferences.dtd
browser/themes/winstripe/browser/preferences/preferences.css
--- a/browser/components/preferences/main.xul
+++ b/browser/components/preferences/main.xul
@@ -206,27 +206,27 @@
                   flex="1"/>
         <button id="checkDefaultButton"
                 label="&checkNow.label;" accesskey="&checkNow.accesskey;"
                 oncommand="gMainPane.checkNow()"
                 preference="pref.general.disable_button.default_browser"/>
       </hbox>
     </groupbox>
 #endif
-    <groupbox id="addonsMgrGroup" orient="horizontal">
-      <caption label="&addonsMgr.label;"/>
+    <hbox class="bottomBox">
+      <groupbox id="addonsMgrGroup" orient="horizontal" flex="1">
+        <caption label="&addonsMgr.label;"/>
 
-      <hbox align="center" flex="1">
         <description control="manageAddons"
 #ifdef XP_WIN
                      flex="1">&manageAddonsDesc.label;</description>
 #else
                      flex="1">&manageAddonsDescUnix.label;</description>
 #endif
         <button id="manageAddons" label="&manageAddons.label;"
                 accesskey="&manageAddons.accesskey;"
                 oncommand="gMainPane.showAddonsMgr();"/>
-      </hbox>
-    </groupbox>
+      </groupbox>
+    </hbox>
 
   </prefpane>
 
 </overlay>
--- a/browser/components/preferences/security.xul
+++ b/browser/components/preferences/security.xul
@@ -158,24 +158,23 @@
         <button id="showPasswords"
                 label="&showPasswords.label;" accesskey="&showPasswords.accesskey;"
                 oncommand="gSecurityPane.showPasswords();"
                 preference="pref.privacy.disable_button.view_passwords"/>
       </hbox>
     </groupbox>
 
     <!-- Warning Messages -->
-    <groupbox id="warningMessagesGroup">
-      <caption label="&warnings.label;"/>
+    <hbox class="bottomBox">
+      <groupbox id="warningMessagesGroup" orient="horizontal" flex="1">
+        <caption label="&warnings.label;"/>
 
-      <hbox id="chooseWarningsBox" align="center">
         <description control="warningSettings" flex="1">&chooseWarnings.label;</description>
         <button id="warningSettings"
                 label="&warningSettings.label;"
                 accesskey="&warningSettings.accesskey;"
                 oncommand="gSecurityPane.showWarningMessageSettings();"/>
-      </hbox>
-      <separator/>
-    </groupbox>
+      </groupbox>
+    </hbox>
 
   </prefpane>
 
 </overlay>
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
@@ -1,12 +1,14 @@
 
 <!ENTITY  prefWindow.titleWin     "Options">
 <!ENTITY  prefWindow.titleGNOME   "&brandShortName; Preferences">
-<!ENTITY  prefWindow.styleWin     "width: 42em; height: 40em;">
+<!-- When making changes to prefWindow.styleWin test both Windows Classic and
+     Luna since widget heights are different based on the OS theme -->
+<!ENTITY  prefWindow.styleWin     "width: 42em; height: 44em;">
 <!ENTITY  prefWindow.styleMac     "width: 47em;">
 <!ENTITY  prefWindow.styleGNOME   "width: 42em; height: 38.5em;">
 
 <!ENTITY  paneMain.title          "Main">
 <!ENTITY  paneTabs.title          "Tabs">
 <!ENTITY  paneContent.title       "Content">
 <!ENTITY  paneFeeds.title         "Feeds">
 <!ENTITY  panePrivacy.title       "Privacy">
--- a/browser/themes/winstripe/browser/preferences/preferences.css
+++ b/browser/themes/winstripe/browser/preferences/preferences.css
@@ -259,8 +259,14 @@ filefield[disabled="true"] .fileFieldIco
   -moz-margin-start: 6px !important; 
   font-weight: bold;
 }
 
 /* Feeds pane */
 #chooseClientAppCell {
   -moz-padding-end: 12px;
 }
+
+/* bottom-most box containing a groupbox in a prefpane. Prevents the bottom
+   of the groupbox from being cutoff */
+.bottomBox {
+  padding-bottom: 2px;
+}