Changeset 714

Timestamp:

Aug 1, 2006, 11:09:33 PM (17 years ago)

Author:

livings124

Message:

New menu item to start all torrents waiting to start (in queue).

Location:

trunk/macosx

Files:

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

trunk/macosx/Controller.h

@@ -101 +101 @@
 - (void) resumeSelectedTorrents:    (id) sender;
 - (void) resumeAllTorrents:         (id) sender;
+- (void) resumeWaitingTorrents:     (id) sender;
 - (void) resumeTorrents:            (NSArray *) torrents;
+
 - (void) stopSelectedTorrents:      (id) sender;
 - (void) stopAllTorrents:           (id) sender;

trunk/macosx/Controller.m

@@ -552 +552 @@
 {
     [self resumeTorrents: fTorrents];
+}
+
+- (void) resumeWaitingTorrents: (id) sender
+{
+    NSMutableArray * torrents = [NSMutableArray arrayWithCapacity: [fTorrents count]];
+    
+    NSEnumerator * enumerator = [fTorrents objectEnumerator];
+    Torrent * torrent;
+    while ((torrent = [enumerator nextObject]))
+        if ([torrent waitingToStart])
+            [torrents addObject: torrent];
+    
+    [self resumeTorrents: torrents];
 }
 
@@ -1925 +1938 @@
     }
 
-    //enable resume all item
-    if (action == @selector(resumeAllTorrents:))
-    {
-        Torrent * torrent;
-        NSEnumerator * enumerator = [fTorrents objectEnumerator];
-        while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused])
-                return YES;
-        return NO;
-    }
-
-    //enable pause all item
-    if (action == @selector(stopAllTorrents:))
-    {
-        Torrent * torrent;
-        NSEnumerator * enumerator = [fTorrents objectEnumerator];
-        while ((torrent = [enumerator nextObject]))
-            if ([torrent isActive])
-                return YES;
-        return NO;
-    }
-
     //enable reveal in finder
     if (action == @selector(revealFile:))
@@ -1995 +1986 @@
     }
 
+    //enable pause all item
+    if (action == @selector(stopAllTorrents:))
+    {
+        Torrent * torrent;
+        NSEnumerator * enumerator = [fTorrents objectEnumerator];
+        while ((torrent = [enumerator nextObject]))
+            if ([torrent isActive])
+                return YES;
+        return NO;
+    }
+    
+    //enable resume all item
+    if (action == @selector(resumeAllTorrents:))
+    {
+        Torrent * torrent;
+        NSEnumerator * enumerator = [fTorrents objectEnumerator];
+        while ((torrent = [enumerator nextObject]))
+            if ([torrent isPaused])
+                return YES;
+        return NO;
+    }
+    
+    //enable resume waiting item
+    if (action == @selector(resumeWaitingTorrents:))
+    {
+        if (![[fDefaults stringForKey: @"StartSetting"] isEqualToString: @"Wait"])
+            return NO;
+    
+        Torrent * torrent;
+        NSEnumerator * enumerator = [fTorrents objectEnumerator];
+        while ((torrent = [enumerator nextObject]))
+            if ([torrent waitingToStart])
+                return YES;
+        return NO;
+    }
+
     //enable pause item
     if (action == @selector(stopSelectedTorrents:))

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

@@ -16 +16 @@
                 resumeAllTorrents = id; 
                 resumeSelectedTorrents = id; 
+                resumeWaitingTorrents = id; 
                 revealFile = id; 
                 setFilter = id; 

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

@@ -12 +12 @@
                 <string>366 546 420 63 0 0 1152 842 </string>
                 <key>1603</key>
-                <string>337 544 477 67 0 0 1152 842 </string>
+                <string>337 545 477 67 0 0 1152 842 </string>
                 <key>29</key>
-                <string>9 780 451 44 0 0 1152 842 </string>
+                <string>207 725 451 44 0 0 1152 842 </string>
                 <key>456</key>
                 <string>396 374 216 206 0 0 1152 842 </string>
@@ -33 +33 @@
         <array>
                 <integer>21</integer>
-                <integer>1603</integer>
+                <integer>29</integer>
         </array>
         <key>IBSystem Version</key>