Changeset 38

Timestamp:

Jan 21, 2006, 3:11:57 AM (17 years ago)

Author:

titer

Message:

Use setBool: and setInt: for setting defaults instead of first changing
to strings
Put default settings in a plist

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• Defaults.plist (added)
• PrefsController.m (modified) (9 diffs)
• Transmission.xcodeproj/project.pbxproj (modified) (5 diffs)

trunk/macosx/Controller.m

@@ -314 +314 @@
         {
             tr_torrentSetFolder( fHandle, tr_torrentCount( fHandle ) - 1,
-                                 [downloadFolder UTF8String] );
+                                 [[downloadFolder stringByExpandingTildeInPath] UTF8String] );
             tr_torrentStart( fHandle, tr_torrentCount( fHandle ) - 1 );
         }

trunk/macosx/PrefsController.m

@@ -23 +23 @@
 #import "PrefsController.h"
 
-#define DEFAULT_UPLOAD      @"20"
 #define MIN_PORT            1
 #define MAX_PORT            65535
@@ -51 +50 @@
 + (void) initialize
 {
-    NSDictionary   * appDefaults;
-    NSString       * desktop, * port;
-
-    /* Register defaults settings:
-        - Simple bar
-        - Always download to Desktop
-        - Port TR_DEFAULT_PORT
-        - Upload limit DEFAULT_UPLOAD
-        - Limit upload
-        - Ask before quitting
-        - Ask before removing */
-    desktop = [NSHomeDirectory() stringByAppendingString: @"/Desktop"];
-    port = [NSString stringWithFormat: @"%d", TR_DEFAULT_PORT];
-
-    appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
-                    @"NO",          @"UseAdvancedBar",
-                    @"Constant",    @"DownloadChoice",
-                    desktop,        @"DownloadFolder",
-                    port,           @"BindPort",
-                    DEFAULT_UPLOAD, @"UploadLimit",
-                    @"YES",         @"CheckUpload",
-                    @"YES",         @"CheckQuit",
-                    @"YES",         @"CheckRemove",
-                    NULL];
-    [[NSUserDefaults standardUserDefaults] registerDefaults: appDefaults];
+    [[NSUserDefaults standardUserDefaults] registerDefaults:
+        [NSDictionary dictionaryWithContentsOfFile:
+            [[NSBundle mainBundle] pathForResource: @"Defaults"
+                ofType: @"plist"]]];
 }
 
@@ -101 +79 @@
     //set download folder
     NSString * downloadChoice  = [fDefaults stringForKey: @"DownloadChoice"];
-    fDownloadFolder = [fDefaults stringForKey: @"DownloadFolder"];
+    fDownloadFolder = [[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath];
     [fDownloadFolder retain];
 
@@ -127 +105 @@
     if ([fDefaults integerForKey: @"UploadLimit"] < 0)
     {
-        [fDefaults setObject: DEFAULT_UPLOAD forKey: @"UploadLimit"];
-        [fDefaults setObject: @"NO" forKey: @"CheckUpload"];
+        [fDefaults setInteger: 20 forKey: @"UploadLimit"];
+        [fDefaults setBool: NO forKey: @"CheckUpload"];
     }
     
     //set upload limit
-    BOOL checkUpload = [[fDefaults stringForKey: @"CheckUpload"] isEqualToString:@"YES"];
+    BOOL checkUpload = [fDefaults boolForKey: @"CheckUpload"];
     int uploadLimit = [fDefaults integerForKey: @"UploadLimit"];
     
@@ -139 +117 @@
     [fUploadField setEnabled: checkUpload];
     
-    if (!checkUpload || uploadLimit == 0)
-        uploadLimit = -1;
-    tr_setUploadLimit( fHandle, uploadLimit );
+    tr_setUploadLimit( fHandle, checkUpload ? uploadLimit : -1 );
     
     //set remove and quit prompts
-    [fQuitCheck setState:([[fDefaults stringForKey: @"CheckQuit"]
-                isEqualToString:@"YES"] ? NSOnState : NSOffState)];
-    [fRemoveCheck setState:([[fDefaults stringForKey: @"CheckRemove"]
-                isEqualToString:@"YES"] ? NSOnState : NSOffState)];
+    [fQuitCheck setState: [fDefaults boolForKey: @"CheckQuit"] ?
+        NSOnState : NSOffState];
+    [fRemoveCheck setState: [fDefaults boolForKey: @"CheckRemove"] ?
+        NSOnState : NSOffState];
 }
 
