Show time remaining (forgot to turn this on for some reason) for downloads, make download items shrink properly to avoid horizontal scrollbars.

toolkit/mozapps/downloads/content/download.xml

@@ -132,7 +132,7 @@
         </xul:vbox>
 #endif
         <xul:vbox pack="start" flex="1">
-          <xul:label xbl:inherits="value=target" crop="middle"/>
+          <xul:label xbl:inherits="value=target" crop="center"/>
           <xul:label value="&starting.label;"/>
         </xul:vbox>
         <xul:vbox pack="start">
@@ -152,14 +152,10 @@
         </xul:vbox>
 #endif
         <xul:vbox flex="1">
-          <xul:label xbl:inherits="value=target" flex="1" crop="middle"/>
+          <xul:label xbl:inherits="value=target" crop="center"/>
           <xul:progressmeter mode="normal" value="0" flex="1"
                             xbl:inherits="value=progress,mode=progressmode"/>
-          <xul:hbox align="center" flex="1">
-            <xul:label value="&pause.label;" class="link" 
-                      onclick="this.parentNode.parentNode.parentNode.parentNode.fireEvent('pause');"/>          
-            <xul:label xbl:inherits="value=status"/>
-          </xul:hbox>                     
+          <xul:label xbl:inherits="value=status" crop="center"/>
         </xul:vbox>
         <xul:vbox pack="start">
           <xul:label value="&cancel.label;" class="link"
@@ -289,14 +285,10 @@
         </xul:vbox>
 #endif
         <xul:vbox flex="1">
-          <xul:label xbl:inherits="value=target" flex="1" crop="middle"/>
+          <xul:label xbl:inherits="value=target" flex="1" crop="center"/>
           <xul:progressmeter mode="normal" value="0" flex="1"
                             xbl:inherits="value=progress,mode=progressmode"/>
-          <xul:hbox align="center" flex="1">
-            <xul:label value="&resume.label;" class="link" 
-                      onclick="this.parentNode.parentNode.parentNode.parentNode.fireEvent('resume');"/>          
-            <xul:label xbl:inherits="value=status"/>
-          </xul:hbox>                     
+          <xul:label xbl:inherits="value=status"/>
         </xul:vbox>
         <xul:vbox pack="start">
           <xul:label value="&cancel.label;" class="link"
@@ -324,7 +316,7 @@
         </xul:vbox>
 #endif
         <xul:vbox pack="start" flex="1">
-          <xul:label xbl:inherits="value=target" crop="middle"/>
+          <xul:label xbl:inherits="value=target" crop="center"/>
           <xul:label value="&done.label;"/>
         </xul:vbox>
         <xul:vbox pack="start">
@@ -344,7 +336,7 @@
         </xul:vbox>
 #endif
         <xul:vbox pack="start" flex="1">
-          <xul:label xbl:inherits="value=target" crop="middle"/>
+          <xul:label xbl:inherits="value=target" crop="center"/>
           <xul:label value="&canceled.label;"/>
         </xul:vbox>
         <xul:vbox pack="start">
@@ -364,7 +356,7 @@
         </xul:vbox>
 #endif
         <xul:vbox pack="start" flex="1">
-          <xul:label xbl:inherits="value=target" crop="middle"/>
+          <xul:label xbl:inherits="value=target" crop="center"/>
           <xul:label value="&failed.label;"/>
         </xul:vbox>
         <xul:vbox pack="start">

toolkit/mozapps/downloads/content/downloads.js

@@ -475,3 +475,43 @@ function onDownloadShowOptions()
               "chrome,titlebar,resizable,modal", "catDownloadsButton");
 }
 
+
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is Mozilla.org Code.
+# 
+# The Initial Developer of the Original Code is
+# Doron Rosenberg.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Blake Ross <blakeross@telocity.com> (Original Author) 
+#   Ben Goodger <ben@bengoodger.com> (v2.0) 
+# 
+# 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
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK *****
+
+ 

toolkit/mozapps/downloads/locale/downloads.properties

@@ -17,7 +17,7 @@ downloadsCompleteMsg=All files have finished downloading.
 statusFormatKBKB=#1 of #2 KB
 statusFormatKBMB=#1 KB of #2 MB
 statusFormatMBMB=#1 of #2 MB
-statusFormat=#1; #2 KB/sec
+statusFormat=#1 at #2 KB/sec; #3 remain
 longTimeFormat=#1:#2:#3
 shortTimeFormat=#2:#3