Bug 481148 : Fixed panel clipping issue in Prefs window. Wrangled with incorrect sizing when opened with 2nd or 3rd panel persisted. No fix yet, but not blocking because no UI is obscured, just stretched.

git-svn-id: http://svn.mozilla.org/addons/trunk@23404 4eb1ac78-321c-0410-a911-ec516a8615a5

3 files changed, 54 insertions, 65 deletions

diff --git a/bandwagon/content/ui/settings.xul b/bandwagon/content/ui/settings.xul
index 7ac4696..9f6d996 100644
--- a/bandwagon/content/ui/settings.xul
+++ b/bandwagon/content/ui/settings.xul
@@ -38,31 +38,21 @@
   - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://mozapps/content/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://bandwagon/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://bandwagon/skin/settings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://bandwagon/content/ui/bindings/bandwagon.css" type="text/css"?>
 
 <!DOCTYPE prefwindow SYSTEM "chrome://bandwagon/locale/settings.dtd">
 
 <prefwindow id="bandwagon-settings"
-            windowtype="Bandwagon:Settings"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&window.title;"
             ondialogaccept="return Bandwagon.Controller.Settings.doAccept();"
             ondialogcancel="return Bandwagon.Controller.Settings.doCancel();"
-            style="&settings.style;">
+            persist="lastSelected screenX screenY">
 
-    <script type="application/x-javascript" src="chrome://bandwagon/content/ui/dialog.js"/>
-    <script type="application/x-javascript" src="chrome://bandwagon/content/ui/settingsController.js"/>
-
-    <stringbundleset>
-        <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/settings.properties"/>
-    </stringbundleset>
-
-    <prefpane id="manage"
-              label="&manage.label;">
+    <prefpane id="paneManage"
+              label="&manage.label;"
+              flex="1">
         <preferences>
             <preference id="extensions.bandwagon.updateall.enabled"
                         name="extensions.bandwagon.updateall.enabled"
@@ -70,18 +60,9 @@
             <preference id="extensions.bandwagon.addonsperpage.enabled"
                         name="extensions.bandwagon.addonsperpage.enabled"
                         type="bool"/>
-            <preference id="extensions.bandwagon.addonsperpage"
-                        name="extensions.bandwagon.addonsperpage"
-                        type="int"/>
             <preference id="extensions.bandwagon.notifyall.enabled"
                         name="extensions.bandwagon.notifyall.enabled"
                         type="bool"/>
-            <preference id="extensions.bandwagon.updateall.interval"
-                        name="extensions.bandwagon.updateall.interval"
-                        type="int"/>
-            <preference id="extensions.bandwagon.updateall.units"
-                        name="extensions.bandwagon.updateall.units"
-                        type="int"/>
         </preferences>
 
         <hbox>
@@ -93,8 +74,7 @@
                 <!-- <label id="collection-name" crop="end" value=""/> -->
   
                 <!-- Update Interval Settings -->
-  
-                <groupbox id="sub-updates-box">
+                <groupbox>
                     <caption label="&frequency.label;"/>
                     <radiogroup id="updates-group">
                         <radio id="updates-default" label="&default.label;"/>
@@ -121,8 +101,7 @@
                 </groupbox>
 
                 <!-- Show Notification Settings -->
-
-                <groupbox id="notifications-box">
+                <groupbox>
                     <caption label="&notifications.label;"/>
                     <radiogroup id="notifications-group">
                         <radio id="notifications-default" label="&default.label;"/>
@@ -138,8 +117,7 @@
                 </groupbox>
 
                 <!-- Add-ons Per Page Settings -->
-  
-                <groupbox id="quantity-box">
+                <groupbox>
                     <caption label="&perpage.label;"/>
                     <radiogroup id="perpage-group">
                         <radio id="perpage-default" label="&default.label;"/>
@@ -163,9 +141,20 @@
 
     </prefpane>
 
-    <prefpane id="general"
+    <prefpane id="paneGeneral"
               label="&general.label;">
-        <groupbox id="default-subs-box">
+        <preferences>
+            <preference id="extensions.bandwagon.addonsperpage"
+                        name="extensions.bandwagon.addonsperpage"
+                        type="int"/>
+            <preference id="extensions.bandwagon.updateall.interval"
+                        name="extensions.bandwagon.updateall.interval"
+                        type="int"/>
+            <preference id="extensions.bandwagon.updateall.units"
+                        name="extensions.bandwagon.updateall.units"
+                        type="int"/>
+        </preferences>
+        <groupbox>
             <caption label="&subscriptions.label;"/>
             <hbox align="center">
                 <label id="updateinterval-all" value="&updateall.label;"/>
@@ -193,17 +182,17 @@
                     <radio id="notify-all-off" label="&off.label;"/>
                 </radiogroup>
             </hbox>
