Began the transition to a HSOutline based result outline. There's still a lot of glitches, the most glaring one being the lack of support for multiple selection.

2026-01-22 14:41:39 +00:00 · 2010-02-11 17:52:18 +01:00
parent 87351b5920
commit 42559f13d8
14 changed files with 340 additions and 217 deletions
--- a/cocoa/base/PyDupeGuru.h
+++ b/cocoa/base/PyDupeGuru.h
@@ -36,7 +36,6 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)addSelectedToIgnoreList;
 - (void)removeSelected;
 - (void)openSelected;
- (NSNumber *)renameSelected:(NSString *)aNewName;
 - (void)revealSelected;
 - (void)makeSelectedReference;
 - (void)applyFilter:(NSString *)filter;
--- a/cocoa/base/PyResultTree.h
+++ b/cocoa/base/PyResultTree.h
@@ -0,0 +1,19 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import <Cocoa/Cocoa.h>
+#import "PyOutline.h"
+
+@interface PyResultTree : PyOutline
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
+
+- (NSString *)valueForPath:(NSArray *)aPath column:(NSInteger)aColumn;
+- (BOOL)renameSelected:(NSString *)aNewName;
+- (void)sortBy:(NSInteger)aIdentifier ascending:(BOOL)aAscending;
+- (void)markSelected;
+@end
--- a/cocoa/base/ResultOutline.h
+++ b/cocoa/base/ResultOutline.h
@@ -0,0 +1,21 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import <Cocoa/Cocoa.h>
+#import "HSOutline.h"
+#import "PyResultTree.h"
+
+@interface ResultOutline : HSOutline
+{
+    NSMutableIndexSet *_deltaColumns;
+}
+- (PyResultTree *)py;
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
+
+- (IBAction)markSelected:(id)sender;
+@end;
--- a/cocoa/base/ResultOutline.m
+++ b/cocoa/base/ResultOutline.m
@@ -0,0 +1,107 @@
+/* 
+Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+
+This software is licensed under the "HS" License as described in the "LICENSE" file, 
+which should be included with this package. The terms are also available at 
+http://www.hardcoded.net/licenses/hs_license
+*/
+
+#import "ResultOutline.h"
+#import "Dialogs.h"
+#import "Utils.h"
+#import "Consts.h"
+
+@implementation ResultOutline
+- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView
+{
+    self = [super initWithPyClassName:@"PyResultOutline" pyParent:aPyParent view:aOutlineView];
+    return self;
+}
+
+- (PyResultTree *)py
+{
+    return (PyResultTree *)py;
+}
+
+/* Override */
+- (void)refresh
+{
+    [super refresh];
+    [outlineView expandItem:nil expandChildren:YES];
+}
+
+/* Public */
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode
+{
+    [[self py] setPowerMarkerMode:aPowerMarkerMode];
+}
+
+- (IBAction)markSelected:(id)sender
+{
+    [[self py] markSelected];
+}
+
+/* Datasource */
+- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)column byItem:(id)item
+{
+    NSIndexPath *path = item;
+    NSString *identifier = [column identifier];
+    if ([identifier isEqual:@"mark"]) {
+        return b2n([self boolProperty:@"marked" valueAtPath:path]);
+    }
+    NSInteger columnId = [identifier integerValue];
+    return [[self py] valueForPath:p2a(path) column:columnId];
+}
+
+- (void)outlineView:(NSOutlineView *)aOutlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
+{
+    if (![[tableColumn identifier] isEqual:@"0"])
+        return; //We only want to cover renames.
+    NSIndexPath *path = item;
+    NSString *oldName = [[self py] valueForPath:p2a(path) column:0];
+    NSString *newName = object;
+    if (![newName isEqual:oldName]) {
+        BOOL renamed = [[self py] renameSelected:newName];
+        if (renamed) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+        }
+        else {
+            [Dialogs showMessage:[NSString stringWithFormat:@"The name '%@' already exists.", newName]];
+        }
+    }
+}
+
+/* Delegate */
+- (void)outlineView:(NSOutlineView *)aOutlineView didClickTableColumn:(NSTableColumn *)tableColumn
+{
+    if ([[outlineView sortDescriptors] count] < 1)
+        return;
+    NSSortDescriptor *sd = [[outlineView sortDescriptors] objectAtIndex:0];
+    [[self py] sortBy:[[sd key] integerValue] ascending:[sd ascending]];
+}
+
+- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{ 
+    NSIndexPath *path = item;
+    BOOL isMarkable = [self boolProperty:@"markable" valueAtPath:path];
+    if ([[tableColumn identifier] isEqual:@"mark"]) {
+        [cell setEnabled:isMarkable];
+    }
+    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
+        // Determine if the text color will be blue due to directory being reference.
+        NSTextFieldCell *textCell = cell;
+        if (isMarkable) {
+            [textCell setTextColor:[NSColor blackColor]];
+        }
+        else {
+            [textCell setTextColor:[NSColor blueColor]];
+        }
+        // if ((_displayDelta) && (_powerMode || ([node level] > 1))) {
+        //     NSInteger i = [[tableColumn identifier] integerValue];
+        //     if ([_deltaColumns containsIndex:i]) {
+        //         [textCell setTextColor:[NSColor orangeColor]];
+        //     }
+        // }
+    }
+}
+@end
--- a/cocoa/base/ResultWindow.h
+++ b/cocoa/base/ResultWindow.h
@@ -7,10 +7,11 @@ http://www.hardcoded.net/licenses/hs_license
 */

 #import <Cocoa/Cocoa.h>