@@ -214 +190 @@
     {
         tr_setBindPort( fHandle, bindPort );
-        [fDefaults setObject: [NSString stringWithFormat: @"%d", bindPort]
-                    forKey: @"BindPort"];
+        [fDefaults setInteger: bindPort forKey: @"BindPort"];
     }
 }
@@ -223 +198 @@
     BOOL checkUpload = [fUploadCheck state] == NSOnState;
 
-    [fDefaults setObject: checkUpload ? @"YES" : @"NO"
-                            forKey: @"CheckUpload"];
-    
-    [self setUploadLimit: sender];
+    [fDefaults setBool: checkUpload forKey: @"CheckUpload"];
+    
+    [self setUploadLimit: nil];
     [fUploadField setEnabled: checkUpload];
 }
@@ -245 +219 @@
     else
     {
-        [fDefaults setObject: [NSString stringWithFormat: @"%d", uploadLimit]
-            forKey: @"UploadLimit"];
+        [fDefaults setInteger: uploadLimit forKey: @"UploadLimit"];
     }
     
@@ -256 +229 @@
 - (void) setQuitMessage: (id) sender
 {
-    [fDefaults setObject: ([fQuitCheck state] == NSOnState ? @"YES" : @"NO")
-                forKey: @"CheckQuit"];
+    [fDefaults setBool: ( [fQuitCheck state] == NSOnState )
+        forKey: @"CheckQuit"];
 }
 
 - (void) setRemoveMessage: (id) sender
 {
-    [fDefaults setObject: ([fRemoveCheck state] == NSOnState ? @"YES" : @"NO")
-                forKey: @"CheckRemove"];
+    [fDefaults setBool: ( [fRemoveCheck state] == NSOnState )
+        forKey: @"CheckRemove"];
 }
 

trunk/macosx/Transmission.xcodeproj/project.pbxproj

@@ -29 +29 @@
                 4DE5CCBA0981D27700BE280E /* ResumeAll.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DE5CCB80981D27700BE280E /* ResumeAll.png */; };
                 4DE5CCBB0981D27700BE280E /* PauseAll.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DE5CCB90981D27700BE280E /* PauseAll.png */; };
+                4DE5CCCB0981D9BE00BE280E /* Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4DE5CCCA0981D9BE00BE280E /* Defaults.plist */; };
                 4DF0C5AB0899190500DD8943 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DF0C5A90899190500DD8943 /* Controller.m */; };
                 4DF0C5AE08991C1600DD8943 /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DF0C5AD08991C1600DD8943 /* libtransmission.a */; };
@@ -103 +104 @@
                 4DE5CCB80981D27700BE280E /* ResumeAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeAll.png; path = Images/ResumeAll.png; sourceTree = "<group>"; };
                 4DE5CCB90981D27700BE280E /* PauseAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseAll.png; path = Images/PauseAll.png; sourceTree = "<group>"; };
+                4DE5CCCA0981D9BE00BE280E /* Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Defaults.plist; sourceTree = "<group>"; };
                 4DF0C5A90899190500DD8943 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
                 4DF0C5AA0899190500DD8943 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
@@ -110 +112 @@
                 4DF7500908A103AD007B0D70 /* Remove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Remove.png; path = Images/Remove.png; sourceTree = "<group>"; };
                 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-                8D1107320486CEB800E47090 /* Transmission.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Transmission.app; sourceTree = BUILT_PRODUCTS_DIR; };
+                8D1107320486CEB800E47090 /* Transmission.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Transmission.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -217 +219 @@
                                 4DE5CCB80981D27700BE280E /* ResumeAll.png */,
                                 4DE5CCB90981D27700BE280E /* PauseAll.png */,
+                                4DE5CCCA0981D9BE00BE280E /* Defaults.plist */,
                                 8D1107310486CEB800E47090 /* Info.plist */,
                                 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
@@ -310 +313 @@
                                 4DE5CCBA0981D27700BE280E /* ResumeAll.png in Resources */,
                                 4DE5CCBB0981D27700BE280E /* PauseAll.png in Resources */,
+                                4DE5CCCB0981D9BE00BE280E /* Defaults.plist in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;