From 15f49491afb03f9381c27012f37fe8c468fd15f8 Mon Sep 17 00:00:00 2001
From: "sfraser%netscape.com" <sfraser%netscape.com>
Date: Fri, 26 Jul 2002 23:37:10 +0000
Subject: [PATCH] Fix bug 159461: make the progress window remember its
 position, and (bug 159460) have it appear in the Windows menu, with a useful
 name.

---
 .../English.lproj/ProgressDialog.nib/info.nib |   4 ---
 .../ProgressDialog.nib/objects.nib            | Bin 2352 -> 2233 bytes
 camino/ProgressDialog.nib/info.nib            |   4 ---
 camino/ProgressDialog.nib/objects.nib         | Bin 2352 -> 2233 bytes
 camino/ProgressDlgController.h                |   2 ++
 camino/ProgressDlgController.mm               |  29 ++++++++++++++++++
 .../English.lproj/ProgressDialog.nib/info.nib |   4 ---
 .../ProgressDialog.nib/objects.nib            | Bin 2352 -> 2233 bytes
 camino/src/download/ProgressDlgController.h   |   2 ++
 camino/src/download/ProgressDlgController.mm  |  29 ++++++++++++++++++
 .../English.lproj/ProgressDialog.nib/info.nib |   4 ---
 .../ProgressDialog.nib/objects.nib            | Bin 2352 -> 2233 bytes
 chimera/ProgressDialog.nib/info.nib           |   4 ---
 chimera/ProgressDialog.nib/objects.nib        | Bin 2352 -> 2233 bytes
 chimera/ProgressDlgController.h               |   2 ++
 chimera/ProgressDlgController.mm              |  29 ++++++++++++++++++
 .../English.lproj/ProgressDialog.nib/info.nib |   4 ---
 .../ProgressDialog.nib/objects.nib            | Bin 2352 -> 2233 bytes
 chimera/src/download/ProgressDlgController.h  |   2 ++
 chimera/src/download/ProgressDlgController.mm |  29 ++++++++++++++++++
 20 files changed, 124 insertions(+), 24 deletions(-)

diff --git a/camino/English.lproj/ProgressDialog.nib/info.nib b/camino/English.lproj/ProgressDialog.nib/info.nib
index 223d3c7ab29c..d128c1fddc68 100644
--- a/camino/English.lproj/ProgressDialog.nib/info.nib
+++ b/camino/English.lproj/ProgressDialog.nib/info.nib
@@ -6,10 +6,6 @@
 	<string>94 26 404 250 0 0 1152 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>5</integer>
