Changeset 729

Timestamp:

Aug 6, 2006, 8:40:12 PM (17 years ago)

Author:

livings124

Message:

Only show ratio, not upload speed, when seeding in minimal mode and set to display alternate status string.

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• Torrent.m (modified) (1 diff)
• TorrentCell.m (modified) (1 diff)
• TorrentTableView.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -1475 +1475 @@
     //only allow reordering of rows if sorting by order with no filter
     if ([fSortType isEqualToString: @"Order"] && [fFilterType isEqualToString: @"None"]
-            && [[fSearchFilterField stringValue] isEqualToString: @""])
+            && [[fSearchFilterField stringValue] length] == 0)
     {
         [pasteboard declareTypes: [NSArray arrayWithObject: TORRENT_TABLE_VIEW_DATA_TYPE] owner: self];

trunk/macosx/Torrent.m

@@ -257 +257 @@
         }
         else
-            [fShortStatusString setString: [NSString stringWithFormat: @"Ratio: %@, ",
-                [NSString stringForRatioWithDownload: [self downloadedTotal] upload: [self uploadedTotal]]]];
+        {
+            NSString * ratioString = [NSString stringForRatioWithDownload: [self downloadedTotal]
+                                                upload: [self uploadedTotal]];
+        
+            [fShortStatusString setString: [NSString stringWithFormat: @"Ratio: %@, ", ratioString]];
+            [fRemainingTimeString setString: [@"Ratio: " stringByAppendingString: ratioString]];
+        }
         
         stringToAppend = [stringToAppend stringByAppendingString: [@"UL: " stringByAppendingString:

trunk/macosx/TorrentCell.m

@@ -364 +364 @@
         float mainWidth = cellFrame.size.width - iconSize.width - 3.0 * PADDING - EXTRA_NAME_SHIFT;
         
-        NSString * realStatusString = !fStatusRegular && [fTorrent isActive] && [fTorrent progress] < 1.0
-                                        ? [fTorrent remainingTimeString] : [fTorrent shortStatusString];
+        NSString * realStatusString = !fStatusRegular && [fTorrent isActive] ? [fTorrent remainingTimeString]
+                                                                            : [fTorrent shortStatusString];
         
         NSAttributedString * statusString = [[[NSAttributedString alloc] initWithString: realStatusString

trunk/macosx/TorrentTableView.m

@@ -294 +294 @@
     Torrent * torrent = [fTorrents objectAtIndex: row];
     NSString * statusString = ![fDefaults boolForKey: @"SmallStatusRegular"] && [torrent isActive]
-                            && [torrent progress] < 1.0 ? [torrent remainingTimeString] : [torrent shortStatusString];
+                                    ? [torrent remainingTimeString] : [torrent shortStatusString];
     
     float statusWidth = [statusString sizeWithAttributes: fSmallStatusAttributes].width + 3.0;