-#import "Outline.h"
+#import "HSOutlineView.h"
+#import "ResultOutline.h"
 #import "PyDupeGuru.h"

-@interface MatchesView : OutlineView
+@interface MatchesView : HSOutlineView
 - (void)keyDown:(NSEvent *)theEvent;
@end

@@ -31,16 +32,15 @@ http://www.hardcoded.net/licenses/hs_license
    NSMutableArray *_resultColumns;
    NSMutableIndexSet *_deltaColumns;
    NSWindowController *preferencesPanel;
+    ResultOutline *outline;
 }
 /* Helpers */
 - (void)fillColumnsMenu;
 - (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn;
 - (NSArray *)getColumnsOrder;
 - (NSDictionary *)getColumnsWidth;
- (NSArray *)getSelected:(BOOL)aDupesOnly;
 - (NSArray *)getSelectedPaths:(BOOL)aDupesOnly;
 - (void)initResultColumns;
- (void)updatePySelection;
 - (void)performPySelection:(NSArray *)aIndexPaths;
 - (void)refreshStats;
 - (void)reloadMatches;
--- a/cocoa/base/ResultWindow.m
+++ b/cocoa/base/ResultWindow.m
@@ -28,23 +28,6 @@ http://www.hardcoded.net/licenses/hs_license
    else
        [super keyDown:theEvent];
 }
-
- (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
-{
-    if (![[tableColumn identifier] isEqual:@"0"])
-        return; //We only want to cover renames.
-    OVNode *node = item;
-    NSString *oldName = [[node buffer] objectAtIndex:0];
-    NSString *newName = object;
-    if (![newName isEqual:oldName])
-    {
-        BOOL renamed = n2b([(PyDupeGuruBase *)py renameSelected:newName]);
-        if (renamed)
-            [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
-        else
-            [Dialogs showMessage:[NSString stringWithFormat:@"The name '%@' already exists.",newName]];
-    }
-}
@end

@implementation ResultWindowBase
@@ -54,6 +37,7 @@ http://www.hardcoded.net/licenses/hs_license
    _powerMode = NO;
    [self window];
    preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
+    outline = [[ResultOutline alloc] initWithPyParent:py view:matches];
    [self initResultColumns];
    [self fillColumnsMenu];
    [deltaSwitch setSelectedSegment:0];
@@ -69,11 +53,11 @@ http://www.hardcoded.net/licenses/hs_license
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobInProgress:) name:JobInProgress object:nil];
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsChanged:) name:ResultsChangedNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsUpdated:) name:ResultsUpdatedNotification object:nil];
 }

 - (void)dealloc
 {
+    [outline release];
    [preferencesPanel release];
    [super dealloc];
 }
@@ -130,34 +114,22 @@ http://www.hardcoded.net/licenses/hs_license
    return result;
 }

- (NSArray *)getSelected:(BOOL)aDupesOnly
+- (NSArray *)getSelectedPaths:(BOOL)aDupesOnly
 {
    if (_powerMode)
        aDupesOnly = NO;
    NSIndexSet *indexes = [matches selectedRowIndexes];
    NSMutableArray *nodeList = [NSMutableArray array];
-    OVNode *node;
    NSInteger i = [indexes firstIndex];
-    while (i != NSNotFound)
-    {
-        node = [matches itemAtRow:i];
-        if (!aDupesOnly || ([node level] > 1))
-            [nodeList addObject:node];
+    while (i != NSNotFound) {
+        NSIndexPath *path = [matches itemAtRow:i];
+        if (!aDupesOnly || ([path length] > 1))
+            [nodeList addObject:p2a(path)];
        i = [indexes indexGreaterThanIndex:i];
    }
    return nodeList;
 }

- (NSArray *)getSelectedPaths:(BOOL)aDupesOnly
-{
-    NSMutableArray *r = [NSMutableArray array];
-    NSArray *selected = [self getSelected:aDupesOnly];
-    for (OVNode *node in selected) {
-        [r addObject:p2a([node indexPath])];
-    }
-    return r;
-}
-
 - (void)initResultColumns
 {
    // Virtual
@@ -185,17 +157,17 @@ http://www.hardcoded.net/licenses/hs_license
    }
 }

