From ddf2fbc62a8b69e823f40ab5b7fd3095e6622ecb Mon Sep 17 00:00:00 2001
From: "ben%bengoodger.com" <ben%bengoodger.com>
Date: Tue, 26 Jul 2005 23:21:15 +0000
Subject: [PATCH] UI for software update needs to be revised - several CSS and
 window open flag fixes for various aspects of software update UI (menu,
 preferences, wizard) to make it look better on OS X. Not quite done yet.
 r=darin

---
 browser/base/content/baseMenuOverlay.xul      |  5 +-
 browser/components/preferences/advanced.xul   | 10 ++--
 .../browser/preferences/preferences.css       | 11 +++++
 toolkit/content/widgets/preferences.xml       |  2 +-
 .../chrome/mozapps/preferences/update.dtd     |  2 +-
 .../mozapps/update/content/incompatible.js    |  1 +
 .../mozapps/update/content/incompatible.xul   |  2 +-
 toolkit/mozapps/update/content/updates.xul    |  9 ++--
 .../mozapps/update/src/nsUpdateService.js.in  |  2 +-
 toolkit/themes/pinstripe/global/global.css    |  4 +-
 .../pinstripe/mozapps/update/updates.css      | 47 ++++++++++++-------
 .../winstripe/mozapps/update/updates.css      |  3 ++
 12 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/browser/base/content/baseMenuOverlay.xul b/browser/base/content/baseMenuOverlay.xul
index 96594e2a1974..6d5362741528 100644
--- a/browser/base/content/baseMenuOverlay.xul
+++ b/browser/base/content/baseMenuOverlay.xul
@@ -88,14 +88,15 @@
                   label="&helpReleaseNotes.label;"
                   oncommand="openReleaseNotes(event)"
                   onclick="checkForMiddleClick(this, event);"/>
-#ifndef XP_MACOSX
         <menuseparator id="aboutSeparator"/>
-#endif
         <menuitem id="checkForUpdates"
                   accesskey="&updateCmd.accesskey;"
                   label="&updateCmd.label;"
                   class="menuitem-iconic"
                   oncommand="checkForUpdates();"/>
+#ifndef XP_MACOSX
+        <menuseparator/>
+#endif
         <menuitem id="aboutName"
                   accesskey="&aboutCmd.accesskey;"
                   label="&aboutCmd.label;"
diff --git a/browser/components/preferences/advanced.xul b/browser/components/preferences/advanced.xul
index b1d1c5ce5fd9..2b8fbef7688b 100644
--- a/browser/components/preferences/advanced.xul
+++ b/browser/components/preferences/advanced.xul
@@ -129,14 +129,14 @@
           <vbox>
             <label>&softwareupdateinfo.label;</label>
             <separator class="thin"/>
-            <vbox align="start">
+            <vbox align="start" class="updateControls">
               <checkbox id="enableAppUpdate"
                         label="&enableAppUpdate.label;"
                         accesskey="&enableAppUpdate.accesskey;"
                         preference="app.update.enabled"
                         onsyncfrompreference="return gAdvancedPane.updateAppUpdateUI();"/>
-              <vbox class="indent" align="start">
-                <hbox>
+              <vbox class="indent">
+                <hbox align="center">
                   <checkbox id="enableAutoInstall"
                             label="&enableAutoInstall.label;"
                             accesskey="&enableAutoInstall.accesskey;"
@@ -147,7 +147,6 @@
                           label="&autoInstallOptions.label;" accesskey="&autoInstallOptions.accesskey;"
                           oncommand="gAdvancedPane.showAutoInstallOptions();"/>
                 </hbox>
-                <separator class="thin"/>
                 <hbox>
                   <button id="checkNowButton" 
                           label="&checkNow.label;" accesskey="&appCheckNow.accesskey;"
@@ -158,12 +157,11 @@
               </vbox>
             </vbox>
             <separator/>
-            <vbox align="start">
+            <vbox align="start" class="updateControls">
               <checkbox id="enableExtensionUpdate"
                         label="&enableExtensionUpdate.label;"
                         accesskey="&enableExtensionUpdate.accesskey;"
                         preference="extensions.update.autoUpdateEnabled"/>      
-              <separator class="thin"/>
               <hbox class="indent">
                 <button label="&checkNow.label;" accesskey="&extensionsCheckNow.accesskey;"
                         oncommand="gAdvancedPane.checkForAddonUpdates();"
diff --git a/browser/themes/pinstripe/browser/preferences/preferences.css b/browser/themes/pinstripe/browser/preferences/preferences.css
index fd6ebea1613d..d250a204f236 100644
--- a/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/browser/themes/pinstripe/browser/preferences/preferences.css
@@ -206,3 +206,14 @@ caption {
   padding: 0;
 }
 
