Changeset 497 for trunk/macosx/Controller.m

Timestamp:

Jul 1, 2006, 9:34:53 PM (16 years ago)

Author:

livings124

Message:

Auto-start check in the inspector now can be applied to multiple torrents.

File:

• trunk/macosx/Controller.m (modified) (5 diffs)

trunk/macosx/Controller.m

@@ -122 +122 @@
     NSView * contentView = [fWindow contentView];
     [contentView addSubview: fStatusBar];
-    [fStatusBar setFrameOrigin: NSMakePoint(0, [fScrollView frame].origin.y
-                                                + [fScrollView frame].size.height)];
+    [fStatusBar setFrameOrigin: NSMakePoint(0, [fScrollView frame].origin.y + [fScrollView frame].size.height)];
     [self showStatusBar: [fDefaults boolForKey: @"StatusBar"] animate: NO];
     
     //set speed limit
-    BOOL speedLimit = [fDefaults boolForKey: @"SpeedLimit"];
-    if (speedLimit)
-    {
-        [fSpeedLimitItem setState: speedLimit];
-        [fSpeedLimitDockItem setState: speedLimit];
+    if ([fDefaults boolForKey: @"SpeedLimit"])
+    {
+        [fSpeedLimitItem setState: NSOnState];
+        [fSpeedLimitDockItem setState: NSOnState];
         [fSpeedLimitButton setState: NSOnState];
     }
-    
+
     [fActionButton setToolTip: @"Shortcuts for changing global settings."];
     [fSpeedLimitButton setToolTip: @"Speed Limit overrides the total bandwidth limits with its own limits."];
@@ -241 +239 @@
     fTimer = [NSTimer scheduledTimerWithTimeInterval: 1.0 target: self
         selector: @selector( updateUI: ) userInfo: nil repeats: YES];
-    [[NSRunLoop currentRunLoop] addTimer: fTimer
-        forMode: NSModalPanelRunLoopMode];
-    [[NSRunLoop currentRunLoop] addTimer: fTimer
-        forMode: NSEventTrackingRunLoopMode];
+    [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSModalPanelRunLoopMode];
+    [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSEventTrackingRunLoopMode];
     
     [self sortTorrents];
     
-    //show windows
     [fWindow makeKeyAndOrderFront: nil];
 
@@ -1038 +1033 @@
 - (void) globalStartSettingChange: (NSNotification *) notification
 {
+    #warning redo
     NSString * startSetting = [fDefaults stringForKey: @"StartSetting"];
     
@@ -1078 +1074 @@
                 amountToStart = waitingCount;
             
-            //sort torrents by date to start earliest added
+            //sort torrents by order
             if (amountToStart < waitingCount)
             {
@@ -1106 +1102 @@
 - (void) torrentStartSettingChange: (NSNotification *) notification
 {
-    [self attemptToStartAuto: [notification object]];
+    //sort torrents by order value
+    NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey:
+                                                @"orderValue" ascending: YES] autorelease];
+    NSArray * descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
+                
+    NSArray * torrents = [[notification object] sortedArrayUsingDescriptors: descriptors];
+    [descriptors release];
+
+    //attempt to start all torrents
+    NSEnumerator * enumerator = [torrents objectEnumerator];
+    Torrent * torrent;
+
+    while ((torrent = [enumerator nextObject]))
+        [self attemptToStartAuto: torrent];
 
     [self updateUI: nil];