- (void)updatePySelection
-{
-    NSArray *selection;
-    if (_powerMode) {
-        selection = [py selectedPowerMarkerNodePaths];
-    }
-    else {
-        selection = [py selectedResultNodePaths];
-    }
-    [matches selectNodePaths:selection];
-}
+// - (void)updatePySelection
+// {
+//     NSArray *selection;
+//     if (_powerMode) {
+//         selection = [py selectedPowerMarkerNodePaths];
+//     }
+//     else {
+//         selection = [py selectedResultNodePaths];
+//     }
+//     [matches selectNodePaths:selection];
+// }

 - (void)performPySelection:(NSArray *)aIndexPaths
 {
@@ -215,11 +187,7 @@ http://www.hardcoded.net/licenses/hs_license
 /* Reload the matches outline and restore selection from py */
 - (void)reloadMatches
 {
-    [matches setDelegate:nil];
-    [matches reloadData];
-    [matches expandItem:nil expandChildren:YES];
-    [matches setDelegate:self];
-    [self updatePySelection];
+    [outline refresh];
 }

 /* Actions */
@@ -243,13 +211,8 @@ http://www.hardcoded.net/licenses/hs_license
 - (IBAction)changePowerMarker:(id)sender
 {
    _powerMode = [pmSwitch selectedSegment] == 1;
-    if (_powerMode)
-        [matches setTag:2];
-    else
-        [matches setTag:0];
-    [matches expandItem:nil expandChildren:YES];
-    [self outlineView:matches didClickTableColumn:nil];
-    [self updatePySelection];
+    [outline setPowerMarkerMode:_powerMode];
+    // [self outlineView:matches didClickTableColumn:nil];
 }

 - (IBAction)copyMarked:(id)sender
@@ -299,10 +262,10 @@ http://www.hardcoded.net/licenses/hs_license

 - (IBAction)ignoreSelected:(id)sender
 {
-    NSArray *nodeList = [self getSelected:YES];
-    if (![nodeList count])
+    NSArray *pathList = [self getSelectedPaths:YES];
+    if (![pathList count])
        return;
-    NSString *msg = [NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",[nodeList count]];
+    NSString *msg = [NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",[pathList count]];
    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
        return;
    [py addSelectedToIgnoreList];
@@ -336,8 +299,8 @@ http://www.hardcoded.net/licenses/hs_license

 - (IBAction)markToggle:(id)sender
 {
-    OVNode *node = [matches itemAtRow:[matches clickedRow]];
-    [self performPySelection:[NSArray arrayWithObject:p2a([node indexPath])]];
+    NSIndexPath *path = [matches itemAtRow:[matches clickedRow]];
+    [self performPySelection:[NSArray arrayWithObject:p2a(path)]];
    [py toggleSelectedMark];
    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
 }
@@ -395,10 +358,10 @@ http://www.hardcoded.net/licenses/hs_license

 - (IBAction)removeSelected:(id)sender
 {
-    NSArray *nodeList = [self getSelected:YES];
-    if (![nodeList count])
+    NSArray *pathList = [self getSelectedPaths:YES];
+    if (![pathList count])
        return;
-    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",[nodeList count]]] == NSAlertSecondButtonReturn) // NO
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",[pathList count]]] == NSAlertSecondButtonReturn) // NO
        return;
    [self performPySelection:[self getSelectedPaths:YES]];
    [py removeSelected];
@@ -430,19 +393,7 @@ http://www.hardcoded.net/licenses/hs_license

 - (IBAction)switchSelected:(id)sender
 {
-    // It might look like a complicated way to get the length of the current dupe list on the py side
-    // but after a lot of fussing around, believe it or not, it actually is.
-    NSInteger matchesTag = _powerMode ? 2 : 0;
-    NSInteger startLen = [[py getOutlineView:matchesTag childCountsForPath:[NSArray array]] count];
    [py makeSelectedReference];
-    [self performPySelection:[self getSelectedPaths:NO]];
-    // In some cases (when in a filtered view in Power Marker mode, it's possible that the demoted
-    // ref is not a part of the filter, making the table smaller. In those cases, we want to do a
-    // complete reload of the table to avoid a crash.
-    if ([[py getOutlineView:matchesTag childCountsForPath:[NSArray array]] count] == startLen)
-        [[NSNotificationCenter defaultCenter] postNotificationName:ResultsUpdatedNotification object:self];
-    else
-        [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
 }

 - (IBAction)toggleColumn:(id)sender
@@ -488,43 +439,6 @@ http://www.hardcoded.net/licenses/hs_license
    [self changePowerMarker:sender];
 }

-/* Delegate */
- (void)outlineView:(NSOutlineView *)outlineView didClickTableColumn:(NSTableColumn *)tableColumn
-{
-    if ([[outlineView sortDescriptors] count] < 1)
-        return;
-    NSSortDescriptor *sd = [[outlineView sortDescriptors] objectAtIndex:0];
-    if (_powerMode)
-        [py sortDupesBy:i2n([[sd key] intValue]) ascending:b2n([sd ascending])];
-    else
-        [py sortGroupsBy:i2n([[sd key] intValue]) ascending:b2n([sd ascending])];
-    [self reloadMatches];
-}
-
- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
-{ 
-    OVNode *node = item;
-    if ([[tableColumn identifier] isEqual:@"mark"]) {
-        [cell setEnabled: [node isMarkable]];
-    }
-    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
-        // Determine if the text color will be blue due to directory being reference.
-        NSTextFieldCell *textCell = cell;
-        if ([node isMarkable]) {
-            [textCell setTextColor:[NSColor blackColor]];
-        }
-        else {
-            [textCell setTextColor:[NSColor blueColor]];
-        }
-        if ((_displayDelta) && (_powerMode || ([node level] > 1))) {
-            NSInteger i = [[tableColumn identifier] integerValue];
-            if ([_deltaColumns containsIndex:i]) {
-                [textCell setTextColor:[NSColor orangeColor]];
-            }
-        }
-    }
-}
-
 /* Notifications */
 - (void)windowWillClose:(NSNotification *)aNotification
 {
@@ -533,7 +447,6 @@ http://www.hardcoded.net/licenses/hs_license

 - (void)jobCompleted:(NSNotification *)aNotification
 {
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
    NSInteger r = n2i([py getOperationalErrorCount]);
    id lastAction = [[ProgressController mainProgressController] jobId];
    if ([lastAction isEqualTo:jobCopy]) {
@@ -558,7 +471,7 @@ http://www.hardcoded.net/licenses/hs_license
            [Dialogs showMessage:@"All marked files were sucessfully sent to Trash."];
    }
    else if ([lastAction isEqualTo:jobScan]) {
-        NSInteger groupCount = [[py getOutlineView:0 childCountsForPath:[NSArray array]] count];
+        NSInteger groupCount = [outline intProperty:@"children_count" valueAtPath:nil];
        if (groupCount == 0)
            [Dialogs showMessage:@"No duplicates found."];
    }
@@ -602,16 +515,10 @@ http://www.hardcoded.net/licenses/hs_license

 - (void)resultsMarkingChanged:(NSNotification *)aNotification
 {
-    [matches invalidateMarkings];
+    [self reloadMatches];
    [self refreshStats];
 }

- (void)resultsUpdated:(NSNotification *)aNotification
-{
-    [matches invalidateBuffers];
-    [matches invalidateMarkings];
-}
-
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
 {
    return ![[ProgressController mainProgressController] isShown];
--- a/cocoa/me/ResultWindow.h
+++ b/cocoa/me/ResultWindow.h
@@ -7,7 +7,6 @@ http://www.hardcoded.net/licenses/hs_license
 */

 #import <Cocoa/Cocoa.h>
-#import "../../cocoalib/Outline.h"
 #import "../base/ResultWindow.h"
 #import "DirectoryPanel.h"

--- a/cocoa/me/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/me/dupeguru.xcodeproj/project.pbxproj
@@ -30,6 +30,7 @@
 		CE003CCC11242D00004B0AA7 /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CC511242D00004B0AA7 /* NSTableViewAdditions.m */; };
 		CE003CD011242D2C004B0AA7 /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */; };
 		CE073F6309CAE1A3005C1D2F /* dupeguru_me_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */; };
+		CE0B3D6711243F83009A7A30 /* ResultOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0B3D6611243F83009A7A30 /* ResultOutline.m */; };
 		CE1425890AFB718500BD5167 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE14259F0AFB719300BD5167 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
@@ -43,7 +44,6 @@
 		CE4B59CA1119919700C06C9E /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C71119919700C06C9E /* registration.xib */; };
 		CE515DF30FC6C12E00EC695D /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE10FC6C12E00EC695D /* Dialogs.m */; };
 		CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */; };
