128801 - downloading dialog has "-1%" in titlebar

Patched by Aaron Kaluszka <ask@swva.net>
r=law sr=bryner
This commit is contained in:
caillon%returnzero.com 2002-08-16 05:23:47 +00:00
Родитель 4a1468f8c2
Коммит d9ec8520f9
3 изменённых файлов: 20 добавлений и 5 удалений

Просмотреть файл

@ -19,7 +19,8 @@
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Bill Law <law@netscape.com>
- Bill Law <law@netscape.com>
- Aaron Kaluszka <ask@swva.net>
-
- 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
@ -52,6 +53,10 @@
<!ENTITY openingSource "Opening From:">
<!ENTITY openingTarget "With:">
<!-- This is used when the download percentage is unknown -->
<!ENTITY unknownSavingTitle "Saving #1">
<!ENTITY unknownOpeningTitle "Opening #1">
<!-- Labels on other fields -->
<!ENTITY status "Status:">
<!ENTITY timeElapsed "Elapsed Time:">

Просмотреть файл

@ -19,7 +19,8 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Bill Law <law@netscape.com>
* Bill Law <law@netscape.com>
* Aaron Kaluszka <ask@swva.net>
*
* 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
@ -493,13 +494,19 @@ nsProgressDialog.prototype = {
// Set the dialog title.
setTitle: function() {
// Start with saving/opening template.
var title = this.saving ? this.getString( "savingTitle" ) : this.getString( "openingTitle" );
// If percentage is not known (-1), use alternate template
var title = this.saving
? ( this.percent != -1 ? this.getString( "savingTitle" ) : this.getString( "unknownSavingTitle" ) )
: ( this.percent != -1 ? this.getString( "openingTitle" ) : this.getString( "unknownOpeningTitle" ) );
// Use file name as insert 1.
title = this.replaceInsert( title, 1, this.fileName() );
// Use percentage as insert 2.
title = this.replaceInsert( title, 2, this.percent );
// Use percentage as insert 2 (if known).
if ( this.percent != -1 ) {
title = this.replaceInsert( title, 2, this.percent );
}
// Set <window>'s title attribute.
if ( this.dialog ) {

Просмотреть файл

@ -25,6 +25,7 @@
- Contributor(s):
- Scott MacGregor <mscott@netscape.com>
- Bill Law <law@netscape.com>
- Aaron Kaluszka <ask@swva.net>
-
- 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
@ -94,6 +95,8 @@
<data id="string.openingTitle">&openingTitle;</data>
<data id="string.openingSource">&openingSource;</data>
<data id="string.openingTarget">&openingTarget;</data>
<data id="string.unknownSavingTitle">&unknownSavingTitle;</data>
<data id="string.unknownOpeningTitle">&unknownOpeningTitle;</data>
<data id="string.pause">&pause;</data>
<data id="string.resume">&resume;</data>