-	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/camino/English.lproj/ProgressDialog.nib/objects.nib b/camino/English.lproj/ProgressDialog.nib/objects.nib
index 75d771a2cf4bbd4f5db3d66a20035f4bea62b32a..53a6f68e67e880d54ecd14e1c1a0ccb9a7bff90f 100644
GIT binary patch
delta 599
zcmZ9IPiqrF7{)VccAG+KjaUz&peIo;Ch^c7>Y>GeSn|gNRN8}^W~ga*vt>6DZ&7UK
z17z5tdznK{5~T@|U}VWlAcwGEzJmvgA|ge+*V)xW$Zh8Lyz@NoGo1^cqMa5(fe-Ic
z6rs2DG`NNObaQTl-j)`SL$8Of(5`e34X7TxOxHrIXh^G}0UG=Fv~&l#^p%vL-{w}M
z_WMAqO&ax1op9FVjMF9g;X*i-dt53P^(rmME46wn*nU&1ot?c7d?swn*~DT4&W4;h
zoVlF!IqPyZ;;hH*Mb<n#I*O!ndHk}HEMc`6Bg__PX&S|1g7ySmoThh$xnSp}St3qu
zG0U?|mQ;Mhyq2z(u|e2yW-#tK4(J#8(y}|_8y8BSX6G;7?9M2$1Yr}wq>NI=Dq$mW
zMq=8b?fJbGPm!zsHxSY|JUO0tdxVQv#k)!c|6`WpF)gqAU42Hg;pObfvE_A%Xt|0~
zd0}oU1rgx8SYAp*%NY8uflYH=G5&L}QdGOIDhDPm=1Ur$e&o`R;j7!fpTlVp>?iPN
zAAapXGXq?Peh!>G44%UH8GKKJg`k^-9|}w)_?m*B1sHCDy9c9f=smJkJJ1k0=O3(Z
Q=sUWSG!zY2bz`59zv8$Lc>n+a

delta 671
zcmZ9I&ubGw6vs17Hw`AKq^O`$^-%CAO+1u>;Lm_4X*4+~_2AYWV(M-pn@IE&q}e%m
z%&<d)Fo&G%R&0pmu&{l>Kn`Jr_+Kc97AfMf&ZZTY3=A{#`M&RWc+ZZv=h_xR(U03G
zj->ilbKxC*g%%=P5i4LJv7?0UPOT!Fo(|slub=SghOr$m8b-sRpMqy-Mp};b-UqB5
z(lFWvX*8)Dyp8(w<n%6`mm=a7r$47JA(x($l5`_@g}#wub3M+6oV7UXbJpd|=8V3T
z?u2L3*^FGoD&3QoQuWQv*^FMw>$qILS&-FIo>)^m8@1ZO!Rx?hVlqBrE@vIi9L@&3
z8DplfL{kM7Uo2l(sTQ$LSd)GUovQVOa6FyO;g^+E0jtWQScDA(MdECEHor<(U!YkZ
zN_h2M0b@S6c$qMJqHr8M5>Og9LYOP=%YIivBy}c}l7tN>ladL-9J(~KUi0!o)k0Az
zRS9X-zkL{aorV>x;=EkJhs<<5rsYcG4v(1k(J?Khmoz{1zKUwuid=b7zALX`^{Cn#
zNL2eb^XsyH$j_VJIO5tZReoN^O0J+`zssdp!}Hf#8E8I){wn;Cp?e>`ufW$dm<V_X
n+;!+ZfZ=1Xv+(B`{C*0Zd$6|#zn;Lp0)t23<X|LG9zOdQ^5HHn

diff --git a/camino/ProgressDialog.nib/info.nib b/camino/ProgressDialog.nib/info.nib
index 223d3c7ab29c..d128c1fddc68 100644
--- a/camino/ProgressDialog.nib/info.nib
+++ b/camino/ProgressDialog.nib/info.nib
@@ -6,10 +6,6 @@
 	<string>94 26 404 250 0 0 1152 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>5</integer>
-	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/camino/ProgressDialog.nib/objects.nib b/camino/ProgressDialog.nib/objects.nib
index 75d771a2cf4bbd4f5db3d66a20035f4bea62b32a..53a6f68e67e880d54ecd14e1c1a0ccb9a7bff90f 100644
GIT binary patch
delta 599
zcmZ9IPiqrF7{)VccAG+KjaUz&peIo;Ch^c7>Y>GeSn|gNRN8}^W~ga*vt>6DZ&7UK
z17z5tdznK{5~T@|U}VWlAcwGEzJmvgA|ge+*V)xW$Zh8Lyz@NoGo1^cqMa5(fe-Ic
z6rs2DG`NNObaQTl-j)`SL$8Of(5`e34X7TxOxHrIXh^G}0UG=Fv~&l#^p%vL-{w}M
z_WMAqO&ax1op9FVjMF9g;X*i-dt53P^(rmME46wn*nU&1ot?c7d?swn*~DT4&W4;h
zoVlF!IqPyZ;;hH*Mb<n#I*O!ndHk}HEMc`6Bg__PX&S|1g7ySmoThh$xnSp}St3qu
zG0U?|mQ;Mhyq2z(u|e2yW-#tK4(J#8(y}|_8y8BSX6G;7?9M2$1Yr}wq>NI=Dq$mW
zMq=8b?fJbGPm!zsHxSY|JUO0tdxVQv#k)!c|6`WpF)gqAU42Hg;pObfvE_A%Xt|0~
zd0}oU1rgx8SYAp*%NY8uflYH=G5&L}QdGOIDhDPm=1Ur$e&o`R;j7!fpTlVp>?iPN
zAAapXGXq?Peh!>G44%UH8GKKJg`k^-9|}w)_?m*B1sHCDy9c9f=smJkJJ1k0=O3(Z
Q=sUWSG!zY2bz`59zv8$Lc>n+a

delta 671
zcmZ9I&ubGw6vs17Hw`AKq^O`$^-%CAO+1u>;Lm_4X*4+~_2AYWV(M-pn@IE&q}e%m
z%&<d)Fo&G%R&0pmu&{l>Kn`Jr_+Kc97AfMf&ZZTY3=A{#`M&RWc+ZZv=h_xR(U03G
zj->ilbKxC*g%%=P5i4LJv7?0UPOT!Fo(|slub=SghOr$m8b-sRpMqy-Mp};b-UqB5
z(lFWvX*8)Dyp8(w<n%6`mm=a7r$47JA(x($l5`_@g}#wub3M+6oV7UXbJpd|=8V3T
z?u2L3*^FGoD&3QoQuWQv*^FMw>$qILS&-FIo>)^m8@1ZO!Rx?hVlqBrE@vIi9L@&3
z8DplfL{kM7Uo2l(sTQ$LSd)GUovQVOa6FyO;g^+E0jtWQScDA(MdECEHor<(U!YkZ
zN_h2M0b@S6c$qMJqHr8M5>Og9LYOP=%YIivBy}c}l7tN>ladL-9J(~KUi0!o)k0Az
zRS9X-zkL{aorV>x;=EkJhs<<5rsYcG4v(1k(J?Khmoz{1zKUwuid=b7zALX`^{Cn#
zNL2eb^XsyH$j_VJIO5tZReoN^O0J+`zssdp!}Hf#8E8I){wn;Cp?e>`ufW$dm<V_X
n+;!+ZfZ=1Xv+(B`{C*0Zd$6|#zn;Lp0)t23<X|LG9zOdQ^5HHn

diff --git a/camino/ProgressDlgController.h b/camino/ProgressDlgController.h
index 68e471a6e5a3..7eace8fdf719 100644
--- a/camino/ProgressDlgController.h
+++ b/camino/ProgressDlgController.h
@@ -73,6 +73,8 @@ class nsDownloadListener;
     NSTimer             *mDownloadTimer;
 }
 
+-(void)autosaveWindowFrame;
+
 -(void) setupDownloadTimer;
 -(void) killDownloadTimer;
 -(void) setDownloadProgress:(NSTimer *)aTimer;
diff --git a/camino/ProgressDlgController.mm b/camino/ProgressDlgController.mm
index 0135d927e42d..f0faa87be3aa 100644
--- a/camino/ProgressDlgController.mm
+++ b/camino/ProgressDlgController.mm
@@ -57,6 +57,7 @@ static NSString *ShowFileToolbarItemIdentifier    = @"Show File Toolbar Item";
 static NSString *OpenFileToolbarItemIdentifier    = @"Open File Toolbar Item";
 static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar Item";
 
+static NSString *ProgressWindowFrameSaveName      = @"ProgressWindow";
 
 @implementation ChimeraDownloadControllerFactory : DownloadControllerFactory
 
@@ -85,8 +86,17 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   [super dealloc];
 }
 
+- (void)awakeFromNib
+{
+  NSLog(@"awakeFromNib");
+  //[[self window] setFrameUsingName: ProgressWindowFrameSaveName];
+  //[[self window] setFrameAutosaveName: ProgressWindowFrameSaveName];
+}
+
 - (void)windowDidLoad
 {
+  [super windowDidLoad];
+  
   mDownloadIsPaused = NO;
   mDownloadIsComplete = NO;
 
@@ -100,6 +110,8 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   [self setupToolbar];
   [mProgressBar setUsesThreadedAnimation:YES];      
   [mProgressBar startAnimation:self];   // move to onStateChange
+
+  //[[self window] setFrameUsingName: ProgressWindowFrameSaveName];
 }
 
 - (void)setupToolbar
@@ -152,6 +164,11 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   return YES;           // turn it on otherwise.
 }
 
+-(void)autosaveWindowFrame
+{
+  [[self window] saveFrameUsingName: ProgressWindowFrameSaveName];
+}
+
 - (NSToolbarItem *) toolbar:(NSToolbar *)toolbar
       itemForItemIdentifier:(NSString *)itemIdent
   willBeInsertedIntoToolbar:(BOOL)willBeInserted
@@ -308,6 +325,7 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 
 - (void)windowWillClose:(NSNotification *)notification
 {
+  [self autosaveWindowFrame];
   [self autorelease];
 }
 
@@ -467,6 +485,10 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 - (void)onStartDownload:(BOOL)isFileSave;
 {
   mIsFileSave = isFileSave;
+  
+  [self window];		// make the window
+  [[self window] setFrameUsingName: ProgressWindowFrameSaveName];
+
   [self showWindow: self];
   [self setupDownloadTimer];
 }
@@ -514,6 +536,13 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 {
   [mToField setStringValue: [aDestPath stringByAbbreviatingWithTildeInPath]];
   [mToField display];   // force an immmeditate update
+  
+  // also set the window title
+  NSString* downloadFileName = [aDestPath lastPathComponent];
+  if ([downloadFileName length] == 0)
+    downloadFileName = aDestPath;
+  
+  [[self window] setTitle:[NSString stringWithFormat:NSLocalizedString(@"DownloadingTitle", @""), downloadFileName]];
 }
 
 @end
diff --git a/camino/resources/localized/English.lproj/ProgressDialog.nib/info.nib b/camino/resources/localized/English.lproj/ProgressDialog.nib/info.nib
index 223d3c7ab29c..d128c1fddc68 100644
--- a/camino/resources/localized/English.lproj/ProgressDialog.nib/info.nib
+++ b/camino/resources/localized/English.lproj/ProgressDialog.nib/info.nib
@@ -6,10 +6,6 @@
 	<string>94 26 404 250 0 0 1152 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>5</integer>
-	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/camino/resources/localized/English.lproj/ProgressDialog.nib/objects.nib b/camino/resources/localized/English.lproj/ProgressDialog.nib/objects.nib
index 75d771a2cf4bbd4f5db3d66a20035f4bea62b32a..53a6f68e67e880d54ecd14e1c1a0ccb9a7bff90f 100644
GIT binary patch
delta 599
zcmZ9IPiqrF7{)VccAG+KjaUz&peIo;Ch^c7>Y>GeSn|gNRN8}^W~ga*vt>6DZ&7UK
z17z5tdznK{5~T@|U}VWlAcwGEzJmvgA|ge+*V)xW$Zh8Lyz@NoGo1^cqMa5(fe-Ic
z6rs2DG`NNObaQTl-j)`SL$8Of(5`e34X7TxOxHrIXh^G}0UG=Fv~&l#^p%vL-{w}M
z_WMAqO&ax1op9FVjMF9g;X*i-dt53P^(rmME46wn*nU&1ot?c7d?swn*~DT4&W4;h
zoVlF!IqPyZ;;hH*Mb<n#I*O!ndHk}HEMc`6Bg__PX&S|1g7ySmoThh$xnSp}St3qu
zG0U?|mQ;Mhyq2z(u|e2yW-#tK4(J#8(y}|_8y8BSX6G;7?9M2$1Yr}wq>NI=Dq$mW
zMq=8b?fJbGPm!zsHxSY|JUO0tdxVQv#k)!c|6`WpF)gqAU42Hg;pObfvE_A%Xt|0~
zd0}oU1rgx8SYAp*%NY8uflYH=G5&L}QdGOIDhDPm=1Ur$e&o`R;j7!fpTlVp>?iPN
zAAapXGXq?Peh!>G44%UH8GKKJg`k^-9|}w)_?m*B1sHCDy9c9f=smJkJJ1k0=O3(Z
Q=sUWSG!zY2bz`59zv8$Lc>n+a

delta 671
zcmZ9I&ubGw6vs17Hw`AKq^O`$^-%CAO+1u>;Lm_4X*4+~_2AYWV(M-pn@IE&q}e%m
z%&<d)Fo&G%R&0pmu&{l>Kn`Jr_+Kc97AfMf&ZZTY3=A{#`M&RWc+ZZv=h_xR(U03G
zj->ilbKxC*g%%=P5i4LJv7?0UPOT!Fo(|slub=SghOr$m8b-sRpMqy-Mp};b-UqB5
z(lFWvX*8)Dyp8(w<n%6`mm=a7r$47JA(x($l5`_@g}#wub3M+6oV7UXbJpd|=8V3T
z?u2L3*^FGoD&3QoQuWQv*^FMw>$qILS&-FIo>)^m8@1ZO!Rx?hVlqBrE@vIi9L@&3
z8DplfL{kM7Uo2l(sTQ$LSd)GUovQVOa6FyO;g^+E0jtWQScDA(MdECEHor<(U!YkZ
zN_h2M0b@S6c$qMJqHr8M5>Og9LYOP=%YIivBy}c}l7tN>ladL-9J(~KUi0!o)k0Az
zRS9X-zkL{aorV>x;=EkJhs<<5rsYcG4v(1k(J?Khmoz{1zKUwuid=b7zALX`^{Cn#
zNL2eb^XsyH$j_VJIO5tZReoN^O0J+`zssdp!}Hf#8E8I){wn;Cp?e>`ufW$dm<V_X
n+;!+ZfZ=1Xv+(B`{C*0Zd$6|#zn;Lp0)t23<X|LG9zOdQ^5HHn

diff --git a/camino/src/download/ProgressDlgController.h b/camino/src/download/ProgressDlgController.h
index 68e471a6e5a3..7eace8fdf719 100644
--- a/camino/src/download/ProgressDlgController.h
+++ b/camino/src/download/ProgressDlgController.h
@@ -73,6 +73,8 @@ class nsDownloadListener;
     NSTimer             *mDownloadTimer;
 }
 
+-(void)autosaveWindowFrame;
+
 -(void) setupDownloadTimer;
 -(void) killDownloadTimer;
 -(void) setDownloadProgress:(NSTimer *)aTimer;
diff --git a/camino/src/download/ProgressDlgController.mm b/camino/src/download/ProgressDlgController.mm
index 0135d927e42d..f0faa87be3aa 100644
--- a/camino/src/download/ProgressDlgController.mm
+++ b/camino/src/download/ProgressDlgController.mm
@@ -57,6 +57,7 @@ static NSString *ShowFileToolbarItemIdentifier    = @"Show File Toolbar Item";
 static NSString *OpenFileToolbarItemIdentifier    = @"Open File Toolbar Item";
 static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar Item";
 
+static NSString *ProgressWindowFrameSaveName      = @"ProgressWindow";
 
 @implementation ChimeraDownloadControllerFactory : DownloadControllerFactory
 
@@ -85,8 +86,17 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   [super dealloc];
 }
 
+- (void)awakeFromNib
+{
+  NSLog(@"awakeFromNib");
+  //[[self window] setFrameUsingName: ProgressWindowFrameSaveName];
+  //[[self window] setFrameAutosaveName: ProgressWindowFrameSaveName];
+}
+
 - (void)windowDidLoad
 {
+  [super windowDidLoad];
+  
   mDownloadIsPaused = NO;
   mDownloadIsComplete = NO;
 
@@ -100,6 +110,8 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   [self setupToolbar];
   [mProgressBar setUsesThreadedAnimation:YES];      
   [mProgressBar startAnimation:self];   // move to onStateChange
+
+  //[[self window] setFrameUsingName: ProgressWindowFrameSaveName];
 }
 
 - (void)setupToolbar
@@ -152,6 +164,11 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   return YES;           // turn it on otherwise.
 }
 
+-(void)autosaveWindowFrame
+{
+  [[self window] saveFrameUsingName: ProgressWindowFrameSaveName];
+}
+
 - (NSToolbarItem *) toolbar:(NSToolbar *)toolbar
       itemForItemIdentifier:(NSString *)itemIdent
   willBeInsertedIntoToolbar:(BOOL)willBeInserted
@@ -308,6 +325,7 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 
 - (void)windowWillClose:(NSNotification *)notification
 {
+  [self autosaveWindowFrame];
   [self autorelease];
 }
 
@@ -467,6 +485,10 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 - (void)onStartDownload:(BOOL)isFileSave;
 {
   mIsFileSave = isFileSave;
+  
+  [self window];		// make the window
+  [[self window] setFrameUsingName: ProgressWindowFrameSaveName];
+
   [self showWindow: self];
   [self setupDownloadTimer];
 }
@@ -514,6 +536,13 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 {
   [mToField setStringValue: [aDestPath stringByAbbreviatingWithTildeInPath]];
   [mToField display];   // force an immmeditate update
+  
+  // also set the window title
+  NSString* downloadFileName = [aDestPath lastPathComponent];
+  if ([downloadFileName length] == 0)
+    downloadFileName = aDestPath;
+  
+  [[self window] setTitle:[NSString stringWithFormat:NSLocalizedString(@"DownloadingTitle", @""), downloadFileName]];
 }
 
 @end
diff --git a/chimera/English.lproj/ProgressDialog.nib/info.nib b/chimera/English.lproj/ProgressDialog.nib/info.nib
index 223d3c7ab29c..d128c1fddc68 100644
--- a/chimera/English.lproj/ProgressDialog.nib/info.nib
+++ b/chimera/English.lproj/ProgressDialog.nib/info.nib
@@ -6,10 +6,6 @@
 	<string>94 26 404 250 0 0 1152 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>5</integer>
-	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/chimera/English.lproj/ProgressDialog.nib/objects.nib b/chimera/English.lproj/ProgressDialog.nib/objects.nib
index 75d771a2cf4bbd4f5db3d66a20035f4bea62b32a..53a6f68e67e880d54ecd14e1c1a0ccb9a7bff90f 100644
GIT binary patch
delta 599
zcmZ9IPiqrF7{)VccAG+KjaUz&peIo;Ch^c7>Y>GeSn|gNRN8}^W~ga*vt>6DZ&7UK
z17z5tdznK{5~T@|U}VWlAcwGEzJmvgA|ge+*V)xW$Zh8Lyz@NoGo1^cqMa5(fe-Ic
z6rs2DG`NNObaQTl-j)`SL$8Of(5`e34X7TxOxHrIXh^G}0UG=Fv~&l#^p%vL-{w}M
z_WMAqO&ax1op9FVjMF9g;X*i-dt53P^(rmME46wn*nU&1ot?c7d?swn*~DT4&W4;h
zoVlF!IqPyZ;;hH*Mb<n#I*O!ndHk}HEMc`6Bg__PX&S|1g7ySmoThh$xnSp}St3qu
zG0U?|mQ;Mhyq2z(u|e2yW-#tK4(J#8(y}|_8y8BSX6G;7?9M2$1Yr}wq>NI=Dq$mW
zMq=8b?fJbGPm!zsHxSY|JUO0tdxVQv#k)!c|6`WpF)gqAU42Hg;pObfvE_A%Xt|0~
zd0}oU1rgx8SYAp*%NY8uflYH=G5&L}QdGOIDhDPm=1Ur$e&o`R;j7!fpTlVp>?iPN
zAAapXGXq?Peh!>G44%UH8GKKJg`k^-9|}w)_?m*B1sHCDy9c9f=smJkJJ1k0=O3(Z
Q=sUWSG!zY2bz`59zv8$Lc>n+a

delta 671
zcmZ9I&ubGw6vs17Hw`AKq^O`$^-%CAO+1u>;Lm_4X*4+~_2AYWV(M-pn@IE&q}e%m
z%&<d)Fo&G%R&0pmu&{l>Kn`Jr_+Kc97AfMf&ZZTY3=A{#`M&RWc+ZZv=h_xR(U03G
zj->ilbKxC*g%%=P5i4LJv7?0UPOT!Fo(|slub=SghOr$m8b-sRpMqy-Mp};b-UqB5
z(lFWvX*8)Dyp8(w<n%6`mm=a7r$47JA(x($l5`_@g}#wub3M+6oV7UXbJpd|=8V3T
z?u2L3*^FGoD&3QoQuWQv*^FMw>$qILS&-FIo>)^m8@1ZO!Rx?hVlqBrE@vIi9L@&3
z8DplfL{kM7Uo2l(sTQ$LSd)GUovQVOa6FyO;g^+E0jtWQScDA(MdECEHor<(U!YkZ
zN_h2M0b@S6c$qMJqHr8M5>Og9LYOP=%YIivBy}c}l7tN>ladL-9J(~KUi0!o)k0Az
zRS9X-zkL{aorV>x;=EkJhs<<5rsYcG4v(1k(J?Khmoz{1zKUwuid=b7zALX`^{Cn#
zNL2eb^XsyH$j_VJIO5tZReoN^O0J+`zssdp!}Hf#8E8I){wn;Cp?e>`ufW$dm<V_X
n+;!+ZfZ=1Xv+(B`{C*0Zd$6|#zn;Lp0)t23<X|LG9zOdQ^5HHn

diff --git a/chimera/ProgressDialog.nib/info.nib b/chimera/ProgressDialog.nib/info.nib
index 223d3c7ab29c..d128c1fddc68 100644
--- a/chimera/ProgressDialog.nib/info.nib
+++ b/chimera/ProgressDialog.nib/info.nib
@@ -6,10 +6,6 @@
 	<string>94 26 404 250 0 0 1152 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>5</integer>
-	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/chimera/ProgressDialog.nib/objects.nib b/chimera/ProgressDialog.nib/objects.nib
index 75d771a2cf4bbd4f5db3d66a20035f4bea62b32a..53a6f68e67e880d54ecd14e1c1a0ccb9a7bff90f 100644
GIT binary patch
delta 599
zcmZ9IPiqrF7{)VccAG+KjaUz&peIo;Ch^c7>Y>GeSn|gNRN8}^W~ga*vt>6DZ&7UK
z17z5tdznK{5~T@|U}VWlAcwGEzJmvgA|ge+*V)xW$Zh8Lyz@NoGo1^cqMa5(fe-Ic
z6rs2DG`NNObaQTl-j)`SL$8Of(5`e34X7TxOxHrIXh^G}0UG=Fv~&l#^p%vL-{w}M
z_WMAqO&ax1op9FVjMF9g;X*i-dt53P^(rmME46wn*nU&1ot?c7d?swn*~DT4&W4;h
zoVlF!IqPyZ;;hH*Mb<n#I*O!ndHk}HEMc`6Bg__PX&S|1g7ySmoThh$xnSp}St3qu
zG0U?|mQ;Mhyq2z(u|e2yW-#tK4(J#8(y}|_8y8BSX6G;7?9M2$1Yr}wq>NI=Dq$mW
zMq=8b?fJbGPm!zsHxSY|JUO0tdxVQv#k)!c|6`WpF)gqAU42Hg;pObfvE_A%Xt|0~
zd0}oU1rgx8SYAp*%NY8uflYH=G5&L}QdGOIDhDPm=1Ur$e&o`R;j7!fpTlVp>?iPN
zAAapXGXq?Peh!>G44%UH8GKKJg`k^-9|}w)_?m*B1sHCDy9c9f=smJkJJ1k0=O3(Z
Q=sUWSG!zY2bz`59zv8$Lc>n+a

delta 671
zcmZ9I&ubGw6vs17Hw`AKq^O`$^-%CAO+1u>;Lm_4X*4+~_2AYWV(M-pn@IE&q}e%m
z%&<d)Fo&G%R&0pmu&{l>Kn`Jr_+Kc97AfMf&ZZTY3=A{#`M&RWc+ZZv=h_xR(U03G
zj->ilbKxC*g%%=P5i4LJv7?0UPOT!Fo(|slub=SghOr$m8b-sRpMqy-Mp};b-UqB5
z(lFWvX*8)Dyp8(w<n%6`mm=a7r$47JA(x($l5`_@g}#wub3M+6oV7UXbJpd|=8V3T
z?u2L3*^FGoD&3QoQuWQv*^FMw>$qILS&-FIo>)^m8@1ZO!Rx?hVlqBrE@vIi9L@&3
z8DplfL{kM7Uo2l(sTQ$LSd)GUovQVOa6FyO;g^+E0jtWQScDA(MdECEHor<(U!YkZ
zN_h2M0b@S6c$qMJqHr8M5>Og9LYOP=%YIivBy}c}l7tN>ladL-9J(~KUi0!o)k0Az
zRS9X-zkL{aorV>x;=EkJhs<<5rsYcG4v(1k(J?Khmoz{1zKUwuid=b7zALX`^{Cn#
zNL2eb^XsyH$j_VJIO5tZReoN^O0J+`zssdp!}Hf#8E8I){wn;Cp?e>`ufW$dm<V_X
n+;!+ZfZ=1Xv+(B`{C*0Zd$6|#zn;Lp0)t23<X|LG9zOdQ^5HHn

diff --git a/chimera/ProgressDlgController.h b/chimera/ProgressDlgController.h
index 68e471a6e5a3..7eace8fdf719 100644
--- a/chimera/ProgressDlgController.h
+++ b/chimera/ProgressDlgController.h
@@ -73,6 +73,8 @@ class nsDownloadListener;
     NSTimer             *mDownloadTimer;
 }
 
+-(void)autosaveWindowFrame;
+
 -(void) setupDownloadTimer;
 -(void) killDownloadTimer;
 -(void) setDownloadProgress:(NSTimer *)aTimer;
diff --git a/chimera/ProgressDlgController.mm b/chimera/ProgressDlgController.mm
index 0135d927e42d..f0faa87be3aa 100644
--- a/chimera/ProgressDlgController.mm
+++ b/chimera/ProgressDlgController.mm
@@ -57,6 +57,7 @@ static NSString *ShowFileToolbarItemIdentifier    = @"Show File Toolbar Item";
 static NSString *OpenFileToolbarItemIdentifier    = @"Open File Toolbar Item";
 static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar Item";
 
+static NSString *ProgressWindowFrameSaveName      = @"ProgressWindow";
 
 @implementation ChimeraDownloadControllerFactory : DownloadControllerFactory
 
@@ -85,8 +86,17 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   [super dealloc];
 }
 
+- (void)awakeFromNib
+{
+  NSLog(@"awakeFromNib");
+  //[[self window] setFrameUsingName: ProgressWindowFrameSaveName];
+  //[[self window] setFrameAutosaveName: ProgressWindowFrameSaveName];
+}
+
 - (void)windowDidLoad
 {
+  [super windowDidLoad];
+  
   mDownloadIsPaused = NO;
   mDownloadIsComplete = NO;
 
@@ -100,6 +110,8 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   [self setupToolbar];
   [mProgressBar setUsesThreadedAnimation:YES];      
   [mProgressBar startAnimation:self];   // move to onStateChange
+
+  //[[self window] setFrameUsingName: ProgressWindowFrameSaveName];
 }
 
 - (void)setupToolbar
@@ -152,6 +164,11 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   return YES;           // turn it on otherwise.
 }
 
+-(void)autosaveWindowFrame
+{
+  [[self window] saveFrameUsingName: ProgressWindowFrameSaveName];
+}
+
 - (NSToolbarItem *) toolbar:(NSToolbar *)toolbar
       itemForItemIdentifier:(NSString *)itemIdent
   willBeInsertedIntoToolbar:(BOOL)willBeInserted
@@ -308,6 +325,7 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 
 - (void)windowWillClose:(NSNotification *)notification
 {
+  [self autosaveWindowFrame];
   [self autorelease];
 }
 
@@ -467,6 +485,10 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 - (void)onStartDownload:(BOOL)isFileSave;
 {
   mIsFileSave = isFileSave;
+  
+  [self window];		// make the window
+  [[self window] setFrameUsingName: ProgressWindowFrameSaveName];
+
   [self showWindow: self];
   [self setupDownloadTimer];
 }
@@ -514,6 +536,13 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 {
   [mToField setStringValue: [aDestPath stringByAbbreviatingWithTildeInPath]];
   [mToField display];   // force an immmeditate update
+  
+  // also set the window title
+  NSString* downloadFileName = [aDestPath lastPathComponent];
+  if ([downloadFileName length] == 0)
+    downloadFileName = aDestPath;
+  
+  [[self window] setTitle:[NSString stringWithFormat:NSLocalizedString(@"DownloadingTitle", @""), downloadFileName]];
 }
 
 @end
diff --git a/chimera/resources/localized/English.lproj/ProgressDialog.nib/info.nib b/chimera/resources/localized/English.lproj/ProgressDialog.nib/info.nib
index 223d3c7ab29c..d128c1fddc68 100644
--- a/chimera/resources/localized/English.lproj/ProgressDialog.nib/info.nib
+++ b/chimera/resources/localized/English.lproj/ProgressDialog.nib/info.nib
@@ -6,10 +6,6 @@
 	<string>94 26 404 250 0 0 1152 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>5</integer>
-	</array>
 	<key>IBSystem Version</key>
 	<string>5S66</string>
 </dict>
diff --git a/chimera/resources/localized/English.lproj/ProgressDialog.nib/objects.nib b/chimera/resources/localized/English.lproj/ProgressDialog.nib/objects.nib
index 75d771a2cf4bbd4f5db3d66a20035f4bea62b32a..53a6f68e67e880d54ecd14e1c1a0ccb9a7bff90f 100644
GIT binary patch
delta 599
zcmZ9IPiqrF7{)VccAG+KjaUz&peIo;Ch^c7>Y>GeSn|gNRN8}^W~ga*vt>6DZ&7UK
z17z5tdznK{5~T@|U}VWlAcwGEzJmvgA|ge+*V)xW$Zh8Lyz@NoGo1^cqMa5(fe-Ic
z6rs2DG`NNObaQTl-j)`SL$8Of(5`e34X7TxOxHrIXh^G}0UG=Fv~&l#^p%vL-{w}M
z_WMAqO&ax1op9FVjMF9g;X*i-dt53P^(rmME46wn*nU&1ot?c7d?swn*~DT4&W4;h
zoVlF!IqPyZ;;hH*Mb<n#I*O!ndHk}HEMc`6Bg__PX&S|1g7ySmoThh$xnSp}St3qu
zG0U?|mQ;Mhyq2z(u|e2yW-#tK4(J#8(y}|_8y8BSX6G;7?9M2$1Yr}wq>NI=Dq$mW
zMq=8b?fJbGPm!zsHxSY|JUO0tdxVQv#k)!c|6`WpF)gqAU42Hg;pObfvE_A%Xt|0~
zd0}oU1rgx8SYAp*%NY8uflYH=G5&L}QdGOIDhDPm=1Ur$e&o`R;j7!fpTlVp>?iPN
zAAapXGXq?Peh!>G44%UH8GKKJg`k^-9|}w)_?m*B1sHCDy9c9f=smJkJJ1k0=O3(Z
Q=sUWSG!zY2bz`59zv8$Lc>n+a

delta 671
zcmZ9I&ubGw6vs17Hw`AKq^O`$^-%CAO+1u>;Lm_4X*4+~_2AYWV(M-pn@IE&q}e%m
z%&<d)Fo&G%R&0pmu&{l>Kn`Jr_+Kc97AfMf&ZZTY3=A{#`M&RWc+ZZv=h_xR(U03G
zj->ilbKxC*g%%=P5i4LJv7?0UPOT!Fo(|slub=SghOr$m8b-sRpMqy-Mp};b-UqB5
z(lFWvX*8)Dyp8(w<n%6`mm=a7r$47JA(x($l5`_@g}#wub3M+6oV7UXbJpd|=8V3T
z?u2L3*^FGoD&3QoQuWQv*^FMw>$qILS&-FIo>)^m8@1ZO!Rx?hVlqBrE@vIi9L@&3
z8DplfL{kM7Uo2l(sTQ$LSd)GUovQVOa6FyO;g^+E0jtWQScDA(MdECEHor<(U!YkZ
zN_h2M0b@S6c$qMJqHr8M5>Og9LYOP=%YIivBy}c}l7tN>ladL-9J(~KUi0!o)k0Az
zRS9X-zkL{aorV>x;=EkJhs<<5rsYcG4v(1k(J?Khmoz{1zKUwuid=b7zALX`^{Cn#
zNL2eb^XsyH$j_VJIO5tZReoN^O0J+`zssdp!}Hf#8E8I){wn;Cp?e>`ufW$dm<V_X
n+;!+ZfZ=1Xv+(B`{C*0Zd$6|#zn;Lp0)t23<X|LG9zOdQ^5HHn

diff --git a/chimera/src/download/ProgressDlgController.h b/chimera/src/download/ProgressDlgController.h
index 68e471a6e5a3..7eace8fdf719 100644
--- a/chimera/src/download/ProgressDlgController.h
+++ b/chimera/src/download/ProgressDlgController.h
@@ -73,6 +73,8 @@ class nsDownloadListener;
     NSTimer             *mDownloadTimer;
 }
 
+-(void)autosaveWindowFrame;
+
 -(void) setupDownloadTimer;
 -(void) killDownloadTimer;
 -(void) setDownloadProgress:(NSTimer *)aTimer;
diff --git a/chimera/src/download/ProgressDlgController.mm b/chimera/src/download/ProgressDlgController.mm
index 0135d927e42d..f0faa87be3aa 100644
--- a/chimera/src/download/ProgressDlgController.mm
+++ b/chimera/src/download/ProgressDlgController.mm
@@ -57,6 +57,7 @@ static NSString *ShowFileToolbarItemIdentifier    = @"Show File Toolbar Item";
 static NSString *OpenFileToolbarItemIdentifier    = @"Open File Toolbar Item";
 static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar Item";
 
+static NSString *ProgressWindowFrameSaveName      = @"ProgressWindow";
 
 @implementation ChimeraDownloadControllerFactory : DownloadControllerFactory
 
@@ -85,8 +86,17 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   [super dealloc];
 }
 
+- (void)awakeFromNib
+{
+  NSLog(@"awakeFromNib");
+  //[[self window] setFrameUsingName: ProgressWindowFrameSaveName];
+  //[[self window] setFrameAutosaveName: ProgressWindowFrameSaveName];
+}
+
 - (void)windowDidLoad
 {
+  [super windowDidLoad];
+  
   mDownloadIsPaused = NO;
   mDownloadIsComplete = NO;
 
@@ -100,6 +110,8 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   [self setupToolbar];
   [mProgressBar setUsesThreadedAnimation:YES];      
   [mProgressBar startAnimation:self];   // move to onStateChange
+
+  //[[self window] setFrameUsingName: ProgressWindowFrameSaveName];
 }
 
 - (void)setupToolbar
@@ -152,6 +164,11 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
   return YES;           // turn it on otherwise.
 }
 
+-(void)autosaveWindowFrame
+{
+  [[self window] saveFrameUsingName: ProgressWindowFrameSaveName];
+}
+
 - (NSToolbarItem *) toolbar:(NSToolbar *)toolbar
       itemForItemIdentifier:(NSString *)itemIdent
   willBeInsertedIntoToolbar:(BOOL)willBeInserted
@@ -308,6 +325,7 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 
 - (void)windowWillClose:(NSNotification *)notification
 {
+  [self autosaveWindowFrame];
   [self autorelease];
 }
 
@@ -467,6 +485,10 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 - (void)onStartDownload:(BOOL)isFileSave;
 {
   mIsFileSave = isFileSave;
+  
+  [self window];		// make the window
+  [[self window] setFrameUsingName: ProgressWindowFrameSaveName];
+
   [self showWindow: self];
   [self setupDownloadTimer];
 }
@@ -514,6 +536,13 @@ static NSString *LeaveOpenToolbarItemIdentifier   = @"Leave Open Toggle Toolbar
 {
   [mToField setStringValue: [aDestPath stringByAbbreviatingWithTildeInPath]];
   [mToField display];   // force an immmeditate update
+  
+  // also set the window title
+  NSString* downloadFileName = [aDestPath lastPathComponent];
+  if ([downloadFileName length] == 0)
+    downloadFileName = aDestPath;
+  
+  [[self window] setTitle:[NSString stringWithFormat:NSLocalizedString(@"DownloadingTitle", @""), downloadFileName]];
 }
 
 @end