Changeset 10197

Timestamp:

Feb 14, 2010, 4:48:12 AM (13 years ago)

Author:

livings124

Message:

#2902 New tracker addition field obscured when trackers vertically fill inspector view

Location:

trunk

Files:

• libtransmission/announcer.c (modified) (1 diff)
• macosx/InfoWindowController.m (modified) (2 diffs)
• macosx/Torrent.h (modified) (1 diff)
• macosx/Torrent.m (modified) (3 diffs)
• macosx/en.lproj/Localizable.strings (modified) (1 diff)

trunk/libtransmission/announcer.c

@@ -1934 +1934 @@
             tr_strlcpy( st->host, tracker->host->name, sizeof( st->host ) );
             tr_strlcpy( st->announce, tracker->announce, sizeof( st->announce ) );
-            st->tier = i + 1;
+            st->tier = i;
             st->isBackup = tracker != tier->currentTracker;
             st->lastScrapeStartTime = tier->lastScrapeStartTime;

trunk/macosx/InfoWindowController.m

@@ -711 +711 @@
     if (tableView == fTrackerTable)
     {
-        if (![[fTrackers objectAtIndex: row] isKindOfClass: [TrackerNode class]] && [tableView editedRow] != row)
+        //check for NSDictionay instead of TrackerNode because of display issue when adding a row
+        if ([[fTrackers objectAtIndex: row] isKindOfClass: [NSDictionary class]])
             return TRACKER_GROUP_SEPARATOR_HEIGHT;
     }
@@ -1783 +1784 @@
     [[self window] makeKeyWindow];
     
-    [fTrackers addObject: NSLocalizedString(@"New Tier", "inspector -> add tracker")];
+    NSAssert1([fTorrents count] == 1, @"Attempting to add tracker with %d transfers selected", [fTorrents count]);
+    
+    Torrent * torrent = [fTorrents objectAtIndex: 0];
+    
+    [fTrackers addObject: [NSDictionary dictionaryWithObject: [NSNumber numberWithInteger: [torrent numberOfTrackerTiers]+1]
+                                        forKey: @"Tier"]];
     [fTrackers addObject: @""];
     

trunk/macosx/Torrent.h

@@ -131 +131 @@
 - (NSMutableArray *) allTrackerStats;
 - (NSArray *) allTrackersFlat; //used by GroupRules
+- (NSUInteger) numberOfTrackerTiers;
 - (BOOL) addTrackerToNewTier: (NSString *) tracker;
 - (void) removeTrackersWithIdentifiers: (NSIndexSet *) removeIdentifiers;

trunk/macosx/Torrent.m

@@ -594 +594 @@
     tr_tracker_stat * stats = tr_torrentTrackers(fHandle, &count);
     
-    NSMutableArray * trackers = [NSMutableArray arrayWithCapacity: (count > 0 ? count + stats[count-1].tier : 0)];
+    NSMutableArray * trackers = [NSMutableArray arrayWithCapacity: (count > 0 ? count + (stats[count-1].tier + 1) : 0)];
     
     int prevTier = -1;
@@ -601 +601 @@
         if (stats[i].tier != prevTier)
         {
-            [trackers addObject: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInteger: stats[i].tier], @"Tier",
+            [trackers addObject: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInteger: stats[i].tier + 1], @"Tier",
                                     [self name], @"Name", nil]];
             prevTier = stats[i].tier;
@@ -623 +623 @@
     
     return allTrackers;
+}
+
+- (NSUInteger) numberOfTrackerTiers
+{
+    if (fInfo->trackerCount == 0)
+        return 0;
+    
+    return fInfo->trackers[fInfo->trackerCount-1].tier + 1;
 }
 

trunk/macosx/en.lproj/Localizable.strings

@@ -529 +529 @@
 /* Prefs -> blocklist -> message */
 "Never" = "Never";
-
-/* inspector -> add tracker */
-"New Tier" = "New Tier";
 
 /* Tracker next announce */