Changeset 4076

Timestamp:

Dec 6, 2007, 12:27:39 AM (14 years ago)

Author:

livings124

Message:

hopefully fix bug with entering values with commas in prefs, switch pref formatters to 10.4

Location:

trunk/macosx

Files:

• English.lproj/PrefsWindow.nib/info.nib (modified) (1 diff)
• English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• PrefsController.h (modified) (2 diffs)
• PrefsController.m (modified) (12 diffs)

trunk/macosx/English.lproj/PrefsWindow.nib/info.nib

@@ -10 +10 @@
         <integer>5</integer>
         <key>IBOpenObjects</key>
-        <array>
-                <integer>66</integer>
-        </array>
+        <array/>
         <key>IBSystem Version</key>
-        <string>9A581</string>
+        <string>9B18</string>
         <key>targetFramework</key>
         <string>IBCocoaFramework</string>

trunk/macosx/PrefsController.h

@@ -37 +37 @@
     IBOutlet NSView         * fGeneralView, * fTransfersView, * fBandwidthView, * fAdvancedView;
     
+    NSString * fInitialString;
+    
     IBOutlet NSPopUpButton  * fFolderPopUp, * fIncompleteFolderPopUp, * fImportFolderPopUp,
                             * fDownloadSoundPopUp, * fSeedingSoundPopUp;
@@ -50 +52 @@
     IBOutlet NSImageView            * fPortStatusImage;
     IBOutlet NSProgressIndicator    * fPortStatusProgress;
-    NSTimer                         * fNatStatusTimer;
+    NSTimer                         * fPortStatusTimer;
     int                             fPublicPort, fNatStatus;
 }

trunk/macosx/PrefsController.m

@@ -91 +91 @@
 - (void) dealloc
 {
-    if (fNatStatusTimer)
-        [fNatStatusTimer invalidate];
+    if (fPortStatusTimer)
+        [fPortStatusTimer invalidate];
     
     [super dealloc];
@@ -132 +132 @@
     
     //set port
-    #warning why no binding?
     [fPortField setIntValue: [fDefaults integerForKey: @"BindPort"]];
     fNatStatus = -1;
     
     [self updatePortStatus];
-    fNatStatusTimer = [NSTimer scheduledTimerWithTimeInterval: 5.0 target: self
+    fPortStatusTimer = [NSTimer scheduledTimerWithTimeInterval: 5.0 target: self
                         selector: @selector(updatePortStatus) userInfo: nil repeats: YES];
     
@@ -143 +142 @@
     [fQueueDownloadField setIntValue: [fDefaults integerForKey: @"QueueDownloadNumber"]];
     [fQueueSeedField setIntValue: [fDefaults integerForKey: @"QueueSeedNumber"]];
-    
-    //set stalled value
     [fStalledField setIntValue: [fDefaults integerForKey: @"StalledMinutes"]];
 }
@@ -211 +208 @@
 - (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
 {
-    return [NSArray arrayWithObjects: TOOLBAR_GENERAL, TOOLBAR_TRANSFERS,
-                                        TOOLBAR_BANDWIDTH, TOOLBAR_ADVANCED, nil];
+    return [NSArray arrayWithObjects: TOOLBAR_GENERAL, TOOLBAR_TRANSFERS, TOOLBAR_BANDWIDTH, TOOLBAR_ADVANCED, nil];
 }
 
@@ -218 +214 @@
 {
     int port = [sender intValue];
-    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", port]])
-    {
-        NSBeep();
-        [sender setIntValue: [fDefaults integerForKey: @"BindPort"]];
-        return;
-    }
-    
     [fDefaults setInteger: port forKey: @"BindPort"];
-    
     tr_setBindPort(fHandle, port);
     
@@ -362 +350 @@
 - (void) setRatioStop: (id) sender
 {
-    float ratio = [sender floatValue];
-    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%.2f", ratio]] || ratio < 0)
-    {
-        NSBeep();
-        [sender setFloatValue: [fDefaults floatForKey: @"RatioLimit"]];
-        return;
-    }
-    
-    [fDefaults setFloat: ratio forKey: @"RatioLimit"];
-    
+    [fDefaults setFloat: [sender floatValue] forKey: @"RatioLimit"];
     [self applyRatioSetting: nil];
 }
@@ -386 +365 @@
 - (void) setGlobalLimit: (id) sender
 {
-    BOOL upload = sender == fUploadField;
-    
-    int limit = [sender intValue];
-    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]] || limit < 0)
-    {
-        NSBeep();
-        [sender setIntValue: [fDefaults integerForKey: upload ? @"UploadLimit" : @"DownloadLimit"]];
-        return;
-    }
-    
-    [fDefaults setInteger: limit forKey: upload ? @"UploadLimit" : @"DownloadLimit"];
-    
+    [fDefaults setInteger: [sender intValue] forKey: sender == fUploadField ? @"UploadLimit" : @"DownloadLimit"];
     [self applySpeedSettings: self];
 }
