From 761a3928d410bd87ecd9e82922763c593585480a Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sat, 22 Jul 2006 20:39:33 +0000
Subject: [PATCH] Don't disable green zoom button because showing a sheet
 automatically enables it. Oh well...

---
 macosx/Controller.m      | 20 ++++++++++--------
 macosx/PrefsController.m | 44 ++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 7f8b4eefd..736954b30 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -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"])
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 1e59a7b83..098bb94cb 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -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