+/**
+ * Update Preferences
+ */
+#autoInstallOptions {
+  -moz-margin-start: 20px;
+}
+
+.updateControls {
+  -moz-margin-start: 10px;
+}
+
diff --git a/toolkit/content/widgets/preferences.xml b/toolkit/content/widgets/preferences.xml
index 398445772be8..afe1b8114c0a 100644
--- a/toolkit/content/widgets/preferences.xml
+++ b/toolkit/content/widgets/preferences.xml
@@ -805,7 +805,7 @@
         <parameter name="aFeatures"/>
         <parameter name="aParams"/>
         <body>
-          return openDialog(aURL, "", "modal,centerscreen" + (aFeatures != "" ? ("," + aFeatures) : ""), aParams);
+          return openDialog(aURL, "", "modal,centerscreen,resizable=no" + (aFeatures != "" ? ("," + aFeatures) : ""), aParams);
         </body>
       </method>
       
diff --git a/toolkit/locales/en-US/chrome/mozapps/preferences/update.dtd b/toolkit/locales/en-US/chrome/mozapps/preferences/update.dtd
index f32fd5153083..1cb42a5d2782 100644
--- a/toolkit/locales/en-US/chrome/mozapps/preferences/update.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/preferences/update.dtd
@@ -1,6 +1,6 @@
 <!ENTITY update.title                   "Automatic Update">
 <!ENTITY window.width                   "30em">
-<!ENTITY window.height                  "25em">
+<!ENTITY window.height                  "27em">
 
 <!ENTITY update.intro                   "Automatically download and install updates for:">
 
diff --git a/toolkit/mozapps/update/content/incompatible.js b/toolkit/mozapps/update/content/incompatible.js
index bc96a018dc2d..315e3466d7c4 100755
--- a/toolkit/mozapps/update/content/incompatible.js
+++ b/toolkit/mozapps/update/content/incompatible.js
@@ -51,5 +51,6 @@ function init() {
   var cancelbutton = document.documentElement.getButton("cancel");
   cancelbutton.label = closebuttonlabel;
   cancelbutton.focus();
+  cancelbutton.setAttribute("default", "true");
 }
 
diff --git a/toolkit/mozapps/update/content/incompatible.xul b/toolkit/mozapps/update/content/incompatible.xul
index 5dad4466116f..7993911a6cbe 100755
--- a/toolkit/mozapps/update/content/incompatible.xul
+++ b/toolkit/mozapps/update/content/incompatible.xul
@@ -63,7 +63,7 @@
   
   <label>&incompatible.intro;</label>
   <separator/>
-  <listbox id="incompatibleItems" rows="10"/>
+  <listbox id="incompatibleItems" rows="5"/>
   <separator/>
   <label>&incompatible.update;</label>        
   <separator class="thin"/>
diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul
index 1bdc795aed52..53421bd6a194 100755
--- a/toolkit/mozapps/update/content/updates.xul
+++ b/toolkit/mozapps/update/content/updates.xul
@@ -109,19 +109,20 @@
             </vbox>
           </hbox>
           <link id="updateMoreInfoURL">
-            <label>&clickHere.label;</label>
+            <label id="updateMoreInfoURLLabel">&clickHere.label;</label>
           </link>
         </vbox>
       </deck>
       <separator flex="1"/>
     </vbox>    
-    <separator class="groove"/>
+    <separator id="separatorGroove" class="groove"/>
     <hbox id="installButtons">
       <button id="downloadLater" label="&later.label;" accesskey="&later.accesskey;"
               oncommand="gUpdatesAvailablePage.onInstallLater();"/>
       <spacer flex="1"/>
       <button id="downloadNow" label="&download.label;" accesskey="&download.accesskey;"
-              oncommand="gUpdatesAvailablePage.onInstallNow();"/>
+              oncommand="gUpdatesAvailablePage.onInstallNow();"
+              default="true"/>
     </hbox>
   </wizardpage>
   
@@ -145,7 +146,7 @@
       </link>
     </hbox>
     <progressmeter id="downloadProgress" mode="undetermined"/>
-    <hbox align="start">
+    <hbox id="downloadStatusLine">
       <image id="downloadThrobber"/>
       <description id="downloadStatus" flex="1">&connecting.label;</description>
       <button id="pauseButton" oncommand="gDownloadingPage.onPause();" 
