Changeset 3946

Timestamp:

Nov 23, 2007, 4:03:49 PM (15 years ago)

Author:

livings124

Message:

sort by speed, then last activity

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• PrefsWindow.m (modified) (1 diff)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -1633 +1633 @@
     else if ([sortType isEqualToString: SORT_ACTIVITY])
     {
+        NSSortDescriptor * rateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"totalRate" ascending: !asc]
+                                                    autorelease];
         NSSortDescriptor * activityDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"dateActivityOrAdd" ascending: !asc]
                                                     autorelease];
         
-        descriptors = [[NSArray alloc] initWithObjects: activityDescriptor, orderDescriptor, nil];
+        descriptors = [[NSArray alloc] initWithObjects: rateDescriptor, activityDescriptor, orderDescriptor, nil];
     }
     else

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>2326</integer>
-                <integer>1895</integer>
+                <integer>1639</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/PrefsWindow.m

@@ -25 +25 @@
 #import "PrefsWindow.h"
 
-#warning elliminate this class
-
 @implementation PrefsWindow
 

trunk/macosx/Torrent.h

@@ -192 +192 @@
 - (float) downloadRate;
 - (float) uploadRate;
+- (float) totalRate;
 - (uint64_t) haveVerified;
 - (uint64_t) haveTotal;

trunk/macosx/Torrent.m

@@ -1110 +1110 @@
 }
 
+- (float) totalRate
+{
+    return [self downloadRate] + [self uploadRate];
+}
+
 - (uint64_t) haveVerified
 {
@@ -1462 +1467 @@
     fWaitToStart = waitToStart ? [waitToStart boolValue] : [fDefaults boolForKey: @"AutoStartDownload"];
     
-    [self setOrderValue: orderValue ? [orderValue intValue] : tr_torrentCount(fLib) - 1];
+    fOrderValue = orderValue ? [orderValue intValue] : tr_torrentCount(fLib) - 1;
     fError = NO;