Changeset 780 for trunk

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

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)
• libtransmission/transmission.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• macosx/InfoWindowController.h (modified) (1 diff)
• macosx/InfoWindowController.m (modified) (3 diffs)
• macosx/Torrent.m (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -256 +256 @@
                 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentCell.m; path = macosx/TorrentCell.m; sourceTree = "<group>"; };
                 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentCell.h; path = macosx/TorrentCell.h; sourceTree = "<group>"; };
-                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
+                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
                 4DDBB71B09E16BF100284745 /* transmissioncli.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = transmissioncli.c; path = cli/transmissioncli.c; sourceTree = "<group>"; };
                 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownloadBadge.png; path = macosx/Images/DownloadBadge.png; sourceTree = "<group>"; };

trunk/libtransmission/transmission.c

@@ -507 +507 @@
                            sizeof( peers[i].addr ) );
             }
+            
             peers[i].client = tr_clientForId(tr_peerId(peer));
+            
+            peers[i].isConnected = tr_peerIsConnected(peer);
             peers[i].isDownloading = tr_peerIsDownloading(peer);
             peers[i].isUploading = tr_peerIsUploading(peer);

trunk/libtransmission/transmission.h

@@ -329 +329 @@
     char *  client;
     
+    int     isConnected;
     int     isDownloading;
     int     isUploading;

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",