@@ -403 +371 @@
 - (void) setSpeedLimit: (id) sender
 {
-    BOOL upload = sender == fSpeedLimitUploadField;
-    
-    int limit = [sender intValue];
-    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]])
-    {
-        NSBeep();
-        [sender setIntValue: [fDefaults integerForKey: upload ? @"SpeedLimitUploadLimit" : @"SpeedLimitDownloadLimit"]];
-        return;
-    }
-    
-    [fDefaults setInteger: limit forKey: upload ? @"SpeedLimitUploadLimit" : @"SpeedLimitDownloadLimit"];
-    
+    [fDefaults setInteger: [sender intValue] forKey: sender == fSpeedLimitUploadField
+                                                        ? @"SpeedLimitUploadLimit" : @"SpeedLimitDownloadLimit"];
     [self applySpeedSettings: self];
 }
@@ -421 +379 @@
 {
     [[NSNotificationCenter defaultCenter] postNotificationName: @"AutoSpeedLimitChange" object: self];
+}
+
+- (BOOL) control: (NSControl *) control textShouldBeginEditing: (NSText *) fieldEditor
+{
+    #warning release!
+    fInitialString = [[control stringValue] retain];
+}
+
+- (BOOL) control: (NSControl *) control didFailToFormatString: (NSString *) string errorDescription: (NSString *) error
+{
+    NSBeep();
+    if (fInitialString)
+        [control setStringValue: fInitialString];
+    return NO;
 }
 
@@ -430 +402 @@
 - (void) resetWarnings: (id) sender
 {
-    [fDefaults setBool: YES forKey: @"WarningDebug"];
     [fDefaults setBool: YES forKey: @"WarningDuplicate"];
     [fDefaults setBool: YES forKey: @"WarningRemainingSpace"];
@@ -450 +421 @@
 - (void) setQueueNumber: (id) sender
 {
-    BOOL download = sender == fQueueDownloadField;
-    
-    int limit = [sender intValue];
-    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]] || limit < 1)
-    {
-        NSBeep();
-        [sender setIntValue: [fDefaults integerForKey: download ? @"QueueDownloadNumber" : @"QueueSeedNumber"]];
-        return;
-    }
-    
-    [fDefaults setInteger: limit forKey: download ? @"QueueDownloadNumber" : @"QueueSeedNumber"];
+    [fDefaults setInteger: [sender intValue] forKey: sender == fQueueDownloadField ? @"QueueDownloadNumber" : @"QueueSeedNumber"];
     [self setQueue: nil];
 }
@@ -471 +432 @@
 - (void) setStalledMinutes: (id) sender
 {
-    int minutes = [sender intValue];
-    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", minutes]] || minutes < 1)
-    {
-        NSBeep();
-        [sender setIntValue: [fDefaults integerForKey: @"StalledMinutes"]];
-        return;
-    }
-    
-    [fDefaults setInteger: minutes forKey: @"StalledMinutes"];
+    [fDefaults setInteger: [sender intValue] forKey: @"StalledMinutes"];
     [self setStalled: nil];
 }