Changeset 13156

Timestamp:

Jan 12, 2012, 12:12:17 AM (11 years ago)

Author:

livings124

Message:

#4705 Removing a group in prefs doesn't remove the group row in the main window

Location:

trunk/macosx

Files:

• Controller.m (modified) (3 diffs)
• FilterBarController.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -500 +500 @@
     [nc addObserver: self selector: @selector(openCreatedFile:)
                     name: @"OpenCreatedTorrentFile" object: nil];
+    
+    [nc addObserver: self selector: @selector(applyFilter)
+                    name: @"UpdateGroups" object: nil];
 
     //timer to update the interface every second
@@ -2353 +2356 @@
         
         //remove empty groups
-        NSIndexSet * removeIndexes = [fDisplayedTorrents indexesOfObjectsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, originalGroupCount)] options: NSEnumerationConcurrent passingTest: ^BOOL(id obj, NSUInteger idx, BOOL * stop) {
+        NSIndexSet * removeGroupIndexes = [fDisplayedTorrents indexesOfObjectsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, originalGroupCount)] options: NSEnumerationConcurrent passingTest: ^BOOL(id obj, NSUInteger idx, BOOL * stop) {
             return [[(TorrentGroup *)obj torrents] count] == 0;
         }];
         
-        if ([removeIndexes count] > 0)
-        {
-            [fDisplayedTorrents removeObjectsAtIndexes: removeIndexes];
+        if ([removeGroupIndexes count] > 0)
+        {
+            [fDisplayedTorrents removeObjectsAtIndexes: removeGroupIndexes];
             if (onLion)
-                [fTableView removeItemsAtIndexes: removeIndexes inParent: nil withAnimation: NSTableViewAnimationEffectFade];
+                [fTableView removeItemsAtIndexes: removeGroupIndexes inParent: nil withAnimation: NSTableViewAnimationEffectFade];
         }
         
@@ -2370 +2373 @@
     else
     {
-        NSAssert(groupRows != wasGroupRows, @"Trying togglng-group torrent reordering when we weren't expecting to.");
+        NSAssert(groupRows != wasGroupRows, @"Trying toggling group-torrent reordering when we weren't expecting to.");
         
         //since we're not doing this the right way (boo buggy animation), we need to remember selected values

trunk/macosx/FilterBarController.m

@@ -393 +393 @@
 {
     [self updateGroupsButton];
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"ApplyFilter" object: nil];
 }