Changeset 4256

Timestamp:

Dec 21, 2007, 5:56:34 AM (15 years ago)

Author:

livings124

Message:

add ability to set global number of connections

Location:

trunk/macosx

Files:

• Defaults.plist (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/classes.nib (modified) (2 diffs)
• 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) (5 diffs)

trunk/macosx/Defaults.plist

@@ -59 +59 @@
         <key>FilterBar</key>
         <false/>
-    <key>FilterGroup</key>
+        <key>FilterGroup</key>
         <integer>-2</integer>
         <key>FilterSearchType</key>
@@ -75 +75 @@
         <key>NatTraversal</key>
         <true/>
+        <key>PeersGlobals</key>
+        <integer>400</integer>
         <key>PiecesBar</key>
         <false/>

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

@@ -39 +39 @@
                                 <string>id</string>
                                 <key>setNat</key>
+                                <string>id</string>
+                                <key>setPeersGlobal</key>
                                 <string>id</string>
                                 <key>setPort</key>
@@ -85 +87 @@
                                 <key>fNatStatusImage</key>
                                 <string>NSImageView</string>
+                                <key>fPeersGlobalField</key>
+                                <string>NSTextField</string>
+                                <key>fPeersTorrentField</key>
+                                <string>NSTextField</string>
                                 <key>fPortField</key>
                                 <string>NSTextField</string>

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

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

trunk/macosx/PrefsController.h

@@ -48 +48 @@
                             * fSpeedLimitUploadField, * fSpeedLimitDownloadField;
     
+    IBOutlet NSTextField    * fPeersGlobalField, * fPeersTorrentField;
+    
     PortChecker                     * fPortChecker;
     IBOutlet NSTextField            * fPortField, * fPortStatusField;
@@ -67 +69 @@
 - (NSArray *) sounds;
 - (void) setSound: (id) sender;
+
+- (void) setPeersGlobal: (id) sender;
 
 - (void) setEncryptionMode: (id) sender;

trunk/macosx/PrefsController.m

@@ -79 +79 @@
         tr_natTraversalEnable(fHandle, [fDefaults boolForKey: @"NatTraversal"]);
         
+        //set peer connection values
+        tr_setGlobalPeerLimit(fHandle, [fDefaults integerForKey: @"PeersGlobal"]);
+        
         //set encryption
         [self setEncryptionMode: nil];
@@ -143 +146 @@
     fPortStatusTimer = [NSTimer scheduledTimerWithTimeInterval: 5.0 target: self
                         selector: @selector(updatePortStatus) userInfo: nil repeats: YES];
+    
+    //set peer connections
+    [fPeersGlobalField setIntValue: [fDefaults integerForKey: @"PeersGlobal"]];
     
     //set queue values
@@ -315 +321 @@
 }
 
+- (void) setPeersGlobal: (id) sender
+{
+    int count = [sender intValue];
+    [fDefaults setInteger: count forKey: @"PeersGlobal"];
+    tr_setGlobalPeerLimit(fHandle, count);
+}
+
 - (void) setEncryptionMode: (id) sender
 {
@@ -324 +337 @@
 {
     if ([fDefaults boolForKey: @"SpeedLimit"])
-    {NSLog(@"Speed Limit up: %d down: %d", [fDefaults integerForKey: @"SpeedLimitUploadLimit"], [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]);
+    {
         tr_setUseGlobalSpeedLimit(fHandle, TR_UP, 1);
         tr_setGlobalSpeedLimit(fHandle, TR_UP, [fDefaults integerForKey: @"SpeedLimitUploadLimit"]);
@@ -332 +345 @@
     }
     else
-    {NSLog(@"up (%d): %d down (%d): %d", [fDefaults boolForKey: @"CheckUpload"], [fDefaults integerForKey: @"UploadLimit"],
-                            [fDefaults boolForKey: @"CheckDownload"], [fDefaults integerForKey: @"DownloadLimit"]);
+    {
         tr_setUseGlobalSpeedLimit(fHandle, TR_UP, [fDefaults boolForKey: @"CheckUpload"]);
         tr_setGlobalSpeedLimit(fHandle, TR_UP, [fDefaults integerForKey: @"UploadLimit"]);