diff --git a/toolkit/mozapps/update/src/nsUpdateService.js.in b/toolkit/mozapps/update/src/nsUpdateService.js.in
index 283041ee0661..4672d22672ff 100644
--- a/toolkit/mozapps/update/src/nsUpdateService.js.in
+++ b/toolkit/mozapps/update/src/nsUpdateService.js.in
@@ -2340,7 +2340,7 @@ UpdatePrompt.prototype = {
       win.focus();
     }
     else {
-      var openFeatures = "chrome,centerscreen,dialog";
+      var openFeatures = "chrome,centerscreen,dialog=no,resizable=no,titlebar,toolbar=no";
       if (features)
         openFeatures += "," + features;
       var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
diff --git a/toolkit/themes/pinstripe/global/global.css b/toolkit/themes/pinstripe/global/global.css
index 69dd799f4651..66664c4c82bd 100644
--- a/toolkit/themes/pinstripe/global/global.css
+++ b/toolkit/themes/pinstripe/global/global.css
@@ -89,8 +89,8 @@ prefwindow {
   font: message-box;
 }
 
-prefwindow {
-	  padding: 8px 10px 10px 8px;
+prefwindow[type="child"] {
+  padding: 18px 20px 15px 18px !important;
 }
 
 /* deprecated */
diff --git a/toolkit/themes/pinstripe/mozapps/update/updates.css b/toolkit/themes/pinstripe/mozapps/update/updates.css
index 5fec1983acff..ca6ac4e41af0 100755
--- a/toolkit/themes/pinstripe/mozapps/update/updates.css
+++ b/toolkit/themes/pinstripe/mozapps/update/updates.css
@@ -29,6 +29,10 @@ link:focus {
   border: 1px dotted black;
 }
 
+.wizard-page-box {
+  padding: 15px 10px 15px 10px;
+}
+
 /**
  * License Page
  */
@@ -48,7 +52,7 @@ license {
   margin-top: 3px;
 }
 .licenseLoadingThrobber[state="loading"] {
-  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
+  list-style-image: url("chrome://global/skin/icons/loading_16.gif");
 }
 .licenseLoadingThrobber[state="error"] {
   list-style-image: url("chrome://global/skin/icons/notfound.png");
@@ -58,37 +62,39 @@ license {
  * Update Found Page
  */
 #updatesfoundContent {
-  margin: 10px 44px 10px 44px;
+  -moz-margin-start: 8px;
+  -moz-margin-end: 8px;
 }
 
 wizard[currentpageid="updatesfound"] .wizard-page-box {
   margin: 0px;
 }
 
-#installButtons {
-  margin: 10px;
+#moreDetails {
+  margin: 1px 0px 4px 3px;
 }
 
-#moreDetails {
-  margin: 1px 5px 4px 3px;
+#updateMoreInfoURL, #updateMoreInfoURLLabel {
+  -moz-margin-start: 0px;
+  -moz-margin-end: 0px;
 }
 
 #downloadNow {
   font-weight: bold;
 }
 
-#downloadNow > .button-box {
-  padding-left: 15px;
-  padding-right: 15px;  
-}
-
-#updateForMoreInfo {
-  margin-left: 5px;
+#downloadNow, #downloadLater {
+  margin: 0px;
 }
 
 #updateName, #updateFinishedName {
   font-weight: bold;
   font-size: larger;
+  -moz-margin-start: 0px;
+}
+
+#separatorGroove {
+  display: none;
 }
 
 #alertImage {
@@ -117,10 +123,10 @@ wizard[currentpageid="updatesfound"] .wizard-page-box {
 }
 #downloadThrobber {
   margin: 5px 3px 0px 5px;
-  list-style-image: url("chrome://global/skin/throbber/Throbber-small.png");
+  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
 }
 #downloadThrobber[state="loading"] {
-  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
+  list-style-image: url("chrome://global/skin/icons/loading_16.gif");
 }
 
 #verificationFailedIcon {
@@ -128,6 +134,10 @@ wizard[currentpageid="updatesfound"] .wizard-page-box {
   margin: 5px 3px 0px 5px;
 }
 
+#downloadStatusLine {
+  -moz-box-align: center;
+}
+
 /**
  * Error Page
  */
@@ -173,9 +183,14 @@ update {
   margin-bottom: 1px;
 }
 
+/**
+ * Advanced Preferences
+ */
 .updatePrefsInfo {
   font-size: smaller;
-  margin-left: 27px;
+  margin-top: 5px;
   margin-bottom: 10px;
+  -moz-margin-start: 22px;
+  -moz-margin-end: 10px;
 }
 
diff --git a/toolkit/themes/winstripe/mozapps/update/updates.css b/toolkit/themes/winstripe/mozapps/update/updates.css
index 5fec1983acff..e2c4ddf93d44 100755
--- a/toolkit/themes/winstripe/mozapps/update/updates.css
+++ b/toolkit/themes/winstripe/mozapps/update/updates.css
@@ -122,6 +122,9 @@ wizard[currentpageid="updatesfound"] .wizard-page-box {
 #downloadThrobber[state="loading"] {
   list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
 }
+#downloadStatusLine {
+  -moz-box-align: start;
+}
 
 #verificationFailedIcon {
   list-style-image: url("chrome://global/skin/icons/notfound.png");