Changeset 729


Ignore:
Timestamp:
Aug 6, 2006, 8:40:12 PM (15 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r728 r729  
    14751475    //only allow reordering of rows if sorting by order with no filter
    14761476    if ([fSortType isEqualToString: @"Order"] && [fFilterType isEqualToString: @"None"]
    1477             && [[fSearchFilterField stringValue] isEqualToString: @""])
     1477            && [[fSearchFilterField stringValue] length] == 0)
    14781478    {
    14791479        [pasteboard declareTypes: [NSArray arrayWithObject: TORRENT_TABLE_VIEW_DATA_TYPE] owner: self];
  • trunk/macosx/Torrent.m

    r707 r729  
    257257        }
    258258        else
    259             [fShortStatusString setString: [NSString stringWithFormat: @"Ratio: %@, ",
    260                 [NSString stringForRatioWithDownload: [self downloadedTotal] upload: [self uploadedTotal]]]];
     259        {
     260            NSString * ratioString = [NSString stringForRatioWithDownload: [self downloadedTotal]
     261                                                upload: [self uploadedTotal]];
     262       
     263            [fShortStatusString setString: [NSString stringWithFormat: @"Ratio: %@, ", ratioString]];
     264            [fRemainingTimeString setString: [@"Ratio: " stringByAppendingString: ratioString]];
     265        }
    261266       
    262267        stringToAppend = [stringToAppend stringByAppendingString: [@"UL: " stringByAppendingString:
  • trunk/macosx/TorrentCell.m

    r695 r729  
    364364        float mainWidth = cellFrame.size.width - iconSize.width - 3.0 * PADDING - EXTRA_NAME_SHIFT;
    365365       
    366         NSString * realStatusString = !fStatusRegular && [fTorrent isActive] && [fTorrent progress] < 1.0
    367                                         ? [fTorrent remainingTimeString] : [fTorrent shortStatusString];
     366        NSString * realStatusString = !fStatusRegular && [fTorrent isActive] ? [fTorrent remainingTimeString]
     367                                                                            : [fTorrent shortStatusString];
    368368       
    369369        NSAttributedString * statusString = [[[NSAttributedString alloc] initWithString: realStatusString
  • trunk/macosx/TorrentTableView.m

    r699 r729  
    294294    Torrent * torrent = [fTorrents objectAtIndex: row];
    295295    NSString * statusString = ![fDefaults boolForKey: @"SmallStatusRegular"] && [torrent isActive]
    296                             && [torrent progress] < 1.0 ? [torrent remainingTimeString] : [torrent shortStatusString];
     296                                    ? [torrent remainingTimeString] : [torrent shortStatusString];
    297297   
    298298    float statusWidth = [statusString sizeWithAttributes: fSmallStatusAttributes].width + 3.0;
Note: See TracChangeset for help on using the changeset viewer.