Changeset 7246

Timestamp:

Dec 3, 2008, 12:18:18 AM (14 years ago)

Author:

livings124

Message:

show a checkmark in the peer inspector for partial seeds and reflect that status in the tooltip

Location:

trunk/macosx

Files:

• InfoWindowController.m (modified) (3 diffs)
• PeerProgressIndicatorCell.h (modified) (1 diff)
• PeerProgressIndicatorCell.m (modified) (2 diffs)
• Torrent.m (modified) (2 diffs)

trunk/macosx/InfoWindowController.m

@@ -29 +29 @@
 #import "FileOutlineController.h"
 #import "FileListNode.h"
+#import "PeerProgressIndicatorCell.h"
 #import "TrackerTableView.h"
 #import "PiecesView.h"
@@ -911 +912 @@
 }
 
+- (void) tableView: (NSTableView *) tableView willDisplayCell: (id) cell forTableColumn: (NSTableColumn *) tableColumn
+    row: (NSInteger) row
+{
+    if (tableView == fPeerTable)
+    {
+        NSString * ident = [tableColumn identifier];
+        
+        if  ([ident isEqualToString: @"Progress"])
+        {
+            NSDictionary * peer = [fPeers objectAtIndex: row];
+            [(PeerProgressIndicatorCell *)cell setSeed: [[peer objectForKey: @"Seed"] boolValue]];
+        }
+    }
+}
+
 - (void) tableView: (NSTableView *) tableView didClickTableColumn: (NSTableColumn *) tableColumn
 {
@@ -965 +981 @@
         NSMutableArray * components = [NSMutableArray arrayWithCapacity: 5];
         
-        [components addObject: [NSString localizedStringWithFormat: NSLocalizedString(@"Progress: %.1f%%",
-            "Inspector -> Peers tab -> table row tooltip"), [[peer objectForKey: @"Progress"] floatValue] * 100.0]];
+        CGFloat progress = [[peer objectForKey: @"Progress"] floatValue];
+        
+        NSString * seedStatus;
+        if (progress < 1.0 && [[peer objectForKey: @"Seed"] boolValue])
+            seedStatus = [NSString stringWithFormat: @" (%@)", NSLocalizedString(@"Partial Seed",
+                            "Inspector -> Peers tab -> table row tooltip")];
+        else
+            seedStatus = @"";
+        
+        [components addObject: [NSString localizedStringWithFormat: NSLocalizedString(@"Progress: %.1f%%%@",
+            "Inspector -> Peers tab -> table row tooltip"), progress * 100.0, seedStatus]];
         
         if ([[peer objectForKey: @"Encryption"] boolValue])

trunk/macosx/PeerProgressIndicatorCell.h

@@ -28 +28 @@
 {
     NSDictionary * fAttributes;
+    BOOL fSeed;
 }
 
+- (void) setSeed: (BOOL) seed;
+
 @end

trunk/macosx/PeerProgressIndicatorCell.m

@@ -41 +41 @@
 }
 
+- (void) setSeed: (BOOL) seed
+{
+    fSeed = seed;
+}
+
 - (void) drawWithFrame: (NSRect) cellFrame inView: (NSView *) controlView
 {
@@ -59 +64 @@
         
         [super drawWithFrame: cellFrame inView: controlView];
-        if ([self floatValue] >= 1.0f)
+        if (fSeed)
         {
             NSImage * checkImage = [NSImage imageNamed: @"CompleteCheck.png"];

trunk/macosx/Torrent.m

@@ -1039 +1039 @@
     {
         tr_peer_stat * peer = &peers[i];
-        NSMutableDictionary * dict = [NSMutableDictionary dictionaryWithCapacity: 9];
+        NSMutableDictionary * dict = [NSMutableDictionary dictionaryWithCapacity: 10];
         
         [dict setObject: [NSNumber numberWithInt: peer->from] forKey: @"From"];
@@ -1045 +1045 @@
         [dict setObject: [NSNumber numberWithInt: peer->port] forKey: @"Port"];
         [dict setObject: [NSNumber numberWithFloat: peer->progress] forKey: @"Progress"];
+        [dict setObject: [NSNumber numberWithBool: peer->isSeed] forKey: @"Seed"];
         [dict setObject: [NSNumber numberWithBool: peer->isEncrypted] forKey: @"Encryption"];
         [dict setObject: [NSString stringWithUTF8String: peer->client] forKey: @"Client"];