Changeset 554 for trunk/macosx/Controller.m

Timestamp:

Jul 8, 2006, 8:49:54 PM (16 years ago)

Author:

livings124

Message:

Have start and stop use actual torrents instead of indexes...this could be useful later.

File:

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

trunk/macosx/Controller.m

@@ -487 +487 @@
 }
 
-- (void) resumeTorrent: (id) sender
-{
-    [self resumeTorrentWithIndex: [fTableView selectedRowIndexes]];
+- (void) resumeSelectedTorrents: (id) sender
+{
+    [self resumeTorrents: [self torrentsAtIndexes: [fTableView selectedRowIndexes]]];
 }
 
 - (void) resumeAllTorrents: (id) sender
 {
-    [self resumeTorrentWithIndex: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrents count])]];
-}
-
-- (void) resumeTorrentWithIndex: (NSIndexSet *) indexSet
-{
-    unsigned int i;
-    for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        [[fTorrents objectAtIndex: i] startTransfer];
+    [self resumeTorrents: fTorrents];
+}
+
+- (void) resumeTorrents: (NSArray *) torrents;
+{
+    [torrents makeObjectsPerformSelector: @selector(startTransfer)];
     
     [self updateUI: nil];
@@ -508 +506 @@
 }
 
-- (void) stopTorrent: (id) sender
-{
-    [self stopTorrentWithIndex: [fTableView selectedRowIndexes]];
+- (void) stopSelectedTorrents: (id) sender
+{
+    [self stopTorrents: [self torrentsAtIndexes: [fTableView selectedRowIndexes]]];
 }
 
 - (void) stopAllTorrents: (id) sender
 {
-    [self stopTorrentWithIndex: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrents count])]];
-}
-
-- (void) stopTorrentWithIndex: (NSIndexSet *) indexSet
+    [self stopTorrents: fTorrents];
+}
+
+- (void) stopTorrents: (NSArray *) torrents;
 {
     //don't want any of these starting then stopping
-    unsigned int i;
+    NSEnumerator * enumerator = [torrents objectEnumerator];
     Torrent * torrent;
-    for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-    {
-        torrent = [fTorrents objectAtIndex: i];
+    while ((torrent = [enumerator nextObject]))
         [torrent setWaitToStart: NO];
-    }
-
-    for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        [[fTorrents objectAtIndex: i] stopTransfer];
+
+    [torrents makeObjectsPerformSelector: @selector(stopTransfer)];
     
     [self updateUI: nil];
@@ -1444 +1438 @@
         [item setImage: [NSImage imageNamed: @"PauseSelected.png"]];
         [item setTarget: self];
-        [item setAction: @selector(stopTorrent:)];
+        [item setAction: @selector(stopSelectedTorrents:)];
     }
     else if ([ident isEqualToString: TOOLBAR_RESUME_SELECTED])
@@ -1453 +1447 @@
         [item setImage: [NSImage imageNamed: @"ResumeSelected.png"]];
         [item setTarget: self];
-        [item setAction: @selector(resumeTorrent:)];
+        [item setAction: @selector(resumeSelectedTorrents:)];
     }
     else
@@ -1646 +1640 @@
 
     //enable pause item
-    if (action == @selector(stopTorrent:))
+    if (action == @selector(stopSelectedTorrents:))
     {
         if (!canUseMenu)
@@ -1665 +1659 @@
     
     //enable resume item
-    if (action == @selector(resumeTorrent:))
+    if (action == @selector(resumeSelectedTorrents:))
     {
         if (!canUseMenu)