Changeset 780 for trunk/macosx

Timestamp:

Aug 15, 2006, 12:59:44 AM (16 years ago)

Author:

livings124

Message:

Check for connected peers, as well as better peer table resizing behavior.

Location:

trunk/macosx

Files:

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

trunk/macosx/InfoWindowController.h

@@ -31 +31 @@
     NSArray * fTorrents;
     NSMutableArray * fPeers, * fFiles;
-    NSImage * fAppIcon;
+    NSImage * fAppIcon, * fCheckImage;
     
     IBOutlet NSTabView * fTabView;

trunk/macosx/InfoWindowController.m

@@ -57 +57 @@
 {
     fAppIcon = [[NSApp applicationIconImage] copy];
+    fCheckImage = [NSImage imageNamed: @"NSMenuCheckmark"];
     
     fTorrents = [[NSArray alloc] init];
@@ -434 +435 @@
 {
     if (tableView == fPeerTable)
-        return [fTorrents count] == 1 ? [[fTorrents objectAtIndex: 0] totalPeers] : 0;
+        return [fPeers count];
     else if (tableView == fFileTable)
         return [fFiles count];
@@ -448 +449 @@
         NSDictionary * peer = [fPeers objectAtIndex: row];
         
-        if ([ident isEqualToString: @"UL To"])
+        if ([ident isEqualToString: @"Connected"])
+            return [[peer objectForKey: @"Connected"] boolValue] ? fCheckImage : nil;
+        else if ([ident isEqualToString: @"UL To"])
             return [[peer objectForKey: @"UL To"] boolValue] ? @"Y" : @"";
         else if ([ident isEqualToString: @"DL From"])

trunk/macosx/Torrent.m

@@ -529 +529 @@
         
         [peerDics addObject: [NSDictionary dictionaryWithObjectsAndKeys:
+            [NSNumber numberWithBool: peer.isConnected], @"Connected",
             [NSString stringWithCString: (char *) peer.addr encoding: NSUTF8StringEncoding], @"IP",
             [NSString stringWithCString: (char *) peer.client encoding: NSUTF8StringEncoding], @"Client",