Changeset 5609

Timestamp:

Apr 14, 2008, 12:05:16 AM (14 years ago)

Author:

livings124

Message:

when unchecking all files in the add dialog window, don't do finished events

Location:

trunk/macosx

Files:

• Controller.h (modified) (2 diffs)
• Controller.m (modified) (3 diffs)

trunk/macosx/Controller.h

@@ -195 +195 @@
 - (void) torrentFinishedDownloading: (NSNotification *) notification;
 - (void) torrentRestartedDownloading: (NSNotification *) notification;
+- (void) torrentStoppedForRatio: (NSNotification *) notification;
 
 - (void) updateTorrentHistory;
@@ -228 +229 @@
 - (void) setQuickRatioGlobal: (id) sender;
 
-- (void) torrentStoppedForRatio: (NSNotification *) notification;
-
 - (void) changeAutoImport;
 - (void) checkAutoImportDirectory;

trunk/macosx/Controller.m

@@ -1594 +1594 @@
 }
 
+#warning migrate to Torrent.m
 - (void) torrentFinishedDownloading: (NSNotification *) notification
 {
     Torrent * torrent = [notification object];
     
-    if (!fSoundPlaying && [fDefaults boolForKey: @"PlayDownloadSound"])
+    if ([torrent isActive])
+    {
+        if (!fSoundPlaying && [fDefaults boolForKey: @"PlayDownloadSound"])
+        {
+            NSSound * sound;
+            if ((sound = [NSSound soundNamed: [fDefaults stringForKey: @"DownloadSound"]]))
+            {
+                [sound setDelegate: self];
+                fSoundPlaying = YES;
+                [sound play];
+            }
+        }
+        
+        NSDictionary * clickContext = [NSDictionary dictionaryWithObjectsAndKeys: GROWL_DOWNLOAD_COMPLETE, @"Type",
+                                        [torrent dataLocation] , @"Location", nil];
+        [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Download Complete", "Growl notification title")
+                                    description: [torrent name] notificationName: GROWL_DOWNLOAD_COMPLETE
+                                    iconData: nil priority: 0 isSticky: NO clickContext: clickContext];
+        
+        if (![fWindow isMainWindow])
+            [fBadger incrementCompleted];
+        
+        if ([fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: NO] <= 0)
+        {
+            [torrent stopTransfer];
+            [torrent setWaitToStart: YES];
+        }
+    }
+    
+    [self updateTorrentsInQueue];
+}
+
+- (void) torrentRestartedDownloading: (NSNotification *) notification
+{
+    Torrent * torrent = [notification object];
+    if ([torrent isActive])
+    {
+        if ([fDefaults boolForKey: @"Queue"] && [self numToStartFromQueue: YES] <= 0)
+        {
+            [torrent stopTransfer];
+            [torrent setWaitToStart: YES];
+        }
+    }
+    
+    [self updateTorrentsInQueue];
+}
+
+- (void) torrentStoppedForRatio: (NSNotification *) notification
+{
+    Torrent * torrent = [notification object];
+    
+    [self updateTorrentsInQueue];
+    [fInfoController updateInfoStats];
+    [fInfoController updateOptions];
+    
+    if (!fSoundPlaying && [fDefaults boolForKey: @"PlaySeedingSound"])
     {
         NSSound * sound;
-        if ((sound = [NSSound soundNamed: [fDefaults stringForKey: @"DownloadSound"]]))
+        if ((sound = [NSSound soundNamed: [fDefaults stringForKey: @"SeedingSound"]]))
         {
             [sound setDelegate: self];
@@ -1609 +1665 @@
     }
     
-    NSDictionary * clickContext = [NSDictionary dictionaryWithObjectsAndKeys: GROWL_DOWNLOAD_COMPLETE, @"Type",
-                                    [torrent dataLocation] , @"Location", nil];
-    [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Download Complete", "Growl notification title")
-                                description: [torrent name] notificationName: GROWL_DOWNLOAD_COMPLETE
-                                iconData: nil priority: 0 isSticky: NO clickContext: clickContext];
-    
-    if (![fWindow isMainWindow])
-        [fBadger incrementCompleted];
-    
-    if ([torrent isActive])
-    {
-        if ([fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: NO] <= 0)
-        {
-            [torrent stopTransfer];
-            [torrent setWaitToStart: YES];
-        }
-    }
-    
-    [self updateTorrentsInQueue];
-}
-
-- (void) torrentRestartedDownloading: (NSNotification *) notification
-{
-    Torrent * torrent = [notification object];
-    if ([torrent isActive])
-    {
-        if ([fDefaults boolForKey: @"Queue"] && [self numToStartFromQueue: YES] <= 0)
-        {
-            [torrent stopTransfer];
-            [torrent setWaitToStart: YES];
-        }
-    }
-    
-    [self updateTorrentsInQueue];
+    NSDictionary * clickContext = [NSDictionary dictionaryWithObjectsAndKeys: GROWL_SEEDING_COMPLETE, @"Type",
+                                    [torrent dataLocation], @"Location", nil];
+    [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Seeding Complete", "Growl notification title")
+                        description: [torrent name] notificationName: GROWL_SEEDING_COMPLETE
+                        iconData: nil priority: 0 isSticky: NO clickContext: clickContext];
 }
 
@@ -2342 +2369 @@
 }
 
-- (void) torrentStoppedForRatio: (NSNotification *) notification
-{
-    Torrent * torrent = [notification object];
-    
-    [self updateTorrentsInQueue];
-    [fInfoController updateInfoStats];
-    [fInfoController updateOptions];
-    
-    if (!fSoundPlaying && [fDefaults boolForKey: @"PlaySeedingSound"])
-    {
-        NSSound * sound;
-        if ((sound = [NSSound soundNamed: [fDefaults stringForKey: @"SeedingSound"]]))
-        {
-            [sound setDelegate: self];
-            fSoundPlaying = YES;
-            [sound play];
-        }
-    }
-    
-    NSDictionary * clickContext = [NSDictionary dictionaryWithObjectsAndKeys: GROWL_SEEDING_COMPLETE, @"Type",
-                                    [torrent dataLocation], @"Location", nil];
-    [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Seeding Complete", "Growl notification title")
-                        description: [torrent name] notificationName: GROWL_SEEDING_COMPLETE
-                        iconData: nil priority: 0 isSticky: NO clickContext: clickContext];
-}
-
 - (void) sound: (NSSound *) sound didFinishPlaying: (BOOL) finishedPlaying
 {