-                <hbox align="center">
-                    <label id="label-addonsshow"> &addonsleadin.label;</label>
-                    <textbox id="textbox-addonsperpage-global"
-                             type="number"
-                             size="3"
-                             preference="extensions.bandwagon.addonsperpage"/>
-                    <label id="label-addonsperpage"> &addonsperpage.label;</label>
-                </hbox>
+            <hbox align="center">
+                <label id="label-addonsshow"> &addonsleadin.label;</label>
+                <textbox id="textbox-addonsperpage-global"
+                         type="number"
+                         size="3"
+                         preference="extensions.bandwagon.addonsperpage"/>
+                <label id="label-addonsperpage"> &addonsperpage.label;</label>
+            </hbox>
         </groupbox>
 
-        <groupbox id="data-box">
+        <groupbox>
             <caption label="&data.label;"/>
             <hbox align="center" pack="start">
                 <label id="clear-emails-text" value="" />
@@ -224,15 +213,15 @@
         </groupbox>
     </prefpane>
 
-    <prefpane id="auto"
+    <prefpane id="paneAuto"
               label="&pub.label;">
                 <!-- Auto-publish Settings -->
                 <!--
                 <checkbox id="checkbox-autopublish-percollection" label="&autopublish.label;"/>
                 -->
-        <groupbox id="auto-box">
+        <groupbox>
             <caption label="&auto.label;"/>
-            <description flex="1">&autoleadin.label;</description>
+            <description>&autoleadin.label;</description>
             <separator class="thin"/>
             <grid>
               <columns>
@@ -271,15 +260,22 @@
               </rows>
             </grid>
         </groupbox>
-        <hbox align="center" pack="center">
-            <button id="auto-create-button"
-                    label="&createauto.label;"
-                    oncommand="Bandwagon.Controller.Settings.doAutoCreate();"/>
-            <button id="auto-delete-button"
-                    label="&deleteauto.label;"
-                    oncommand="Bandwagon.Controller.Settings.doAutoDelete();"
-                    collapsed="true"/>
+        <hbox class="bottomBox">
+            <groupbox orient="horizontal" pack="center">
+                <button id="auto-create-button"
+                        label="&createauto.label;"
+                        oncommand="Bandwagon.Controller.Settings.doAutoCreate();"/>
+                <button id="auto-delete-button"
+                        label="&deleteauto.label;"
+                        oncommand="Bandwagon.Controller.Settings.doAutoDelete();"
+                        collapsed="true"/>
+            </groupbox>
         </hbox>
     </prefpane>
 
+    <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/settings.properties"/>
+
+    <script type="application/x-javascript" src="chrome://bandwagon/content/ui/dialog.js"/>
+    <script type="application/x-javascript" src="chrome://bandwagon/content/ui/settingsController.js"/>
+
 </prefwindow>
diff --git a/bandwagon/content/ui/settingsController.js b/bandwagon/content/ui/settingsController.js
index 93a8c35..f7f6f61 100644
--- a/bandwagon/content/ui/settingsController.js
+++ b/bandwagon/content/ui/settingsController.js
@@ -47,7 +47,6 @@ Bandwagon.Controller.Settings = new function()
 
 Bandwagon.Controller.Settings.init = function()
 {
-    //alert("Initializing Bandwagon.Controller.Settings");
     Bandwagon.Logger.debug("Initializing Bandwagon.Controller.Settings");
 
     Bandwagon.Controller.Settings.stringBundle = document.getElementById("bandwagon-strings");
@@ -137,6 +136,7 @@ Bandwagon.Controller.Settings.invalidate = function()
 
     var disabled = (!collectionSelection || collectionCount == 0);
 
+    // XXTODO Disable more controls
     //document.getElementById("remove-collection-button").disabled = disabled;
     document.getElementById("updates-group").disabled = disabled;
     document.getElementById("textbox-updateinterval-quantity-percollection").disabled = disabled;
diff --git a/bandwagon/skin/settings.css b/bandwagon/skin/settings.css
index 0c4e411..d0cc903 100644
--- a/bandwagon/skin/settings.css
+++ b/bandwagon/skin/settings.css
@@ -19,6 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s): David McNamara
+ *                 Brian King <brian (at) briks (dot) si>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -34,15 +35,15 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-radio[pane=manage] {
+radio[pane=paneManage] {
   list-style-image: url("chrome://bandwagon/skin/images/star32.png");
 }
 
-radio[pane=general] {
+radio[pane=paneGeneral] {
   list-style-image: url("chrome://bandwagon/skin/images/icon32.png");
 }
 
-radio[pane=auto] {
+radio[pane=paneAuto] {
   list-style-image: url("chrome://browser/skin/preferences/Options.png"); 
   -moz-image-region: rect(0px, 224px, 32px, 192px)
 }
@@ -57,14 +58,6 @@ radio[pane=auto] {
   font-size: larger;
 }
 
-.all-check {
-  padding-left: 15px;
-}
-
-#add-collection-button {
-  list-style-image: url("chrome://bandwagon/skin/images/plus.png");
-}
-
-#remove-collection-button {
-  list-style-image: url("chrome://bandwagon/skin/images/twisty-open.png");
+prefwindow description {
+  width: 30em;
 }