Changeset 761

Timestamp:

Aug 13, 2006, 3:46:02 PM (17 years ago)

Author:

livings124

Message:

Basic peer info in info window...more to come.

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (6 diffs)
• macosx/English.lproj/InfoWindow.nib/classes.nib (modified) (2 diffs)
• macosx/English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• macosx/FileTableView.h (modified) (1 diff)
• macosx/FileTableView.m (modified) (1 diff)
• macosx/InfoTableView.h (added)
• macosx/InfoTableView.m (added)
• macosx/InfoWindowController.h (modified) (2 diffs)
• macosx/InfoWindowController.m (modified) (9 diffs)
• macosx/Torrent.h (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -82 +82 @@
                 A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */; };
                 A21DFF100A292B2B007C5F76 /* Transfers.png in Resources */ = {isa = PBXBuildFile; fileRef = A21DFF0F0A292B2B007C5F76 /* Transfers.png */; };
+                A221DA890A8F7E7E0011E98E /* InfoTableView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A221DA870A8F7E7E0011E98E /* InfoTableView.h */; };
+                A221DA8A0A8F7E7E0011E98E /* InfoTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = A221DA880A8F7E7E0011E98E /* InfoTableView.m */; };
                 A2305A800A3DC9E400AB2D77 /* ProgressBarWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305A7C0A3DC9E400AB2D77 /* ProgressBarWhite.png */; };
                 A2305A810A3DC9E400AB2D77 /* ProgressBarBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305A7D0A3DC9E400AB2D77 /* ProgressBarBlue.png */; };
@@ -159 +161 @@
                                 A261F1E40A69A1B10002815A /* Growl.framework in CopyFiles */,
                                 A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */,
+                                A221DA890A8F7E7E0011E98E /* InfoTableView.h in CopyFiles */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -256 +259 @@
                 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>"; };
@@ -285 +288 @@
                 A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButtonPressed.png; path = macosx/Images/ActionButtonPressed.png; sourceTree = "<group>"; };
                 A21DFF0F0A292B2B007C5F76 /* Transfers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Transfers.png; path = macosx/Images/Transfers.png; sourceTree = "<group>"; };
+                A221DA870A8F7E7E0011E98E /* InfoTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = InfoTableView.h; path = macosx/InfoTableView.h; sourceTree = "<group>"; };
+                A221DA880A8F7E7E0011E98E /* InfoTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = InfoTableView.m; path = macosx/InfoTableView.m; sourceTree = "<group>"; };
                 A2305A7C0A3DC9E400AB2D77 /* ProgressBarWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarWhite.png; path = macosx/Images/ProgressBarWhite.png; sourceTree = "<group>"; };
                 A2305A7D0A3DC9E400AB2D77 /* ProgressBarBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarBlue.png; path = macosx/Images/ProgressBarBlue.png; sourceTree = "<group>"; };
@@ -399 +404 @@
                                 A2710E740A86796000CE4F7D /* PrefsWindow.h */,
                                 A2710E750A86796000CE4F7D /* PrefsWindow.m */,
+                                A221DA870A8F7E7E0011E98E /* InfoTableView.h */,
+                                A221DA880A8F7E7E0011E98E /* InfoTableView.m */,
                         );
                         name = Sources;
@@ -813 +820 @@
                                 A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */,
                                 A2710E770A86796000CE4F7D /* PrefsWindow.m in Sources */,
