Changeset 5460


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.1x/NEWS

    r5453 r5460  
    44- Mac
    55   + Fix visual glitch with the tracker inspector tab when there is no scrape address
     6   + Only make progress status string clickable on multi-file torrents
    67
    781.10 (2008/03/28)
  • branches/1.1x/macosx/Torrent.m

    r5453 r5460  
    969969    if (![self allDownloaded])
    970970    {
    971         if ([fDefaults boolForKey: @"DisplayStatusProgressSelected"])
     971        if ([self folder] && [fDefaults boolForKey: @"DisplayStatusProgressSelected"])
    972972        {
    973973            string = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@ selected (%.2f%%)", "Torrent -> progress string"),
     
    982982    else if (![self isComplete])
    983983    {
    984         if ([fDefaults boolForKey: @"DisplayStatusProgressSelected"])
     984        if ([self folder] && [fDefaults boolForKey: @"DisplayStatusProgressSelected"])
    985985            string = [NSString stringWithFormat: NSLocalizedString(@"%@ selected, uploaded %@ (Ratio: %@)",
    986986                "Torrent -> progress string"), [NSString stringForFileSize: [self haveTotal]],
  • branches/1.1x/macosx/TorrentCell.m

    r5072 r5460  
    259259    if (NSMouseInRect(point, [self controlButtonRectForBounds: cellFrame], [controlView isFlipped])
    260260        || NSMouseInRect(point, [self revealButtonRectForBounds: cellFrame], [controlView isFlipped])
    261         || NSMouseInRect(point, [self progressRectForBounds: cellFrame], [controlView isFlipped])
     261        || (NSMouseInRect(point, [self progressRectForBounds: cellFrame], [controlView isFlipped]) && [[self representedObject] folder])
    262262        || NSMouseInRect(point, [self minimalStatusRectForBounds: cellFrame], [controlView isFlipped]))
    263263        return NSCellHitContentArea | NSCellHitTrackableArea;
     
    286286   
    287287    NSRect progressRect = [self progressRectForBounds: cellFrame];
    288     BOOL checkProgress = NSMouseInRect(point, progressRect, [controlView isFlipped]);
     288    BOOL checkProgress = NSMouseInRect(point, progressRect, [controlView isFlipped]) && [[self representedObject] folder];
    289289   
    290290    NSRect minimalStatusRect = [self minimalStatusRectForBounds: cellFrame];
  • branches/1.1x/macosx/TorrentTableView.m

    r5282 r5460  
    776776{
    777777    int row = [self rowAtPoint: point];
    778     if (row < 0 || ![[self itemAtRow: row] isKindOfClass: [Torrent class]] || [fDefaults boolForKey: @"SmallView"])
     778    if (row < 0 || ![[self itemAtRow: row] isKindOfClass: [Torrent class]] || [fDefaults boolForKey: @"SmallView"]
     779        || ![[self itemAtRow: row] folder])
    779780        return NO;
    780781   
Note: See TracChangeset for help on using the changeset viewer.