Changeset 145

Timestamp:

Mar 12, 2006, 2:32:04 AM (17 years ago)

Author:

titer

Message:

Fixed warning when quitting with active torrents.
Fixed menu and toolbar items.

File:

• branches/new_api/macosx/Controller.m (modified) (9 diffs)

branches/new_api/macosx/Controller.m

@@ -100 +100 @@
 
     [fTableView setAutosaveTableColumns: YES];
-    //[fTableView sizeToFit];
 
     [fTableView registerForDraggedTypes: [NSArray arrayWithObjects:
@@ -200 +199 @@
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
-    int active = fDownloading + fSeeding;
+    int active = 0;
+    Torrent * torrent;
+    NSEnumerator * enumerator = [fTorrents objectEnumerator];
+    while( ( torrent = [enumerator nextObject] ) )
+    {
+        if( [torrent isActive] )
+        {
+            active++;
+        }
+    }
+
     if (active > 0 && [fDefaults boolForKey: @"CheckQuit"])
     {
@@ -411 +420 @@
 - (void) resumeAllTorrents: (id) sender
 {
+    Torrent * torrent;
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
-    Torrent * torrent;
     while( ( torrent = [enumerator nextObject] ) )
     {
-        [torrent stop];
-    }
-}
-
-- (void) resumeTorrentWithIndex: (int) idx
-{
-    [[fTorrents objectAtIndex: idx] start];
+        [torrent start];
+    }
     [self updateUI: nil];
     [self updateTorrentHistory];
 }
 
+- (void) resumeTorrentWithIndex: (int) idx
+{
+    Torrent * torrent = [fTorrents objectAtIndex: idx];
+    [torrent start];
+    [self updateUI: nil];
+    [self updateTorrentHistory];
+}
+
 - (void) stopTorrent: (id) sender
 {
@@ -433 +445 @@
 - (void) stopAllTorrents: (id) sender
 {
+    Torrent * torrent;
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
-    Torrent * torrent;
     while( ( torrent = [enumerator nextObject] ) )
     {
-        [torrent start];
-    }
+        [torrent stop];
+    }
+    [self updateUI: nil];
+    [self updateTorrentHistory];
 }
 
@@ -832 +846 @@
         return [fTableView selectedRow] >= 0;
 
+    Torrent * torrent;
+    NSEnumerator * enumerator;
 
     //enable resume all item
     if (action == @selector(resumeAllTorrents:))
-        return fCount > fDownloading + fSeeding;
+    {
+        enumerator = [fTorrents objectEnumerator];
+        while( ( torrent = [enumerator nextObject] ) )
+            if( [torrent isPaused] )
+                return YES;
+        return NO;
+    }
 
     //enable pause all item
     if (action == @selector(stopAllTorrents:))
-        return fDownloading > 0 || fSeeding > 0;
+    {
+        enumerator = [fTorrents objectEnumerator];
+        while( ( torrent = [enumerator nextObject] ) )
+            if( [torrent isActive] )
+                return YES;
+        return NO;
+    }
 
     return YES;
@@ -846 +874 @@
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
 {
-#if 0
     SEL action = [menuItem action];
 
@@ -867 +894 @@
     }
 
+    Torrent * torrent;
+    NSEnumerator * enumerator;
+
     //enable resume all item
     if (action == @selector(resumeAllTorrents:))
-        return fCount > fDownloading + fSeeding;
+    {
+        enumerator = [fTorrents objectEnumerator];
+        while( ( torrent = [enumerator nextObject] ) )
+            if( [torrent isPaused] )
+                return YES;
+        return NO;
+    }
 
     //enable pause all item
     if (action == @selector(stopAllTorrents:))
-        return fDownloading > 0 || fSeeding > 0;
+    {
+        enumerator = [fTorrents objectEnumerator];
+        while( ( torrent = [enumerator nextObject] ) )
+            if( [torrent isActive] )
+                return YES;
+        return NO;
+    }
 
     int row = [fTableView selectedRow];
+    torrent = ( row < 0 ) ? nil : [fTorrents objectAtIndex: row];
+
+    if (action == @selector(revealFromMenu:))
+    {
+        return ( torrent != nil );
+    }
 
     //enable remove items
@@ -883 +931 @@
         || action == @selector(removeTorrentDeleteBoth:))
     {
+        if( !torrent )
+            return NO;
+
         //append or remove ellipsis when needed
-        if (row >= 0 && fStat[row].status & ( TR_STATUS_CHECK | TR_STATUS_DOWNLOAD)
-                    && [[fDefaults stringForKey: @"CheckRemove"] isEqualToString:@"YES"])
+        if( [torrent isActive] && [fDefaults boolForKey: @"CheckRemove"] )
         {
             if (![[menuItem title] hasSuffix:NS_ELLIPSIS])
@@ -895 +945 @@
                 [menuItem setTitle:[[menuItem title] substringToIndex:[[menuItem title] length]-[NS_ELLIPSIS length]]];
         }
-        return row >= 0;
-    }
-
-    //enable reveal in finder item
-    if (action == @selector(revealFromMenu:))
-        return row >= 0;
+        return YES;
+    }
 
     //enable and change pause / remove item
-    if (action == @selector(resumeTorrent:) || action == @selector(stopTorrent:))
-    {
-        if (row >= 0 && fStat[row].status & TR_STATUS_PAUSE)
+    if( action == @selector(resumeTorrent:) ||
+        action == @selector(stopTorrent:) )
+    {
+        if( !torrent )
+            return NO;
+
+        if( [torrent isActive] )
+        {
+            [menuItem setTitle: @"Pause"];
+            [menuItem setAction: @selector( stopTorrent: )];
+        }
+        else
         {
             [menuItem setTitle: @"Resume"];
             [menuItem setAction: @selector( resumeTorrent: )];
         }
-        else
-        {
-            [menuItem setTitle: @"Pause"];
-            [menuItem setAction: @selector( stopTorrent: )];
-        }
-        return row >= 0;
-    }
-#endif
+    }
+
     return YES;
 }