Changeset 3946


Ignore:
Timestamp:
Nov 23, 2007, 4:03:49 PM (15 years ago)
Author:
livings124
Message:

sort by speed, then last activity

Location:
trunk/macosx
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r3945 r3946  
    16331633    else if ([sortType isEqualToString: SORT_ACTIVITY])
    16341634    {
     1635        NSSortDescriptor * rateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"totalRate" ascending: !asc]
     1636                                                    autorelease];
    16351637        NSSortDescriptor * activityDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"dateActivityOrAdd" ascending: !asc]
    16361638                                                    autorelease];
    16371639       
    1638         descriptors = [[NSArray alloc] initWithObjects: activityDescriptor, orderDescriptor, nil];
     1640        descriptors = [[NSArray alloc] initWithObjects: rateDescriptor, activityDescriptor, orderDescriptor, nil];
    16391641    }
    16401642    else
  • trunk/macosx/English.lproj/MainMenu.nib/info.nib

    r3920 r3946  
    1111        <key>IBOpenObjects</key>
    1212        <array>
    13                 <integer>2326</integer>
    14                 <integer>1895</integer>
     13                <integer>1639</integer>
    1514        </array>
    1615        <key>IBSystem Version</key>
  • trunk/macosx/PrefsWindow.m

    r3902 r3946  
    2525#import "PrefsWindow.h"
    2626
    27 #warning elliminate this class
    28 
    2927@implementation PrefsWindow
    3028
  • trunk/macosx/Torrent.h

    r3945 r3946  
    192192- (float) downloadRate;
    193193- (float) uploadRate;
     194- (float) totalRate;
    194195- (uint64_t) haveVerified;
    195196- (uint64_t) haveTotal;
  • trunk/macosx/Torrent.m

    r3945 r3946  
    11101110}
    11111111
     1112- (float) totalRate
     1113{
     1114    return [self downloadRate] + [self uploadRate];
     1115}
     1116
    11121117- (uint64_t) haveVerified
    11131118{
     
    14621467    fWaitToStart = waitToStart ? [waitToStart boolValue] : [fDefaults boolForKey: @"AutoStartDownload"];
    14631468   
    1464     [self setOrderValue: orderValue ? [orderValue intValue] : tr_torrentCount(fLib) - 1];
     1469    fOrderValue = orderValue ? [orderValue intValue] : tr_torrentCount(fLib) - 1;
    14651470    fError = NO;
    14661471   
Note: See TracChangeset for help on using the changeset viewer.