Changeset 4935

Timestamp:

Feb 7, 2008, 1:26:12 AM (14 years ago)

Author:

livings124

Message:

initial saving of collapsed/expanded groups when switching filters, adding torrents, etc

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• TorrentTableView.h (modified) (2 diffs)
• TorrentTableView.m (modified) (6 diffs)

trunk/macosx/Controller.m

@@ -1913 +1913 @@
         
         NSMutableArray * groups = [NSMutableArray array], * groupTorrents;
-        int i, oldGroupValue = -2;
+        int oldGroupValue = -2;
         for (i = 0; i < [fDisplayedTorrents count]; i++)
         {
@@ -1937 +1937 @@
     [self sortTorrentsIgnoreSelected];
     [fTableView selectValues: selectedValues];
+    
+    //reset expanded/collapsed rows
+    if (groupRows && [fDisplayedTorrents count] > 0 && [NSApp isOnLeopardOrBetter])
+    {
+        NSIndexSet * collapsed = [fTableView collapsedGroupsIndexes];
+        enumerator = [fDisplayedTorrents objectEnumerator];
+        NSDictionary * dict;
+        while ((dict = [enumerator nextObject]))
+        {
+            int value = [[dict objectForKey: @"Group"] intValue];
+            if ([collapsed containsIndex: value >= 0 ? value : INT_MAX])
+                [fTableView collapseItem: dict];
+            else
+                [fTableView expandItem: dict];
+        }
+    }
     
     [self setBottomCountTextFiltering: groupRows || filterStatus || filterGroup || filterText];

trunk/macosx/TorrentTableView.h

@@ -34 +34 @@
 {
     IBOutlet Controller * fController;
-    NSIndexSet * fGroupIndexes;
+    NSMutableIndexSet * fCollapsedGroups;
     
     TorrentCell * fTorrentCell;
@@ -51 +51 @@
     NSTimer * fPiecesBarTimer;
 }
+
+- (NSIndexSet *) collapsedGroupsIndexes;
 
 - (void) removeButtonTrackingAreas;

trunk/macosx/TorrentTableView.m

@@ -62 +62 @@
             [[self tableColumnWithIdentifier: @"Torrent"] setDataCell: fTorrentCell];
         
+        fCollapsedGroups = [[NSMutableIndexSet alloc] init];
+        
         fMouseControlRow = -1;
         fMouseRevealRow = -1;
@@ -77 +79 @@
 - (void) dealloc
 {
+    [fCollapsedGroups release];
+    
     [fPiecesBarTimer invalidate];
     [fMenuTorrent release];
@@ -85 +89 @@
     
     [super dealloc];
+}
+
+- (NSIndexSet *) collapsedGroupsIndexes
+{
+    return fCollapsedGroups;
 }
 
@@ -248 +257 @@
 - (void) outlineViewItemDidExpand: (NSNotification *) notification
 {
+    int value = [[[[notification userInfo] objectForKey: @"NSObject"] objectForKey: @"Group"] intValue];
+    [fCollapsedGroups removeIndex: value >= 0 ? value : INT_MAX];
+    
     [[NSNotificationCenter defaultCenter] postNotificationName: @"OutlineExpandCollapse" object: self];
 }
@@ -253 +265 @@
 - (void) outlineViewItemDidCollapse: (NSNotification *) notification
 {
+    int value = [[[[notification userInfo] objectForKey: @"NSObject"] objectForKey: @"Group"] intValue];
+    [fCollapsedGroups addIndex: value >= 0 ? value : INT_MAX];
+    
     [[NSNotificationCenter defaultCenter] postNotificationName: @"OutlineExpandCollapse" object: self];
 }
@@ -323 +338 @@
                 id tableItem = [self itemAtRow: i];
                 if (![tableItem isKindOfClass: [Torrent class]] && [[tableItem objectForKey: @"Group"] intValue] == group)
+                {
                     [indexSet addIndex: i];
+                    break;
+                }
             }
         }