+                                A221DA8A0A8F7E7E0011E98E /* InfoTableView.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

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

@@ -5 +5 @@
             LANGUAGE = ObjC; 
             OUTLETS = {fContextMenu = NSMenu; }; 
-            SUPERCLASS = NSTableView; 
+            SUPERCLASS = InfoTableView; 
         }, 
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {CLASS = InfoTableView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, 
         {
             ACTIONS = {
@@ -30 +31 @@
                 fLeechersField = NSTextField; 
                 fNameField = NSTextField; 
+                fPeerTable = NSTableView; 
                 fPieceSizeField = NSTextField; 
                 fPiecesField = NSTextField; 

trunk/macosx/FileTableView.h

@@ -24 +24 @@
 
 #import <Cocoa/Cocoa.h>
+#import "InfoTableView.h"
 
-@interface FileTableView : NSTableView
+@interface FileTableView : InfoTableView
 {
     IBOutlet NSMenu * fContextMenu;

trunk/macosx/FileTableView.m

@@ -27 +27 @@
 @implementation FileTableView
 
-- (void) mouseDown: (NSEvent *) event
-{
-    [[self window] makeKeyWindow];
-    [super mouseDown: event];
-}
-
 - (NSMenu *) menuForEvent: (NSEvent *) e
 {

trunk/macosx/InfoWindowController.h

@@ -25 +25 @@
 #import <Cocoa/Cocoa.h>
 #import "Torrent.h"
+#import <transmission.h>
 
 @interface InfoWindowController : NSWindowController
 {
     NSArray * fTorrents;
-    NSMutableArray * fFiles;
+    NSMutableArray * fPeers, * fFiles;
     NSImage * fAppIcon;
     
@@ -46 +47 @@
                         * fConnectedPeersField, * fDownloadingFromField, * fUploadingToField;
 
-    IBOutlet NSTableView * fFileTable;
+    IBOutlet NSTableView * fPeerTable, * fFileTable;
     
     IBOutlet NSMatrix * fRatioMatrix;

trunk/macosx/InfoWindowController.m

@@ -35 +35 @@
 #define TAB_INFO_IDENT @"Info"
 #define TAB_ACTIVITY_IDENT @"Activity"
+#define TAB_PEERS_IDENT @"Peers"
 #define TAB_OPTIONS_IDENT @"Options"
 #define TAB_FILES_IDENT @"Files"
@@ -41 +42 @@
 #define TAB_INFO_HEIGHT 182.0
 #define TAB_ACTIVITY_HEIGHT 214.0
+#define TAB_PEERS_HEIGHT 250.0
 #define TAB_OPTIONS_HEIGHT 116.0
 #define TAB_FILES_HEIGHT 250.0
@@ -57 +59 @@
     
     fTorrents = [[NSArray alloc] init];
+    fPeers = [[NSMutableArray alloc] initWithCapacity: 6];
     fFiles = [[NSMutableArray alloc] initWithCapacity: 6];
     [fFileTable setDoubleAction: @selector(revealFile:)];
@@ -68 +71 @@
     [window setFrameUsingName: @"InspectorWindowFrame"];
     
+    //select tab
     NSString * identifier = [[NSUserDefaults standardUserDefaults] stringForKey: @"InfoTab"];
+    if ([fTabView indexOfTabViewItemWithIdentifier: identifier] == NSNotFound)
+        identifier = TAB_INFO_IDENT;
+    
     [fTabView selectTabViewItemWithIdentifier: identifier];
     [self setWindowForTab: identifier animate: NO];
@@ -78 +85 @@
 {
     [fTorrents release];
+    [fPeers release];
     [fFiles release];
 
@@ -253 +261 @@
         }
     }
+    
+    //set peers table
+    if (numberSelected == 1)
+    {
+        [fPeers setArray: [[fTorrents objectAtIndex: 0] peers]];
+        [fPeers sortUsingDescriptors: [fPeerTable sortDescriptors]];
+    }
+    else
+        [fPeers removeAllObjects];
+    
+    [fPeerTable deselectAll: nil];
+    [fPeerTable reloadData];
 }
 
@@ -365 +385 @@
     if ([identifier isEqualToString: TAB_ACTIVITY_IDENT])
         height = TAB_ACTIVITY_HEIGHT;
+    else if ([identifier isEqualToString: TAB_PEERS_IDENT])
+        height = TAB_PEERS_HEIGHT;
     else if ([identifier isEqualToString: TAB_OPTIONS_IDENT])
         height = TAB_OPTIONS_HEIGHT;
@@ -411 +433 @@
 - (int) numberOfRowsInTableView: (NSTableView *) tableView
 {
-    return [fFiles count];
-}
-
-- (id) tableView: (NSTableView *) tableView objectValueForTableColumn:
-                    (NSTableColumn *) column row: (int) row
-{
-    NSString * file = [fFiles objectAtIndex: row];
-    if ([[column identifier] isEqualToString: @"Icon"])
-        return [[NSWorkspace sharedWorkspace] iconForFileType: [file pathExtension]];
-    else
-        return [file lastPathComponent];
+    if (tableView == fPeerTable)
+        return [fTorrents count] == 1 ? [[fTorrents objectAtIndex: 0] totalPeers] : 0;
+    else if (tableView == fFileTable)
+        return [fFiles count];
+    else
+        return 0;
+}
+
+- (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) column row: (int) row
+{
+    NSString * ident = [column identifier];
+    if (tableView == fPeerTable)
+    {
+        NSDictionary * peer = [fPeers objectAtIndex: row];
+        
+        if ([ident isEqualToString: @"UL To"])
+            return [[peer objectForKey: @"UL To"] boolValue] ? @"Y" : @"";
+        else if ([ident isEqualToString: @"DL From"])
+            return [[peer objectForKey: @"DL From"] boolValue] ? @"Y" : @"";
+        else
+            return [peer objectForKey: @"Client"];
+    }
+    else
+    {
+        NSString * file = [fFiles objectAtIndex: row];
+        if ([ident isEqualToString: @"Icon"])
+            return [[NSWorkspace sharedWorkspace] iconForFileType: [file pathExtension]];
+        else
+            return [file lastPathComponent];
+    }
+}
+
+- (void) tableView: (NSTableView *) tableView didClickTableColumn: (NSTableColumn *) tableColumn
+{
+    if (tableView == fPeerTable)
+    {
+        [fPeers sortUsingDescriptors: [tableView sortDescriptors]];
+        [tableView reloadData];
+    }
 }
 
@@ -429 +479 @@
         row: (int) row mouseLocation: (NSPoint) mouseLocation
 {
-    return [fFiles objectAtIndex: row];
+    return tableView == fFileTable ? [fFiles objectAtIndex: row] : nil;
 }
 

trunk/macosx/Torrent.h

@@ -115 +115 @@
 - (BOOL)    justFinished;
 
+- (NSArray *) peers;
+
 - (NSString *) progressString;
 - (NSString *) statusString;

trunk/macosx/Torrent.m

@@ -516 +516 @@
 }
 
+- (NSArray *) peers
+{
+    tr_peer_t * peer;
+    int totalPeers = [self totalPeers], i;
+    
+    NSMutableArray * peers = [NSMutableArray arrayWithCapacity: totalPeers];
+    for (i = 0; i < totalPeers; i++)
+    {
+        peer = tr_getPeer(fHandle, i);
+        [peers addObject: [NSDictionary dictionaryWithObjectsAndKeys:
+            [NSString stringWithCString: (char *) tr_clientForId(tr_peerId(peer)) encoding: NSUTF8StringEncoding],
+                @"Client",
+            [NSNumber numberWithBool: tr_peerIsDownloading(peer)], @"UL To",
+            [NSNumber numberWithBool: tr_peerIsUploading(peer)], @"DL From", nil]];
+    }
+    
+    return peers;
+}
+
 - (NSString *) progressString
 {