Changeset 1030 for trunk/macosx/PrefsController.m

Timestamp:

Oct 25, 2006, 2:57:00 AM (16 years ago)

Author:

livings124

Message:

load prefs when first used as opposed to at launch

File:

• trunk/macosx/PrefsController.m (modified) (15 diffs)

trunk/macosx/PrefsController.m

@@ -71 +71 @@
         }
         
-        [[self window] update]; //make sure nib is loaded right away
+        //set download folder and import folder
+        fDownloadFolder = [[[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath] retain];
+        fImportFolder = [[[fDefaults stringForKey: @"AutoImportDirectory"] stringByExpandingTildeInPath] retain];
+        
+        //set auto import
+        if ([fDefaults boolForKey: @"AutoImport"])
+            [[UKKQueue sharedFileWatcher] addPath: fImportFolder];
+        
+        //set bind port
+        int bindPort = [fDefaults integerForKey: @"BindPort"];
+        tr_setBindPort(fHandle, bindPort);
+        
+        //set NAT
+        if ([fDefaults boolForKey: @"NatTraversal"])
+            tr_natTraversalEnable(fHandle);
+        
+        //actually set bandwidth limits
+        if ([fDefaults boolForKey: @"SpeedLimit"])
+        {
+            tr_setUploadLimit(fHandle, [fDefaults integerForKey: @"SpeedLimitUploadLimit"]);
+            tr_setDownloadLimit(fHandle, [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]);
+        }
+        else
+        {
+            tr_setUploadLimit(fHandle, [fDefaults boolForKey: @"CheckUpload"]
+                                            ? [fDefaults integerForKey: @"UploadLimit"] : -1);
+            tr_setDownloadLimit(fHandle, [fDefaults boolForKey: @"CheckDownload"]
+                                            ? [fDefaults integerForKey: @"DownloadLimit"] : -1);
+        }
     }
     return self;
@@ -78 +106 @@
 - (void) dealloc
 {
-    [fNatStatusTimer invalidate];
+    if (fNatStatusTimer)
+        [fNatStatusTimer invalidate];
 
     [fDownloadFolder release];
@@ -99 +128 @@
     //set download folder
     NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"];
-    fDownloadFolder = [[[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath] retain];
     if ([downloadChoice isEqualToString: @"Constant"])
         [fFolderPopUp selectItemAtIndex: DOWNLOAD_FOLDER];
@@ -109 +137 @@
     
     //set auto import
-    fImportFolder = [[[fDefaults stringForKey: @"AutoImportDirectory"] stringByExpandingTildeInPath] retain];
     [self updateImportPopUp];
  
@@ -116 +143 @@
     [fImportFolderPopUp setEnabled: autoImport];
     
-    if (autoImport)
-        [[UKKQueue sharedFileWatcher] addPath: fImportFolder];
-    
     //set auto size
     [fAutoSizeCheck setState: [fDefaults boolForKey: @"AutoSize"]];
@@ -125 +149 @@
     int bindPort = [fDefaults integerForKey: @"BindPort"];
     [fPortField setIntValue: bindPort];
-    tr_setBindPort(fHandle, bindPort);
-    
     [self updatePortStatus];
     
     //set NAT
-    BOOL natShouldEnable = [fDefaults boolForKey: @"NatTraversal"];
-    if (natShouldEnable)
-        tr_natTraversalEnable(fHandle);
-    [fNatCheck setState: natShouldEnable];
+    [fNatCheck setState: [fDefaults boolForKey: @"NatTraversal"]];
     
     fNatStatus = -1;
@@ -142 +161 @@
     //set upload limit
     BOOL checkUpload = [fDefaults boolForKey: @"CheckUpload"];
-    int uploadLimit = [fDefaults integerForKey: @"UploadLimit"];
-    
     [fUploadCheck setState: checkUpload];
-    [fUploadField setIntValue: uploadLimit];
+    [fUploadField setIntValue: [fDefaults integerForKey: @"UploadLimit"]];
     [fUploadField setEnabled: checkUpload];
 
         //set download limit
     BOOL checkDownload = [fDefaults boolForKey: @"CheckDownload"];
-    int downloadLimit = [fDefaults integerForKey: @"DownloadLimit"];
-    
     [fDownloadCheck setState: checkDownload];
-    [fDownloadField setIntValue: downloadLimit];
+    [fDownloadField setIntValue: [fDefaults integerForKey: @"DownloadLimit"]];
     [fDownloadField setEnabled: checkDownload];
     
     //set speed limit
-    int speedLimitUploadLimit = [fDefaults integerForKey: @"SpeedLimitUploadLimit"];
-    [fSpeedLimitUploadField setIntValue: speedLimitUploadLimit];
-    
-    int speedLimitDownloadLimit = [fDefaults integerForKey: @"SpeedLimitDownloadLimit"];
-    [fSpeedLimitDownloadField setIntValue: speedLimitDownloadLimit];
-    
-    //actually set bandwidth limits
-    if ([fDefaults boolForKey: @"SpeedLimit"])
-    {
-        tr_setUploadLimit(fHandle, speedLimitUploadLimit);
-        tr_setDownloadLimit(fHandle, speedLimitDownloadLimit);
-    }
-    else
-    {
-        tr_setUploadLimit(fHandle, checkUpload ? uploadLimit : -1);
-        tr_setDownloadLimit(fHandle, checkDownload ? downloadLimit : -1);
-    }
+    [fSpeedLimitUploadField setIntValue: [fDefaults integerForKey: @"SpeedLimitUploadLimit"]];
+    [fSpeedLimitDownloadField setIntValue: [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]];
     
     //set auto speed limit
@@ -279 +279 @@
     else
         [fUpdatePopUp selectItemAtIndex: UPDATE_DAILY];
+}
+
+- (void) setUpdater: (SUUpdater *) updater
+{
+    fUpdater = updater;
 }
 
@@ -482 +487 @@
     }
     
