Changeset 10131

Timestamp:

Feb 7, 2010, 5:37:01 PM (12 years ago)

Author:

livings124

Message:

a couple more tweaks to displaying peers and webseeds

Location:

trunk/macosx

Files:

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

trunk/macosx/FileOutlineView.h

@@ -33 +33 @@
     NSGradient * fHighPriorityGradient, * fLowPriorityGradient, * fMixedPriorityGradient;
     
-    int fMouseRow;
+    NSInteger fMouseRow;
 }
 
@@ -41 +41 @@
 - (NSRect) iconRectForRow: (int) row;
 
-- (int) hoveredRow;
+- (NSInteger) hoveredRow;
 
 @end

trunk/macosx/FileOutlineView.m

@@ -106 +106 @@
 - (NSMenu *) menuForEvent: (NSEvent *) event
 {
-    int row = [self rowAtPoint: [self convertPoint: [event locationInWindow] fromView: nil]];
+    const NSInteger row = [self rowAtPoint: [self convertPoint: [event locationInWindow] fromView: nil]];
     
     if (row >= 0)
@@ -124 +124 @@
     NSRect iconRect = [cell imageRectForBounds: [self rectOfRow: row]];
     
-    iconRect.origin.x += [self indentationPerLevel] * (float)([self levelForRow: row] + 1);
+    iconRect.origin.x += [self indentationPerLevel] * (CGFloat)([self levelForRow: row] + 1);
     return iconRect;
 }
@@ -154 +154 @@
 }
 
-- (int) hoveredRow
+- (NSInteger) hoveredRow
 {
     return fMouseRow;
@@ -192 +192 @@
             
             NSSet * priorities = [fTorrent filePrioritiesForIndexes: indexes];
-            int count = [priorities count];
+            const NSUInteger count = [priorities count];
             if (count == 1)
             {

trunk/macosx/InfoWindowController.m

@@ -1566 +1566 @@
     for (Torrent * torrent in fTorrents)
     {
-        [fPeers addObjectsFromArray: [torrent peers]];
-        [fWebSeeds addObjectsFromArray: [torrent webSeeds]];
+        if ([torrent webSeedCount] > 0)
+            [fWebSeeds addObjectsFromArray: [torrent webSeeds]];
         
         known += [torrent totalPeersKnown];
@@ -1574 +1574 @@
         {
             anyActive = YES;
+            [fPeers addObjectsFromArray: [torrent peers]];
+            
             const NSUInteger connectedThis = [torrent totalPeersConnected];
             if (connectedThis > 0)
@@ -1650 +1652 @@
             activeString = NSLocalizedString(@"Transfers Not Active", "Inspector -> Peers tab -> peers");
         
-        NSString * connectedText = [NSString stringWithFormat: @"%@\n%@", activeString, knownString];
+        NSString * connectedText = [activeString stringByAppendingFormat: @"\n%@", knownString];
         [fConnectedPeersField setStringValue: connectedText];
     }

trunk/macosx/Torrent.m

@@ -893 +893 @@
     NSMutableArray * webSeeds = [NSMutableArray arrayWithCapacity: fInfo->webseedCount];
     
-    if (fInfo->webseedCount > 0)
-    {
-        float * dlSpeeds = tr_torrentWebSpeeds(fHandle);
-        
-        for (NSInteger i = 0; i < fInfo->webseedCount; i++)
-        {
-            NSMutableDictionary * dict = [NSMutableDictionary dictionaryWithCapacity: 3];
-            
-            [dict setObject: [self name] forKey: @"Name"];
-            [dict setObject: [NSString stringWithUTF8String: fInfo->webseeds[i]] forKey: @"Address"];
-            
-            if (dlSpeeds[i] != -1.0)
-                [dict setObject: [NSNumber numberWithFloat: dlSpeeds[i]] forKey: @"DL From Rate"];
-            
-            [webSeeds addObject: dict];
-        }
-        
-        tr_free(dlSpeeds);
-    }
+    float * dlSpeeds = tr_torrentWebSpeeds(fHandle);
+    
+    for (NSInteger i = 0; i < fInfo->webseedCount; i++)
+    {
+        NSMutableDictionary * dict = [NSMutableDictionary dictionaryWithCapacity: 3];
+        
+        [dict setObject: [self name] forKey: @"Name"];
+        [dict setObject: [NSString stringWithUTF8String: fInfo->webseeds[i]] forKey: @"Address"];
+        
+        if (dlSpeeds[i] != -1.0)
+            [dict setObject: [NSNumber numberWithFloat: dlSpeeds[i]] forKey: @"DL From Rate"];
+        
+        [webSeeds addObject: dict];
+    }
+    
+    tr_free(dlSpeeds);
     
     return webSeeds;