Changeset 1618

Timestamp:

Mar 31, 2007, 8:08:10 PM (16 years ago)

Author:

livings124

Message:

Add preference option to disable PEX in Mac frontend.

Location:

trunk/macosx

Files:

• English.lproj/InfoWindow.nib/classes.nib (modified) (2 diffs)
• English.lproj/InfoWindow.nib/info.nib (modified) (2 diffs)
• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.h (modified) (2 diffs)
• InfoWindowController.m (modified) (4 diffs)
• Torrent.h (modified) (2 diffs)
• Torrent.m (modified) (7 diffs)

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

@@ -9 +9 @@
                 revealTorrentFile = id; 
                 setLimitSetting = id; 
+                setPex = id; 
                 setRatioLimit = id; 
                 setRatioSetting = id; 
@@ -37 +38 @@
                 fNameField = NSTextField; 
                 fPeerTable = NSTableView; 
+                fPexCheck = NSButton; 
                 fPiecesField = NSTextField; 
                 fPiecesView = PiecesView; 

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

@@ -4 +4 @@
 <dict>
         <key>IBDocumentLocation</key>
-        <string>29 56 356 240 0 0 1024 746 </string>
+        <string>47 71 356 240 0 0 1440 878 </string>
         <key>IBEditorPositions</key>
         <dict>
@@ -25 +25 @@
         </array>
         <key>IBSystem Version</key>
-        <string>8L127</string>
+        <string>8P2137</string>
 </dict>
 </plist>

trunk/macosx/InfoWindowController.h

@@ -59 +59 @@
     IBOutlet NSTextField * fUploadLimitField, * fDownloadLimitField, * fRatioLimitField,
                         * fUploadLimitLabel, * fDownloadLimitLabel;
+        IBOutlet NSButton * fPexCheck;
 }
 
@@ -77 +78 @@
 - (void) setRatioLimit: (id) sender;
 
+- (void) setPex: (id) sender;
+
 @end

trunk/macosx/InfoWindowController.m

@@ -42 +42 @@
 #define TAB_PEERS_HEIGHT 279.0
 #define TAB_FILES_HEIGHT 279.0
-#define TAB_OPTIONS_HEIGHT 117.0
+#define TAB_OPTIONS_HEIGHT 156.0
 
 #define OPTION_POPUP_GLOBAL 0
@@ -509 +509 @@
         else
             [fRatioLimitField setStringValue: @""];
+                
+                //set pex check
+                enumerator = [fTorrents objectEnumerator];
+        torrent = [enumerator nextObject]; //first torrent
+                
+                BOOL pexEnabled = ![torrent privateTorrent];
+                int pexState = [torrent pex] ? NSOnState : NSOffState;
+                
+                while ((pexEnabled || pexState != NSMixedState)
+                && (torrent = [enumerator nextObject]))
+        {
+            if (pexEnabled)
+                pexEnabled = ![torrent privateTorrent];
+            
+            if (pexState != NSMixedState && pexState != ([torrent pex] ? NSOnState : NSOffState))
+                pexState = NSMixedState;
+        }
+                
+                [fPexCheck setEnabled: pexEnabled];
+                [fPexCheck setState: pexState];
     }
     else
@@ -528 +548 @@
         [fRatioLimitField setHidden: YES];
         [fRatioLimitField setStringValue: @""];
+                
+                [fPexCheck setEnabled: NO];
     }
     
@@ -943 +965 @@
 }
 
+- (void) setPex: (id) sender
+{
+        int state = [sender state];
+        if (state == NSMixedState)
+        {
+                state = NSOnState;
+                [sender setState: state];
+        }
+        
+        Torrent * torrent;
+    NSEnumerator * enumerator = [fTorrents objectEnumerator];
+        
+        while ((torrent = [enumerator nextObject]))
+                [torrent setPex: state == NSOnState];
+}
+
 @end

trunk/macosx/Torrent.h

@@ -43 +43 @@
     BOOL        fPublicTorrent;
     NSString    * fPublicTorrentLocation;
+        
+        BOOL fPex;
 
     NSUserDefaults * fDefaults;
@@ -180 +182 @@
 - (float)       swarmSpeed;
 
+- (BOOL) pex;
+- (void) setPex: (BOOL) set;
+
 - (NSNumber *) orderValue;
 - (void) setOrderValue: (int) orderValue;

trunk/macosx/Torrent.m

@@ -40 +40 @@
         checkUpload: (NSNumber *) checkUpload uploadLimit: (NSNumber *) uploadLimit
         checkDownload: (NSNumber *) checkDownload downloadLimit: (NSNumber *) downloadLimit
+                pex: (NSNumber *) pex
         waitToStart: (NSNumber *) waitToStart orderValue: (NSNumber *) orderValue;
 
@@ -74 +75 @@
             checkUpload: nil uploadLimit: nil
             checkDownload: nil downloadLimit: nil
+                        pex: nil
             waitToStart: nil orderValue: nil];
     
@@ -101 +103 @@
                 checkDownload: [history objectForKey: @"CheckDownload"]
                 downloadLimit: [history objectForKey: @"DownloadLimit"]
+                                pex: [history objectForKey: @"Pex"]
                 waitToStart: [history objectForKey: @"WaitToStart"]
                 orderValue: [history objectForKey: @"OrderValue"]];
@@ -171 +174 @@
     if (fPublicTorrent)
         [history setObject: [self publicTorrentLocation] forKey: @"TorrentPath"];
+        
+        if (![self privateTorrent])
+                [history setObject: [NSNumber numberWithBool: fPex] forKey: @"Pex"];
         
         if (fDateCompleted)
@@ -1087 +1093 @@
 }
 
+- (BOOL) pex
+{
+        return fPex;
+}
+
+- (void) setPex: (BOOL) pex
+{
+        if (![self privateTorrent])
+        {
+                fPex = pex;
+                tr_torrentDisablePex(fHandle, pex);
+        }
+}
+
 - (NSNumber *) orderValue
 {
@@ -1237 +1257 @@
         checkUpload: (NSNumber *) checkUpload uploadLimit: (NSNumber *) uploadLimit
         checkDownload: (NSNumber *) checkDownload downloadLimit: (NSNumber *) downloadLimit
+                pex: (NSNumber *) pex
         waitToStart: (NSNumber *) waitToStart orderValue: (NSNumber *) orderValue
 {
@@ -1281 +1302 @@
     fDownloadLimit = downloadLimit ? [downloadLimit intValue] : [fDefaults integerForKey: @"DownloadLimit"];
     [self updateSpeedSetting];
+        
+        if ([self privateTorrent])
+                fPex = NO;
+        else
+                fPex = pex ? [pex boolValue] : YES;
+        tr_torrentDisablePex(fHandle, !fPex);
     
     fWaitToStart = waitToStart ? [waitToStart boolValue] : [fDefaults boolForKey: @"AutoStartDownload"];