mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't disable green zoom button because showing a sheet automatically enables it. Oh well...

This commit is contained in:
Mitchell Livingston 2006-07-22 20:39:33 +00:00
parent 8e0ff693f2
commit 761a3928d4
2 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
macosx/Controller.m
View File

@ -350,7 +350,7 @@ static void sleepCallBack(void * controller, io_service_t y,
if ([fDefaults boolForKey: @"InfoVisible"])
[self showInfo: nil];
//must do after everything is set up
//must do after everything else is set up
[self checkAutoImportDirectory: nil];
fAutoImportTimer = [NSTimer scheduledTimerWithTimeInterval: 15.0 target: self
selector: @selector(checkAutoImportDirectory:) userInfo: nil repeats: YES];
@ -387,8 +387,7 @@ static void sleepCallBack(void * controller, io_service_t y,
@"There are %d active transfers. Do you really want to quit?", active];
NSBeginAlertSheet(@"Confirm Quit", @"Quit", @"Cancel", nil, fWindow, self,
@selector(quitSheetDidEnd:returnCode:contextInfo:),
nil, nil, message);
@selector(quitSheetDidEnd:returnCode:contextInfo:), nil, nil, message);
return NSTerminateLater;
}
}
@ -396,10 +395,8 @@ static void sleepCallBack(void * controller, io_service_t y,
return NSTerminateNow;
}
- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode
contextInfo: (void *) contextInfo
- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo
{
[NSApp stopModal];
[NSApp replyToApplicationShouldTerminate: returnCode == NSAlertDefaultReturn];
}
@ -905,8 +902,7 @@ static void sleepCallBack(void * controller, io_service_t y,
[fInfoController updateInfoStats];
//badge dock
[fBadger updateBadgeWithCompleted: fCompleted
uploadRate: uploadRate downloadRate: downloadRate];
[fBadger updateBadgeWithCompleted: fCompleted uploadRate: uploadRate downloadRate: downloadRate];
}
- (void) updateTorrentHistory
@ -2121,10 +2117,16 @@ static void sleepCallBack(void * controller, io_service_t y,
- (void) setAutoSize: (NSNotification *) notification
{
[[fWindow standardWindowButton: NSWindowZoomButton] setEnabled: ![fDefaults boolForKey: @"AutoSize"]];
#warning will not work because of sheets
//[[fWindow standardWindowButton: NSWindowZoomButton] setEnabled: ![fDefaults boolForKey: @"AutoSize"]];
[self setWindowSizeToFit];
}
- (BOOL) windowShouldZoom: (NSWindow *) sender toFrame: (NSRect) newFrame
{
return ![fDefaults boolForKey: @"AutoSize"];
}
- (void) setWindowSizeToFit
{
if ([fDefaults boolForKey: @"AutoSize"])

44
macosx/PrefsController.m
View File

@ -691,28 +691,28 @@
- (void) folderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info
{
if (code == NSOKButton)
{
[fDownloadFolder release];
fDownloadFolder = [[[openPanel filenames] objectAtIndex: 0] retain];
[fFolderPopUp selectItemAtIndex: DOWNLOAD_FOLDER];
[fDefaults setObject: fDownloadFolder forKey: @"DownloadFolder"];
[fDefaults setObject: @"Constant" forKey: @"DownloadChoice"];
[self updatePopUp];
}
else
{
//reset if cancelled
NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"];
if ([downloadChoice isEqualToString: @"Constant"])
[fFolderPopUp selectItemAtIndex: DOWNLOAD_FOLDER];
else if ([downloadChoice isEqualToString: @"Torrent"])
[fFolderPopUp selectItemAtIndex: DOWNLOAD_TORRENT];
else
[fFolderPopUp selectItemAtIndex: DOWNLOAD_ASK];
}
if (code == NSOKButton)
{
[fDownloadFolder release];
fDownloadFolder = [[[openPanel filenames] objectAtIndex: 0] retain];
[fFolderPopUp selectItemAtIndex: DOWNLOAD_FOLDER];
[fDefaults setObject: fDownloadFolder forKey: @"DownloadFolder"];
[fDefaults setObject: @"Constant" forKey: @"DownloadChoice"];
[self updatePopUp];
}
else
{
//reset if cancelled
NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"];
if ([downloadChoice isEqualToString: @"Constant"])
[fFolderPopUp selectItemAtIndex: DOWNLOAD_FOLDER];
else if ([downloadChoice isEqualToString: @"Torrent"])
[fFolderPopUp selectItemAtIndex: DOWNLOAD_TORRENT];
else
[fFolderPopUp selectItemAtIndex: DOWNLOAD_ASK];
}
}
- (void) updatePopUp