Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 159461: make the progress window remember its position, and (bug 159460) have it appear in the Windows menu, with a useful name.

Browse Source
This commit is contained in:
sfraser%netscape.com 2002-07-26 23:37:10 +00:00
parent de23207907
commit 15f49491af
20 changed files with 124 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
camino/English.lproj/ProgressDialog.nib/info.nib generated
View File

@ -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>

BIN
camino/English.lproj/ProgressDialog.nib/objects.nib generated
View File

Binary file not shown.

4
camino/ProgressDialog.nib/info.nib generated
View File

@ -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>

BIN
camino/ProgressDialog.nib/objects.nib generated
View File

Binary file not shown.

2
camino/ProgressDlgController.h
View File

@ -73,6 +73,8 @@ class nsDownloadListener;
NSTimer *mDownloadTimer;
}
-(void)autosaveWindowFrame;
-(void) setupDownloadTimer;
-(void) killDownloadTimer;
-(void) setDownloadProgress:(NSTimer *)aTimer;

29
camino/ProgressDlgController.mm
View File

@ -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

4
camino/resources/localized/English.lproj/ProgressDialog.nib/info.nib generated
View File

@ -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>

BIN
camino/resources/localized/English.lproj/ProgressDialog.nib/objects.nib generated
View File

Binary file not shown.

2
camino/src/download/ProgressDlgController.h
View File

@ -73,6 +73,8 @@ class nsDownloadListener;
NSTimer *mDownloadTimer;
}
-(void)autosaveWindowFrame;
-(void) setupDownloadTimer;
-(void) killDownloadTimer;
-(void) setDownloadProgress:(NSTimer *)aTimer;

29
camino/src/download/ProgressDlgController.mm
View File

@ -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

4
chimera/English.lproj/ProgressDialog.nib/info.nib generated
View File

@ -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>

BIN
chimera/English.lproj/ProgressDialog.nib/objects.nib generated
View File

Binary file not shown.

4
chimera/ProgressDialog.nib/info.nib generated
View File

@ -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>

BIN
chimera/ProgressDialog.nib/objects.nib generated
View File

Binary file not shown.

2
chimera/ProgressDlgController.h
View File

@ -73,6 +73,8 @@ class nsDownloadListener;
NSTimer *mDownloadTimer;
}
-(void)autosaveWindowFrame;
-(void) setupDownloadTimer;
-(void) killDownloadTimer;
-(void) setDownloadProgress:(NSTimer *)aTimer;

29
chimera/ProgressDlgController.mm
View File

@ -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

4
chimera/resources/localized/English.lproj/ProgressDialog.nib/info.nib generated
View File

@ -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>

BIN
chimera/resources/localized/English.lproj/ProgressDialog.nib/objects.nib generated
View File

Binary file not shown.

2
chimera/src/download/ProgressDlgController.h
View File

@ -73,6 +73,8 @@ class nsDownloadListener;
NSTimer *mDownloadTimer;
}
-(void)autosaveWindowFrame;
-(void) setupDownloadTimer;
-(void) killDownloadTimer;
-(void) setDownloadProgress:(NSTimer *)aTimer;

29
chimera/src/download/ProgressDlgController.mm
View File

@ -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