-    NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys:
-                                    [NSNumber numberWithBool: [check state]], @"Enable",
-                                    [NSNumber numberWithInt: limit], @"Limit",
-                                    type, @"Type", nil];
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"LimitGlobalChange" object: dict];
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"LimitGlobalChange"
+                                            object: [[NSNumber alloc] initWithBool: sender == fUploadField]];
 }
 
@@ -511 +513 @@
 }
 
-- (void) setLimitEnabled: (BOOL) enable type: (NSString *) type
-{
-    NSButton * check = [type isEqualToString: @"Upload"] ? fUploadCheck : fDownloadCheck;
-    [check setState: enable ? NSOnState : NSOffState];
-    [self setLimitCheck: check];
+- (void) setQuickLimitEnabled: (BOOL) enable type: (NSString *) type
+{
+    //if interface is loaded, perform change as if user performed it
+    #warning better way?
+    if (fToolbar)
+    {
+        NSButton * check = [type isEqualToString: @"Upload"] ? fUploadCheck : fDownloadCheck;
+        [check setState: enable ? NSOnState : NSOffState];
+        [self setLimitCheck: check];
+    }
+    else
+    {
+        BOOL upload = [type isEqualToString: @"Upload"];
+        [fDefaults setBool: enable forKey: upload ? @"CheckUpload" : @"CheckDownload"];
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"LimitGlobalChange"
+                                                object: [[NSNumber alloc] initWithBool: upload]];
+    }
 }
 
 - (void) setQuickLimit: (int) limit type: (NSString *) type
 {
-    NSButton * check;
-    if ([type isEqualToString: @"Upload"])
-    {
-        [fUploadField setIntValue: limit];
-        check = fUploadCheck;
-    }
-    else
-    {
-        [fDownloadField setIntValue: limit];
-        check = fDownloadCheck;
-    }
-    [check setState: NSOnState];
-    [self setLimitCheck: check];
+    //if interface is loaded, perform change as if user performed it
+    #warning better way?
+    if (fToolbar)
+    {
+        NSButton * check;
+        if ([type isEqualToString: @"Upload"])
+        {
+            [fUploadField setIntValue: limit];
+            check = fUploadCheck;
+        }
+        else
+        {
+            [fDownloadField setIntValue: limit];
+            check = fDownloadCheck;
+        }
+        [check setState: NSOnState];
+        [self setLimitCheck: check];
+    }
+    else
+    {
+        BOOL upload = [type isEqualToString: @"Upload"];
+        [fDefaults setBool: YES forKey: upload ? @"CheckUpload" : @"CheckDownload"];
+        [fDefaults setInteger: limit forKey: upload ? @"UploadLimit" : @"DownloadLimit"];
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"LimitGlobalChange"
+                                                object: [[NSNumber alloc] initWithBool: upload]];
+    }
 }
 
