Bug 79889: download progress dialog not wide enough. r=hewitt, sr=hyatt

xpfe/components/ucth/resources/helperAppDldProgress.js

@@ -82,9 +82,8 @@ var progressListener = {
           // right now, all that supports restarting downloads is ftp (rfc959)    
           ftpChannel = aRequest.QueryInterface(Components.interfaces.nsIFTPChannel);
           if (ftpChannel) {
-            dialog.pause.setAttribute("hidden", false);
-            dialog.pause.setAttribute("label", getString("pause"));
-           }
+            dialog.pauseResumeDeck.setAttribute("index", "1");
+          }
         }
         catch (ex) {}
       }
@@ -332,7 +331,9 @@ function onLoad() {
     dialog.timeLeft    = document.getElementById("dialog.timeLeft");
     dialog.timeElapsed = document.getElementById("dialog.timeElapsed");
     dialog.cancel      = document.getElementById("cancel");
-    dialog.pause       = document.getElementById("pause")
+    dialog.pause       = document.getElementById("pause");
+    dialog.resume      = document.getElementById("resume");
+    dialog.pauseResumeDeck = document.getElementById("pauseResumeDeck");
     dialog.request     = 0;
     dialog.downloadPaused = false;
     keepProgressWindowUpBox = document.getElementById('keepProgressDialogUp');
@@ -428,7 +429,8 @@ function setupPostProgressUI()
     openButton.removeAttribute("disabled");
   }
 
-  dialog.pause.setAttribute("disabled", true);
+  dialog.pause.disabled = true; // setAttribute("disabled", true);
+  dialog.resume.disabled = true;
   keepProgressWindowUpBox.disabled = true;
   
 }
@@ -468,14 +470,14 @@ function doPauseButton() {
     {
         // resume
         dialog.downloadPaused = false;
-        dialog.pause.setAttribute("label", getString("pause"));
+        dialog.pauseResumeDeck.setAttribute("index", "1");
         dialog.request.resume()
     }
     else
     {
         // suspend
         dialog.downloadPaused = true;
-        dialog.pause.setAttribute("label", getString("resume"));
+        dialog.pauseResumeDeck.setAttribute("index", "2");
         dialog.request.suspend()
     }
 }

xpfe/components/ucth/resources/helperAppDldProgress.xul

@@ -37,7 +37,6 @@ Contributor(s):
         orient="vertical"
         title="&downloadWindow.title;"
         onload="onLoad()"
-        style="width: 36em;"
         onunload="onUnload()">
 
     <script type="application/x-javascript" src="chrome://global/content/helperAppDldProgress.js"/>
@@ -58,8 +57,6 @@ Contributor(s):
     <data id="dialog.strings.longTimeFormat">&longTimeFormat;</data>
     <data id="dialog.strings.unknownTime">&unknownTime;</data>
     <data id="dialog.strings.pausedMsg">&pausedMsg;</data>
-    <data id="dialog.strings.pause">&pauseButtonText;</data>
-    <data id="dialog.strings.resume">&resumeButtonText;</data>
 
     <grid flex="1">
       <columns>
@@ -124,7 +121,11 @@ Contributor(s):
     
     <hbox id="CancelButton">
       <button class="dialog" id="cancel" label="&dialogCancel.label;" oncommand="doCancelButton()"/>
-      <button class="dialog" id="pause"  hidden="true" oncommand="doPauseButton()"/>
+      <deck id="pauseResumeDeck">
+        <spacer/>
+        <button class="dialog" id="pause"  label="&pauseButtonText;"  oncommand="doPauseButton()"/>
+        <button class="dialog" id="resume" label="&resumeButtonText;" oncommand="doPauseButton()"/>
+      </deck>
       <spring flex="1"/>
       <button class="dialog" id="open" label="&open.label;" disabled="true" oncommand="doOpen()"/>
       <button class="dialog" id="openFolder" label="&openFolder.label;" disabled="true" oncommand="doOpenFolder()"/>