Changeset 5460

Timestamp:

Mar 31, 2008, 6:39:44 PM (14 years ago)

Author:

livings124

Message:

(1.1x) only show "selected" in the progress bar (and allow toggling) for multifile torrents

Location:

branches/1.1x

Files:

• NEWS (modified) (1 diff)
• macosx/Torrent.m (modified) (2 diffs)
• macosx/TorrentCell.m (modified) (2 diffs)
• macosx/TorrentTableView.m (modified) (1 diff)

branches/1.1x/NEWS

@@ -4 +4 @@
 - Mac
    + Fix visual glitch with the tracker inspector tab when there is no scrape address
+   + Only make progress status string clickable on multi-file torrents
 
 1.10 (2008/03/28)

branches/1.1x/macosx/Torrent.m

@@ -969 +969 @@
     if (![self allDownloaded])
     {
-        if ([fDefaults boolForKey: @"DisplayStatusProgressSelected"])
+        if ([self folder] && [fDefaults boolForKey: @"DisplayStatusProgressSelected"])
         {
             string = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@ selected (%.2f%%)", "Torrent -> progress string"),
@@ -982 +982 @@
     else if (![self isComplete])
     {
-        if ([fDefaults boolForKey: @"DisplayStatusProgressSelected"])
+        if ([self folder] && [fDefaults boolForKey: @"DisplayStatusProgressSelected"])
             string = [NSString stringWithFormat: NSLocalizedString(@"%@ selected, uploaded %@ (Ratio: %@)",
                 "Torrent -> progress string"), [NSString stringForFileSize: [self haveTotal]],

branches/1.1x/macosx/TorrentCell.m

@@ -259 +259 @@
     if (NSMouseInRect(point, [self controlButtonRectForBounds: cellFrame], [controlView isFlipped])
         || NSMouseInRect(point, [self revealButtonRectForBounds: cellFrame], [controlView isFlipped])
-        || NSMouseInRect(point, [self progressRectForBounds: cellFrame], [controlView isFlipped])
+        || (NSMouseInRect(point, [self progressRectForBounds: cellFrame], [controlView isFlipped]) && [[self representedObject] folder])
         || NSMouseInRect(point, [self minimalStatusRectForBounds: cellFrame], [controlView isFlipped]))
         return NSCellHitContentArea | NSCellHitTrackableArea;
@@ -286 +286 @@
     
     NSRect progressRect = [self progressRectForBounds: cellFrame];
-    BOOL checkProgress = NSMouseInRect(point, progressRect, [controlView isFlipped]);
+    BOOL checkProgress = NSMouseInRect(point, progressRect, [controlView isFlipped]) && [[self representedObject] folder];
     
     NSRect minimalStatusRect = [self minimalStatusRectForBounds: cellFrame];

branches/1.1x/macosx/TorrentTableView.m

@@ -776 +776 @@
 {
     int row = [self rowAtPoint: point];
-    if (row < 0 || ![[self itemAtRow: row] isKindOfClass: [Torrent class]] || [fDefaults boolForKey: @"SmallView"])
+    if (row < 0 || ![[self itemAtRow: row] isKindOfClass: [Torrent class]] || [fDefaults boolForKey: @"SmallView"]
+        || ![[self itemAtRow: row] folder])
         return NO;