-		CE515DF50FC6C12E00EC695D /* Outline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE50FC6C12E00EC695D /* Outline.m */; };
 		CE515DF60FC6C12E00EC695D /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE70FC6C12E00EC695D /* ProgressController.m */; };
 		CE515DF70FC6C12E00EC695D /* RecentDirectories.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */; };
 		CE515DF80FC6C12E00EC695D /* RegistrationInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */; };
@@ -107,6 +107,9 @@
 		CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryOutline.m; path = ../base/DirectoryOutline.m; sourceTree = SOURCE_ROOT; };
 		CE003CCF11242D2C004B0AA7 /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
 		CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_me_help; path = ../../help_me/dupeguru_me_help; sourceTree = "<group>"; };
+		CE0B3D6411243F83009A7A30 /* PyResultTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTree.h; path = ../base/PyResultTree.h; sourceTree = SOURCE_ROOT; };
+		CE0B3D6511243F83009A7A30 /* ResultOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultOutline.h; path = ../base/ResultOutline.h; sourceTree = SOURCE_ROOT; };
+		CE0B3D6611243F83009A7A30 /* ResultOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultOutline.m; path = ../base/ResultOutline.m; sourceTree = SOURCE_ROOT; };
 		CE1425880AFB718500BD5167 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
 		CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
 		CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
@@ -124,8 +127,6 @@
 		CE515DE10FC6C12E00EC695D /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
 		CE515DE20FC6C12E00EC695D /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
 		CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow.m; path = ../../cocoalib/HSErrorReportWindow.m; sourceTree = SOURCE_ROOT; };
-		CE515DE40FC6C12E00EC695D /* Outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Outline.h; path = ../../cocoalib/Outline.h; sourceTree = SOURCE_ROOT; };
-		CE515DE50FC6C12E00EC695D /* Outline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Outline.m; path = ../../cocoalib/Outline.m; sourceTree = SOURCE_ROOT; };
 		CE515DE60FC6C12E00EC695D /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
 		CE515DE70FC6C12E00EC695D /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
 		CE515DE80FC6C12E00EC695D /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
@@ -349,8 +350,6 @@
 				CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */,
 				CE003CB911242D00004B0AA7 /* NSEventAdditions.h */,
 				CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */,
