Changeset 1305

Timestamp:

Dec 31, 2006, 11:24:23 PM (15 years ago)

Author:

livings124

Message:

remove bindings from the rest of the text fields, added back glue code

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/classes.nib (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/info.nib (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• PrefsController.h (modified) (3 diffs)
• PrefsController.m (modified) (6 diffs)

trunk/macosx/Controller.m

@@ -1564 +1564 @@
     [fDefaults setBool: YES forKey: [sender menu] == fUploadMenu ? @"CheckUpload" : @"CheckDownload"];
     
+    [fPrefsController updateLimitFields];
     [fPrefsController applySpeedSettings: nil];
 }
@@ -1571 +1572 @@
     [fDefaults setBool: YES forKey: @"RatioCheck"];
     [fDefaults setFloat: [[sender title] floatValue] forKey: @"RatioLimit"];
+    
+    [fPrefsController updateRatioStopField];
 }
 

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

@@ -17 +17 @@
                 setBadge = id; 
                 setDownloadLocation = id; 
+                setGlobalLimit = id; 
                 setNat = id; 
                 setPort = id; 
                 setQueueNumber = id; 
+                setRatioStop = id; 
                 setSound = id; 
                 setSpeedLimit = id; 
@@ -45 +47 @@
                 fPortStatusImage = NSImageView; 
                 fPortStatusProgress = NSProgressIndicator; 
+                fQueueField = NSTextField; 
+                fRatioStopField = NSTextField; 
                 fSeedingSoundPopUp = NSPopUpButton; 
                 fSpeedLimitDownloadField = NSTextField; 

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

@@ -8 +8 @@
         <dict>
                 <key>153</key>
-                <string>290 411 571 335 0 0 1152 842 </string>
+                <string>191 408 571 335 0 0 1152 842 </string>
                 <key>28</key>
                 <string>290 434 571 290 0 0 1152 842 </string>
                 <key>41</key>
-                <string>290 426 571 305 0 0 1152 842 </string>
+                <string>151 440 571 305 0 0 1152 842 </string>
                 <key>66</key>
                 <string>290 507 571 144 0 0 1152 842 </string>
@@ -24 +24 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>153</integer>
+                <integer>41</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/PrefsController.h

@@ -33 +33 @@
     
     NSUserDefaults          * fDefaults;
+    BOOL                    hasLoaded;
     
     NSToolbar               * fToolbar;
@@ -39 +40 @@
     IBOutlet NSPopUpButton  * fFolderPopUp, * fIncompleteFolderPopUp, * fImportFolderPopUp,
                             * fDownloadSoundPopUp, * fSeedingSoundPopUp;
+    IBOutlet NSTextField    * fRatioStopField, * fQueueField;
     
     NSArray                 * fSounds;
@@ -77 +79 @@
 - (void) updateNatStatus;
 
+- (void) updateRatioStopField;
+- (void) setRatioStop: (id) sender;
+
 - (void) applySpeedSettings: (id) sender;
+
+- (void) updateLimitFields;
+- (void) setGlobalLimit: (id) sender;
 
 - (void) applyTorrentLimitSetting: (id) sender;

trunk/macosx/PrefsController.m

@@ -115 +115 @@
 - (void) awakeFromNib
 {
+    hasLoaded = YES;
+    
     fToolbar = [[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"];
     [fToolbar setDelegate: self];
@@ -134 +136 @@
         [fFolderPopUp selectItemAtIndex: DOWNLOAD_ASK];
     
+    //set stop ratio
+    [self updateRatioStopField];
+    
+    //set limits
+    [self updateLimitFields];
+    
     //set torrent limits
     [fUploadTorrentField setIntValue: [fDefaults integerForKey: @"UploadLimitTorrent"]];
@@ -151 +159 @@
     fNatStatusTimer = [NSTimer scheduledTimerWithTimeInterval: 5.0 target: self
                         selector: @selector(updateNatStatus) userInfo: nil repeats: YES];
-
+    
+    //set queue values
+    [fQueueField setIntValue: [fDefaults integerForKey: @"QueueDownloadNumber"]];
+    
     //set update check
     NSString * updateCheck = [fDefaults stringForKey: @"UpdateCheck"];
@@ -335 +346 @@
 }
 
+- (void) updateRatioStopField
+{
+    if (!hasLoaded)
+        return;
+    
+    [fRatioStopField setFloatValue: [fDefaults floatForKey: @"RatioLimit"]];
+}
+
+- (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"];
+}
+
+- (void) updateLimitFields
+{
+    if (!hasLoaded)
+        return;
+    
+    [fUploadField setIntValue: [fDefaults integerForKey: @"UploadLimit"]];
+    [fDownloadField setIntValue: [fDefaults integerForKey: @"DownloadLimit"]];
+}
+
+- (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"];
+    
+    [self applySpeedSettings: self];
+}
+
 - (void) applyTorrentLimitSetting: (id) sender
 {
@@ -345 +403 @@
     
     int limit = [sender intValue];
-    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]])
+    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]] || limit < 0)
     {
         NSBeep();
@@ -421 +479 @@
 - (void) setQueueNumber: (id) sender
 {
+    int limit = [sender intValue];
+    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]] || limit < 0)
+    {
+        NSBeep();
+        [sender setIntValue: [fDefaults integerForKey: @"QueueDownloadNumber"]];
+        return;
+    }
+    
+    [fDefaults setInteger: limit forKey: @"QueueDownloadNumber"];
+    
     [[NSNotificationCenter defaultCenter] postNotificationName: @"GlobalStartSettingChange" object: self];
 }