Changeset 497 for trunk

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.

Location:

trunk/macosx

Files:

• Controller.m (modified) (5 diffs)
• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.m (modified) (2 diffs)
• MenuButton.m (modified) (2 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];

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

@@ -31 +31 @@
         <array>
                 <integer>29</integer>
-                <integer>581</integer>
                 <integer>21</integer>
         </array>

trunk/macosx/InfoWindowController.m

@@ -192 +192 @@
     
     //set wait to start
-    if (numberSelected == 1)
-    {
-        #warning make work for multiple torrents
-        Torrent * torrent = [fTorrents objectAtIndex: 0];
-        [fWaitToStartButton setState: [torrent waitingToStart]];
-
-        [fWaitToStartButton setEnabled: ![torrent isActive] && [torrent progress] < 1.0 &&
-            [[[NSUserDefaults standardUserDefaults] stringForKey: @"StartSetting"] isEqualToString: @"Wait"]];
-    }
-    else
-    {
-        [fWaitToStartButton setState: NSOffState];
-        [fWaitToStartButton setEnabled: NO];
-    }
-    
+    BOOL waiting = NO, notWaiting = NO, canEnableWaiting = numberSelected > 0,
+        waitingSettingOn = [[[NSUserDefaults standardUserDefaults] stringForKey: @"StartSetting"]
+                                isEqualToString: @"Wait"];
+    
+    enumerator = [fTorrents objectEnumerator];
+    while ((torrent = [enumerator nextObject]))
+    {
+        if ([torrent waitingToStart])
+            waiting = YES;
+        else
+            notWaiting = YES;
+        
+        if (canEnableWaiting && !(![torrent isActive] && [torrent progress] < 1.0 && waitingSettingOn))
+            canEnableWaiting = NO;
+    }
+    
+    [fWaitToStartButton setState: waiting && notWaiting ? NSMixedState : (waiting ? NSOnState : NSOffState)];
+    [fWaitToStartButton setEnabled: canEnableWaiting];
+
     //set ratio settings
     if (numberSelected > 0)
     {
-        NSEnumerator * enumerator = [fTorrents objectEnumerator];
-        Torrent * torrent = [enumerator nextObject]; //first torrent
+        enumerator = [fTorrents objectEnumerator];
+        torrent = [enumerator nextObject]; //first torrent
         const int INVALID = -99;
         int ratioSetting = [torrent stopRatioSetting];
@@ -471 +475 @@
 - (void) setWaitToStart: (id) sender
 {
-    #warning make work with multiples
-    Torrent * torrent = [fTorrents objectAtIndex: 0];
-    [torrent setWaitToStart: [sender state]];
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentStartSettingChange" object: torrent];
+    int state = [sender state];
+
+    NSEnumerator * enumerator = [fTorrents objectEnumerator];
+    Torrent * torrent;
+    while ((torrent = [enumerator nextObject]))
+        [torrent setWaitToStart: state];
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentStartSettingChange" object: fTorrents];
 }
 

trunk/macosx/MenuButton.m

@@ -32 +32 @@
     [self setImage: [self alternateImage]];
 
-    NSPoint location = NSMakePoint(3, -2);
-
-    NSEvent * theEvent= [NSEvent mouseEventWithType: [event type]
-                        location: location
+    NSEvent * newEvent= [NSEvent mouseEventWithType: [event type]
+                        location: NSMakePoint(3, -2)
                         modifierFlags: [event modifierFlags]
                         timestamp: [event timestamp]
@@ -44 +42 @@
                         pressure: [event pressure]];
 
-    [NSMenu popUpContextMenu: [self menu] withEvent: theEvent forView: self];
+    [NSMenu popUpContextMenu: [self menu] withEvent: newEvent forView: self];
 
     [self setImage: image];
 }
 
-- (NSMenu *) menuForEvent: (NSEvent *) e
+- (NSMenu *) menuForEvent: (NSEvent *) event
 {
     return nil;