-				CE515DE40FC6C12E00EC695D /* Outline.h */,
-				CE515DE50FC6C12E00EC695D /* Outline.m */,
 				CE515DE60FC6C12E00EC695D /* ProgressController.h */,
 				CE515DE70FC6C12E00EC695D /* ProgressController.m */,
 				CE515DE80FC6C12E00EC695D /* PyApp.h */,
@@ -380,10 +379,13 @@
 				CE6032BF0FE6784C007E33FF /* DetailsPanel.m */,
 				CE515E180FC6C19300EC695D /* DirectoryPanel.h */,
 				CE515E190FC6C19300EC695D /* DirectoryPanel.m */,
-				CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */,
-				CED0A591111C9FD10020AD7D /* PyDetailsPanel.h */,
 				CE515E1B0FC6C19300EC695D /* ResultWindow.h */,
 				CE515E1C0FC6C19300EC695D /* ResultWindow.m */,
+				CE0B3D6511243F83009A7A30 /* ResultOutline.h */,
+				CE0B3D6611243F83009A7A30 /* ResultOutline.m */,
+				CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */,
+				CED0A591111C9FD10020AD7D /* PyDetailsPanel.h */,
+				CE0B3D6411243F83009A7A30 /* PyResultTree.h */,
 			);
 			name = dgbase;
 			sourceTree = "<group>";
@@ -473,7 +475,6 @@
 				CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */,
 				CE515DF30FC6C12E00EC695D /* Dialogs.m in Sources */,
 				CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */,
-				CE515DF50FC6C12E00EC695D /* Outline.m in Sources */,
 				CE515DF60FC6C12E00EC695D /* ProgressController.m in Sources */,
 				CE515DF70FC6C12E00EC695D /* RecentDirectories.m in Sources */,
 				CE515DF80FC6C12E00EC695D /* RegistrationInterface.m in Sources */,
@@ -492,6 +493,7 @@
 				CE003CCB11242D00004B0AA7 /* NSIndexPathAdditions.m in Sources */,
 				CE003CCC11242D00004B0AA7 /* NSTableViewAdditions.m in Sources */,
 				CE003CD011242D2C004B0AA7 /* DirectoryOutline.m in Sources */,
+				CE0B3D6711243F83009A7A30 /* ResultOutline.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};