Changeset 3862

Timestamp:

Nov 18, 2007, 12:09:37 AM (15 years ago)

Author:

livings124

Message:

add status field to peers table

Location:

trunk/macosx

Files:

• English.lproj/InfoWindow.nib/info.nib (modified) (1 diff)
• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.m (modified) (1 diff)
• Torrent.m (modified) (2 diffs)

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

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>935</integer>
+                <integer>1030</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/InfoWindowController.m

@@ -800 +800 @@
             return (rate = [peer objectForKey: @"DL From Rate"]) ? [NSString stringForSpeedAbbrev: [rate floatValue]] : @"";
         }
+        else if ([ident isEqualToString: @"Status"])
+            return [peer objectForKey: @"Status"];
         else
             return [peer objectForKey: @"IP"];

trunk/macosx/Torrent.m

@@ -809 +809 @@
         peer = &peers[i];
         
+        NSString * statusString;
+        switch (peer->status) 
+        { 
+            case TR_PEER_STATUS_HANDSHAKE:
+                statusString = NSLocalizedString(@"Handshaking", "peer -> status");
+                break; 
+            case TR_PEER_STATUS_PEER_IS_CHOKED:
+                statusString = NSLocalizedString(@"Peer is Choked", "peer -> status");
+                break; 
+            case TR_PEER_STATUS_CLIENT_IS_CHOKED:
+                statusString = NSLocalizedString(@"Choked", "peer -> status");
+                break; 
+            case TR_PEER_STATUS_CLIENT_IS_INTERESTED:
+                statusString = NSLocalizedString(@"Choked and Interested", "peer -> status");
+                break; 
+            case TR_PEER_STATUS_READY:
+                statusString = NSLocalizedString(@"Ready", "peer -> status");
+                break; 
+            case TR_PEER_STATUS_REQUEST_SENT:
+                statusString = NSLocalizedString(@"Request Sent", "peer -> status");
+                break; 
+            case TR_PEER_STATUS_ACTIVE:
+                statusString = NSLocalizedString(@"Active", "peer -> status");
+                break; 
+            default:
+                statusString = @""; 
+        } 
+        
         dic = [NSMutableDictionary dictionaryWithObjectsAndKeys:
             [NSNumber numberWithInt: peer->from], @"From",
@@ -815 +843 @@
             [NSNumber numberWithFloat: peer->progress], @"Progress",
             [NSNumber numberWithBool: peer->isEncrypted], @"Encryption",
-            [NSString stringWithCString: (char *)peer->client encoding: NSUTF8StringEncoding], @"Client", nil];
+            [NSString stringWithCString: (char *)peer->client encoding: NSUTF8StringEncoding], @"Client",
+            statusString, @"Status", nil];
         
         if (peer->isDownloading)