@@ -548 +577 @@
         else
         {
-            tr_setUploadLimit(fHandle, [fUploadCheck state] ? [fDefaults integerForKey: @"UploadLimit"] : -1);
-            tr_setDownloadLimit(fHandle, [fDownloadCheck state] ? [fDefaults integerForKey: @"DownloadLimit"] : -1);
+            tr_setUploadLimit(fHandle, [fDefaults boolForKey: @"CheckUpload"]
+                                        ? [fDefaults integerForKey: @"UploadLimit"] : -1);
+            tr_setDownloadLimit(fHandle, [fDefaults boolForKey: @"CheckDownload"]
+                                            ? [fDefaults integerForKey: @"DownloadLimit"] : -1);
         }
     }
@@ -628 +659 @@
         [fDefaults setFloat: ratioLimit forKey: @"RatioLimit"];
     
-    NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys:
-                                [NSNumber numberWithBool: [fRatioCheck state]], @"Enable",
-                                [NSNumber numberWithFloat: ratioLimit], @"Ratio", nil];
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"RatioGlobalChange" object: dict];
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"RatioGlobalChange" object: nil];
 }
 
@@ -643 +671 @@
 }
 
-- (void) setRatioEnabled: (BOOL) enable
-{
-    int state = enable ? NSOnState : NSOffState;
-    
-    [fRatioCheck setState: state];
-    [self setRatioCheck: fRatioCheck];
+- (void) setQuickRatioEnabled: (BOOL) enable
+{
+    //if interface is loaded, perform change as if user performed it
+    #warning better way?
+    if (fToolbar)
+    {
+        int state = enable ? NSOnState : NSOffState;
+        
+        [fRatioCheck setState: state];
+        [self setRatioCheck: fRatioCheck];
+    }
+    else
+    {
+        [fDefaults setBool: enable forKey: @"RatioCheck"];
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"RatioGlobalChange" object: nil];
+    }
 }
 
 - (void) setQuickRatio: (float) ratioLimit
 {
-    [fRatioField setFloatValue: ratioLimit];
-    
-    [fRatioCheck setState: NSOnState];
-    [self setRatioCheck: fRatioCheck];
+    //if interface is loaded, perform change as if user performed it
+    #warning better way?
+    if (fToolbar)
+    {
+        [fRatioField setFloatValue: ratioLimit];
+        
+        [fRatioCheck setState: NSOnState];
+        [self setRatioCheck: fRatioCheck];
+    }
+    else
+    {
+        [fDefaults setBool: YES forKey: @"RatioCheck"];
+        [fDefaults setFloat: ratioLimit forKey: @"RatioLimit"];
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"RatioGlobalChange" object: nil];
+    }
 }
 
@@ -744 +795 @@
 
     [fDefaults setInteger: seconds forKey: @"SUScheduledCheckInterval"];
-    [fUpdater scheduleCheckWithInterval: seconds];
+    
+    if (fUpdater)
+        [fUpdater scheduleCheckWithInterval: seconds];
 }
 
@@ -811 +864 @@
 }
 
-- (void) checkUpdate
-{
-    [fUpdater checkForUpdates: nil];
-}
-
 - (void) folderSheetShow: (id) sender
 {