Fixed column reloading which was broken since the mark-->marked rename.

--HG--
rename : qt/pe/modules/block/block.c => qt/pe/modules/block.c
rename : qt/pe/modules/block/setup.py => qt/pe/modules/setup.py

.hgignore

@@ -0,0 +1,25 @@
+syntax: glob
+
+.DS_Store
+*.pyc
+*.so
+*.mode1v3
+*.pbxuser
+*.tm_build_errors
+*.pyd
+conf.yaml
+build
+cocoa/*/Info.plist
+cocoa/*/build
+cocoa/*/dg_cocoa.plugin
+qt/base/*_rc.py
+qt/base/*_ui.py
+qt/*/*_ui.py
+qt/*/build
+qt/*/dist
+qt/*/install
+qt/*/logdict*.log
+qt/*/warn*.txt
+help_se/dupeguru_help
+help_me/dupeguru_me_help
+help_pe/dupeguru_pe_help

.hgtags

@@ -0,0 +1,13 @@
+0ef0ca83b49ad009c896f55824189acc932bcf22 se2.8.2
+0ef0ca83b49ad009c896f55824189acc932bcf22 me5.6.6
+0ef0ca83b49ad009c896f55824189acc932bcf22 pe1.7.8
+a8f232f880b6f9ada565d472996a627ebf69b6e9 before-tiger-drop
+321d15e818cf9a3f1fc037543090bb2fca2cccd7 me5.7.0
+adc73ccd14b1386cb04dee773c53a2d126800e31 se2.9.0
+cbcf9c80fee4c908ef2efbf1c143c9e47676c9b2 pe1.8.0
+61c4101851bdea3cb37dfb76f0d404c78c7c594c se2.9.1
+0e923897a3389331d4ab3debbc40b8dd616199d9 pe1.8.1
+2c454eca9ebe93b6cf34916068f828a6a39e3eaf me5.7.1
+19e40bab20521d4256acf325dba9b32e95e135c5 pe1.8.2
+7b7c5a66ebee4e4b8125330d24fe9ce1a070ff25 se2.9.2
+1cef6d39855f85d4be728646bc78b860e6d4e398 pe1.8.3

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2009 Hardcoded Software Inc. (http://www.hardcoded.net)
+Copyright 2010 Hardcoded Software Inc. (http://www.hardcoded.net)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README

@@ -0,0 +1,72 @@
+Contents
+=====
+
+This package contains the source for dupeGuru. To learns how to build it, refer to the "Build dupeGuru" section. Below is the description of the various subfolders:
+
+- core: Contains the core logic code for dupeGuru. It's Python code written in TDD style.
+- core_*: Edition-specific-cross-toolkit code written in Python.
+- cocoa: UI code for the Cocoa toolkit. It's Objective-C code.
+- qt: UI code for the Qt toolkit. It's written in Python and uses PyQt. Before redistributing changes in this part of the code, read the "qt/WARNING" file.
+- images: Images used by the different UI codebases.
+
+There are also other sub-folder that comes from external repositories (automatically checked out
+with svn:externals):
+
+- hsutil: A collection of helpers used across HS applications.
+- hsdocgen: An ad-hoc document generation used across HS project (used for help files)
+- hsmedia: A library to read audio file metadata, used in dupeGuru ME.
+- cocoalib: A collection of helpers used across Cocoa UI codebases of HS applications.
+- qtlib: A collection of helpers used across Qt UI codebases of HS applications.
+
+dupeGuru Dependencies
+=====
+
+Before being able to build dupeGuru, a few dependencies have to be installed:
+
+General dependencies
+-----
+
+- Python 2.6 (http://www.python.org)
+- Mako, to generate help files. (http://www.makotemplates.org/)
+- PyYaml, for help files and the build system. (http://pyyaml.org/)
+- Nose, to run unit tests. (http://somethingaboutorange.com/mrl/projects/nose/)
+
+OS X prerequisites
+-----
+
+- XCode 3.1 (http://developer.apple.com/TOOLS/xcode/)
+- Sparkle (http://sparkle.andymatuschak.org/)
+- PyObjC 2.2. (http://pyobjc.sourceforge.net/)
+- py2app (http://svn.pythonmac.org/py2app/py2app/trunk/doc/index.html)
+
+Windows prerequisites
+---
+
+- Visual Studio 2008 (Express is enough) is needed to build C extensions. (http://www.microsoft.com/Express/)
+- PyQt 4.6 (http://www.riverbankcomputing.co.uk/news)
+- Python Imaging Library for dupeGuru PE. (http://www.pythonware.com/products/pil/)
+- PyInstaller, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://www.pyinstaller.org/)
+- Advanced Installer, if you want to build the installer file. (http://www.advancedinstaller.com/)
+
+Building dupeGuru
+=====
+
+First, make sure you meet the dependencies listed in the section above. Then you need to configure your build with:
+
+	python configure.py
+	
+If you want, you can specify a UI to use with the `--ui` option. So, if you want to build dupeGuru with Qt on OS X, then you have to type `python configure.py --ui=qt`. You can also use the `--dev` flag to indicate a dev build (it will build `dg_cocoa.plugin` in alias mode and use the "dev" config in XCode).
+
+Then, just build the thing and then run it with:
+
+	python build.py
+	python run.py
+
+If you want to create ready-to-upload package, run:
+
+	python package.py
+
+64-bit on OS X
+---
+
+The "release" configuration of dupeGuru's XCode project build with archs "i386 x86_64 ppc". However there are currently problems with py2app and 64 bit. If you want to correctly build 64-bit apps, refer to http://www.hardcoded.net/articles/building-64-bit-pyobjc-applications-with-py2app.htm .

base/cocoa/AppDelegate.m

@@ -1,59 +0,0 @@
-/* 
-Copyright 2009 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 "AppDelegate.h"
-#import "ProgressController.h"
-#import "RegistrationInterface.h"
-#import "Utils.h"
-#import "Consts.h"
-
-@implementation AppDelegateBase
-- (id)init
-{
-    self = [super init];
-    _appName = @"";
-    return self;
-}
-
-- (IBAction)unlockApp:(id)sender
-{
-    if ([[self py] isRegistered])
-        return;
-    RegistrationInterface *ri = [[RegistrationInterface alloc] initWithApp:[self py] name:_appName limitDescription:LIMIT_DESC];
-    if ([ri enterCode] == NSOKButton)
-    {
-        NSString *menuTitle = [NSString stringWithFormat:@"Thanks for buying %@!",_appName];
-        [unlockMenuItem setTitle:menuTitle];
-    }
-    [ri release];
-}
-
-- (PyDupeGuruBase *)py { return py; }
-- (RecentDirectories *)recentDirectories { return recentDirectories; }
-- (DetailsPanelBase *)detailsPanel { return nil; } // Virtual
-
-/* Delegate */
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{
-    [[ProgressController mainProgressController] setWorker:py];
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    //Restore Columns
-    NSArray *columnsOrder = [ud arrayForKey:@"columnsOrder"];
-    NSDictionary *columnsWidth = [ud dictionaryForKey:@"columnsWidth"];
-    if ([columnsOrder count])
-        [result restoreColumnsPosition:columnsOrder widths:columnsWidth];
-    else
-        [result resetColumnsToDefault:nil];
-    //Reg stuff
-    if ([RegistrationInterface showNagWithApp:[self py] name:_appName limitDescription:LIMIT_DESC])
-        [unlockMenuItem setTitle:[NSString stringWithFormat:@"Thanks for buying %@!",_appName]];
-    //Restore results
-    [py loadIgnoreList];
-    [py loadResults];
-}
-@end

base/cocoa/Consts.h

@@ -1,28 +0,0 @@
-/* 
-Copyright 2009 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>
-
-#define DuplicateSelectionChangedNotification @"DuplicateSelectionChangedNotification"
-/* ResultsChangedNotification happens on major changes, which requires a complete reload of the data*/
-#define ResultsChangedNotification @"ResultsChangedNotification"
-/* ResultsChangedNotification happens on minor changes, which requires buffer flush*/
-#define ResultsUpdatedNotification @"ResultsUpdatedNotification"
-#define ResultsMarkingChangedNotification @"ResultsMarkingChangedNotification"
-#define RegistrationRequired @"RegistrationRequired"
-#define JobStarted @"JobStarted"
-#define JobInProgress @"JobInProgress"
-
-#define jobLoad @"job_load"
-#define jobScan @"job_scan"
-#define jobCopy @"job_copy"
-#define jobMove @"job_move"
-#define jobDelete @"job_delete"
-
-#define DEMO_MAX_ACTION_COUNT 10
-#define LIMIT_DESC @"In the demo version, only 10 duplicates per session can be sent to Trash, moved or copied."

base/cocoa/DetailsPanel.m

@@ -1,44 +0,0 @@
-/* 
-Copyright 2009 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 "DetailsPanel.h"
-#import "Consts.h"
-
-@implementation DetailsPanelBase
-- (id)initWithPy:(PyApp *)aPy
-{
-    self = [super initWithWindowNibName:@"DetailsPanel"];
-    [self window]; //So the detailsTable is initialized.
-    [detailsTable setPy:aPy];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(duplicateSelectionChanged:) name:DuplicateSelectionChangedNotification object:nil];
-    return self;
-}
-
-- (void)refresh
-{
-    [detailsTable reloadData];
-}
-
-- (void)toggleVisibility
-{
-    if ([[self window] isVisible])
-        [[self window] close];
-    else
-    {
-        [self refresh]; // selection might have changed since last time
-        [[self window] orderFront:nil];
-    }
-}
-
-/* Notifications */
-- (void)duplicateSelectionChanged:(NSNotification *)aNotification
-{
-    if ([[self window] isVisible])
-        [self refresh];
-}
-@end

base/cocoa/DirectoryPanel.m

@@ -1,231 +0,0 @@
-/* 
-Copyright 2009 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 "DirectoryPanel.h"
-#import "Dialogs.h"
-#import "Utils.h"
-#import "AppDelegate.h"
-
-@implementation DirectoryOutline
-- (void)doInit
-{
-    [super doInit];
-    [self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
-}
-
-- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id < NSDraggingInfo >)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
-{
-    NSPasteboard *pboard;
-    NSDragOperation sourceDragMask;
-    sourceDragMask = [info draggingSourceOperationMask];
-    pboard = [info draggingPasteboard];
-    if ([[pboard types] containsObject:NSFilenamesPboardType])
-    {
-        if (sourceDragMask & NSDragOperationLink)
-            return NSDragOperationLink;
-    }
-    return NSDragOperationNone;    
-}
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id < NSDraggingInfo >)info item:(id)item childIndex:(NSInteger)index
-{
-    NSPasteboard *pboard;
-    NSDragOperation sourceDragMask; 
-    sourceDragMask = [info draggingSourceOperationMask];
-    pboard = [info draggingPasteboard];
-    if ( [[pboard types] containsObject:NSFilenamesPboardType] )
-    {
-        NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
-        if (!(sourceDragMask & NSDragOperationLink))
-            return NO;
-        if (([self delegate] == nil) || (![[self delegate] respondsToSelector:@selector(outlineView:addDirectory:)]))
-            return NO;
-        for (NSString *filename in filenames)
-            [[self delegate] outlineView:self addDirectory:filename];
-    }
-    return YES;
-}
-
-@end
-
-@implementation DirectoryPanelBase
-- (id)initWithParentApp:(id)aParentApp
-{
-    self = [super initWithWindowNibName:@"DirectoryPanel"];
-    [self window];
-    AppDelegateBase *app = aParentApp;
-    _py = [app py];
-    _recentDirectories = [app recentDirectories];
-    [directories setPy:_py];
-    NSPopUpButtonCell *cell = [[directories tableColumnWithIdentifier:@"1"] dataCell];
-    [cell addItemWithTitle:@"Normal"];
-    [cell addItemWithTitle:@"Reference"];
-    [cell addItemWithTitle:@"Excluded"];
-    for (int i=0;i<[[cell itemArray] count];i++)
-    {
-        NSMenuItem *mi = [[cell itemArray] objectAtIndex:i];
-        [mi setTarget:self];
-        [mi setAction:@selector(changeDirectoryState:)];
-        [mi setTag:i];
-    }
-    [self refreshRemoveButtonText];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(directorySelectionChanged:) name:NSOutlineViewSelectionDidChangeNotification object:directories];
-    return self;
-}
-
-/* Actions */
-
-- (IBAction)askForDirectory:(id)sender
-{
-    NSOpenPanel *op = [NSOpenPanel openPanel];
-    [op setCanChooseFiles:YES];
-    [op setCanChooseDirectories:YES];
-    [op setAllowsMultipleSelection:NO];
-    [op setTitle:@"Select a directory to add to the scanning list"];
-    [op setDelegate:self];
-    if ([op runModalForTypes:nil] == NSOKButton)
-    {
-        NSString *directory = [[op filenames] objectAtIndex:0];
-        [self addDirectory:directory];
-    }
-}
-
-- (IBAction)changeDirectoryState:(id)sender
-{
-    OVNode *node = [directories itemAtRow:[directories clickedRow]];
-    [_py setDirectory:p2a([node indexPath]) state:i2n([sender tag])]; 
-    [node resetAllBuffers];
-    [directories reloadItem:node reloadChildren:YES];
-    [directories display];
-}
-
-- (IBAction)popupAddDirectoryMenu:(id)sender
-{
-    if ([[_recentDirectories directories] count] == 0)
-    {
-        [self askForDirectory:sender];
-        return;
-    }
-    NSMenu *m = [addButtonPopUp menu];
-    while ([m numberOfItems] > 0)
-        [m removeItemAtIndex:0];
-    NSMenuItem *mi = [m addItemWithTitle:@"Add New Directory..." action:@selector(askForDirectory:) keyEquivalent:@""];
-    [mi setTarget:self];
-    [m addItem:[NSMenuItem separatorItem]];
-    [_recentDirectories fillMenu:m];
-    [addButtonPopUp selectItem:nil];
-    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
-}
-
-- (IBAction)removeSelectedDirectory:(id)sender
-{
-    [[self window] makeKeyAndOrderFront:nil];
-    if ([directories selectedRow] < 0)
-        return;
-    OVNode *node = [directories itemAtRow:[directories selectedRow]];
-    if ([node level] == 1)
-    {
-        [_py removeDirectory:i2n([node index])];
-        [directories reloadData];
-    }
-    else
-    {
-        int state = n2i([[node buffer] objectAtIndex:1]);
-        int newState = state == 2 ? 0 : 2; // If excluded, put it back
-        [_py setDirectory:p2a([node indexPath]) state:i2n(newState)];
-        [node resetAllBuffers];
-        [directories display];
-    }
-    [self refreshRemoveButtonText];
-}
-
-- (IBAction)toggleVisible:(id)sender
-{
-    [[self window] makeKeyAndOrderFront:nil];
-}
-
-/* Public */
-
-- (void)addDirectory:(NSString *)directory
-{
-    int r = [[_py addDirectory:directory] intValue];
-    if (r)
-    {
-        NSString *m;
-        switch (r)
-        {
-            case 1:
-            {
-                m = @"This directory already is in the list.";
-                break;
-            }
-            case 2:
-            {
-                m = @"This directory does not exist.";
-                break;
-            }
-        }
-        [Dialogs showMessage:m];
-    }
-    [directories reloadData];
-    [_recentDirectories addDirectory:directory];
-    [[self window] makeKeyAndOrderFront:nil];
-}
-
-- (void)refreshRemoveButtonText
-{
-    if ([directories selectedRow] < 0)
-    {
-        [removeButton setEnabled:NO];
-        return;
-    }
-    [removeButton setEnabled:YES];
-    OVNode *node = [directories itemAtRow:[directories selectedRow]];
-    int state = n2i([[node buffer] objectAtIndex:1]);
-    NSString *buttonText = state == 2 ? @"Put Back" : @"Remove";
-    [removeButton setTitle:buttonText];
-}
-
-/* Delegate */
-
-- (void)outlineView:(NSOutlineView *)outlineView addDirectory:(NSString *)directory
-{
-    [self addDirectory:directory];
-}
-
-- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
-{ 
-    OVNode *node = item;
-    int state = n2i([[node buffer] objectAtIndex:1]);
-    if ([cell isKindOfClass:[NSTextFieldCell class]])
-    {
-        NSTextFieldCell *textCell = cell;
-        if (state == 1)
-            [textCell setTextColor:[NSColor blueColor]];
-        else if (state == 2)
-            [textCell setTextColor:[NSColor redColor]];
-        else
-            [textCell setTextColor:[NSColor blackColor]];
-    }
-}
-
-- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)path
-{
-    BOOL isdir;
-    [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isdir];
-    return isdir;
-}
-
-/* Notifications */
-
-- (void)directorySelectionChanged:(NSNotification *)aNotification
-{
-    [self refreshRemoveButtonText];
-}
-
-@end

base/py/app_cocoa.py

@@ -1,307 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2006/11/11
-# $Id$
-# Copyright 2009 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 objc
-from Foundation import *
-from AppKit import *
-import logging
-import os.path as op
-
-from hsutil import io, cocoa, job
-from hsutil.cocoa import install_exception_hook
-from hsutil.misc import stripnone
-from hsutil.reg import RegistrationRequired
-
-from . import app, fs
-
-JOBID2TITLE = {
-    app.JOB_SCAN: "Scanning for duplicates",
-    app.JOB_LOAD: "Loading",
-    app.JOB_MOVE: "Moving",
-    app.JOB_COPY: "Copying",
-    app.JOB_DELETE: "Sending to Trash",
-}
-
-def demo_method(method):
-    def wrapper(self, *args, **kwargs):
-        try:
-            return method(self, *args, **kwargs)
-        except RegistrationRequired:
-            NSNotificationCenter.defaultCenter().postNotificationName_object_('RegistrationRequired', self)
-    
-    return wrapper
-
-class DupeGuru(app.DupeGuru):
-    def __init__(self, data_module, appdata_subdir, appid):
-        LOGGING_LEVEL = logging.DEBUG if NSUserDefaults.standardUserDefaults().boolForKey_('debug') else logging.WARNING
-        logging.basicConfig(level=LOGGING_LEVEL, format='%(levelname)s %(message)s')
-        logging.debug('started in debug mode')
-        install_exception_hook()
-        appsupport = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, True)[0]
-        appdata = op.join(appsupport, appdata_subdir)
-        app.DupeGuru.__init__(self, data_module, appdata, appid)
-        self.progress = cocoa.ThreadedJobPerformer()
-        self.display_delta_values = False
-        self.selected_dupes = []
-        self.RefreshDetailsTable(None,None)
-    
-    #--- Override
-    @staticmethod
-    def _recycle_dupe(dupe):
-        directory = unicode(dupe.path[:-1])
-        filename = dupe.name
-        if objc.__version__ == '1.4': # For a while, we have to support this.
-            result, tag = NSWorkspace.sharedWorkspace().performFileOperation_source_destination_files_tag_(
-                NSWorkspaceRecycleOperation, directory, '', [filename])
-        else:
-            result, tag = NSWorkspace.sharedWorkspace().performFileOperation_source_destination_files_tag_(
-                NSWorkspaceRecycleOperation, directory, '', [filename], None)
-    
-    def _start_job(self, jobid, func):
-        try:
-            j = self.progress.create_job()
-            self.progress.run_threaded(func, args=(j, ))
-        except job.JobInProgressError:
-            NSNotificationCenter.defaultCenter().postNotificationName_object_('JobInProgress', self)
-        else:
-            ud = {'desc': JOBID2TITLE[jobid], 'jobid':jobid}
-            NSNotificationCenter.defaultCenter().postNotificationName_object_userInfo_('JobStarted', self, ud)
-    
-    #---Helpers
-    def GetObjects(self,node_path):
-        #returns a tuple g,d
-        try:
-            g = self.results.groups[node_path[0]]
-            if len(node_path) == 2:
-                return (g,self.results.groups[node_path[0]].dupes[node_path[1]])
-            else:
-                return (g,None)
-        except IndexError:
-            return (None,None)
-    
-    def get_folder_path(self, node_path, curr_path=None):
-        if not node_path:
-            return curr_path
-        current_index = node_path[0]
-        if curr_path is None:
-            curr_path = self.directories[current_index]
-        else:
-            curr_path = self.directories.get_subfolders(curr_path)[current_index]
-        return self.get_folder_path(node_path[1:], curr_path)
-    
-    def RefreshDetailsTable(self,dupe,group):
-        l1 = self._get_display_info(dupe, group, False)
-        # we don't want the two sides of the table to display the stats for the same file
-        ref = group.ref if group is not None and group.ref is not dupe else None
-        l2 = self._get_display_info(ref, group, False)
-        names = [c['display'] for c in self.data.COLUMNS]
-        self.details_table = zip(names,l1,l2)
-    
-    #---Public
-    def AddSelectedToIgnoreList(self):
-        for dupe in self.selected_dupes:
-            self.add_to_ignore_list(dupe)
-    
-    copy_or_move_marked = demo_method(app.DupeGuru.copy_or_move_marked)
-    delete_marked = demo_method(app.DupeGuru.delete_marked)
-
-    def MakeSelectedReference(self):
-        self.make_reference(self.selected_dupes)
-    
-    def OpenSelected(self):
-        if self.selected_dupes:
-            path = unicode(self.selected_dupes[0].path)
-            NSWorkspace.sharedWorkspace().openFile_(path)
-    
-    def PurgeIgnoreList(self):
-        self.scanner.ignore_list.Filter(lambda f,s:op.exists(f) and op.exists(s))
-    
-    def RefreshDetailsWithSelected(self):
-        if self.selected_dupes:
-            self.RefreshDetailsTable(
-                self.selected_dupes[0],
-                self.results.get_group_of_duplicate(self.selected_dupes[0])
-            )
-        else:
-            self.RefreshDetailsTable(None,None)
-    
-    def RemoveDirectory(self,index):
-        try:
-            del self.directories[index]
-        except IndexError:
-            pass
-    
-    def RemoveSelected(self):
-        self.results.remove_duplicates(self.selected_dupes)
-    
-    def RenameSelected(self, newname):
-        try:
-            d = self.selected_dupes[0]
-            d.rename(newname)
-            return True
-        except (IndexError, fs.FSError) as e:
-            logging.warning("dupeGuru Warning: %s" % unicode(e))
-        return False
-    
-    def RevealSelected(self):
-        if self.selected_dupes:
-            path = unicode(self.selected_dupes[0].path)
-            NSWorkspace.sharedWorkspace().selectFile_inFileViewerRootedAtPath_(path,'')
-    
-    def start_scanning(self):
-        self.RefreshDetailsTable(None, None)
-        try:
-            app.DupeGuru.start_scanning(self)
-            return 0
-        except app.NoScannableFileError:
-            return 3
-        except app.AllFilesAreRefError:
-            return 1
-    
-    def selected_result_node_paths(self):
-        def get_path(dupe):
-            try:
-                group = self.results.get_group_of_duplicate(dupe)
-                groupindex = self.results.groups.index(group)
-                if dupe is group.ref:
-                    return [groupindex]
-                dupeindex = group.dupes.index(dupe)
-                return [groupindex, dupeindex]
-            except ValueError: # dupe not in there
-                return None
-        
-        dupes = self.selected_dupes
-        return stripnone(get_path(dupe) for dupe in dupes)
-    
-    def selected_powermarker_node_paths(self):
-        def get_path(dupe):
-            try:
-                dupeindex = self.results.dupes.index(dupe)
-                return [dupeindex]
-            except ValueError: # dupe not in there
-                return None
-        
-        dupes = self.selected_dupes
-        return stripnone(get_path(dupe) for dupe in dupes)
-    
-    def SelectResultNodePaths(self,node_paths):
-        def extract_dupe(t):
-            g,d = t
-            if d is not None:
-                return d
-            else:
-                if g is not None:
-                    return g.ref
-        
-        selected = [extract_dupe(self.GetObjects(p)) for p in node_paths]
-        self.selected_dupes = [dupe for dupe in selected if dupe is not None]
-    
-    def SelectPowerMarkerNodePaths(self,node_paths):
-        rows = [p[0] for p in node_paths]
-        self.selected_dupes = [
-            self.results.dupes[row] for row in rows if row in xrange(len(self.results.dupes))
-        ]
-    
-    def SetDirectoryState(self, node_path, state):
-        p = self.get_folder_path(node_path)
-        self.directories.set_state(p, state)
-    
-    def sort_dupes(self,key,asc):
-        self.results.sort_dupes(key,asc,self.display_delta_values)
-    
-    def sort_groups(self,key,asc):
-        self.results.sort_groups(key,asc)
-    
-    def ToggleSelectedMarkState(self):
-        for dupe in self.selected_dupes:
-            self.results.mark_toggle(dupe)
-    
-    #---Data
-    def GetOutlineViewMaxLevel(self, tag):
-        if tag == 0:
-            return 2
-        elif tag == 1:
-            return 0
-        elif tag == 2:
-            return 1
-    
-    def GetOutlineViewChildCounts(self, tag, node_path):
-        if self.progress._job_running:
-            return []
-        if tag == 0: #Normal results
-            assert not node_path # no other value is possible
-            return [len(g.dupes) for g in self.results.groups]
-        elif tag == 1: #Directories
-            try:
-                if node_path:
-                    path = self.get_folder_path(node_path)
-                    subfolders = self.directories.get_subfolders(path)
-                else:
-                    subfolders = self.directories
-                return [len(self.directories.get_subfolders(path)) for path in subfolders]
-            except IndexError: # node_path out of range
-                return []
-        else: #Power Marker
-            assert not node_path # no other value is possible
-            return [0 for d in self.results.dupes]
-    
-    def GetOutlineViewValues(self, tag, node_path):
-        if self.progress._job_running:
-            return
-        if not node_path:
-            return
-        if tag in (0,2): #Normal results / Power Marker
-            if tag == 0:
-                g, d = self.GetObjects(node_path)
-                if d is None:
-                    d = g.ref
-            else:
-                d = self.results.dupes[node_path[0]]
-                g = self.results.get_group_of_duplicate(d)
-            result = self._get_display_info(d, g, self.display_delta_values)
-            return result
-        elif tag == 1: #Directories
-            try:
-                path = self.get_folder_path(node_path)
-                name = unicode(path) if len(node_path) == 1 else path[-1]
-                return [name, self.directories.get_state(path)]
-            except IndexError: # node_path out of range
-                return []
-    
-    def GetOutlineViewMarked(self, tag, node_path):
-        # 0=unmarked 1=marked 2=unmarkable
-        if self.progress._job_running:
-            return
-        if not node_path:
-            return 2
-        if tag == 1: #Directories
-            return 2
-        if tag == 0: #Normal results
-            g, d = self.GetObjects(node_path)
-        else: #Power Marker
-            d = self.results.dupes[node_path[0]]
-        if (d is None) or (not self.results.is_markable(d)):
-            return 2
-        elif self.results.is_marked(d):
-            return 1
-        else:
-            return 0
-    
-    def GetTableViewCount(self, tag):
-        if self.progress._job_running:
-            return 0
-        return len(self.details_table)
-    
-    def GetTableViewMarkedIndexes(self,tag):
-        return []
-    
-    def GetTableViewValues(self,tag,row):
-        return self.details_table[row]
-    
-

base/py/tests/app_cocoa_test.py

@@ -1,366 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2006/11/11
-# $Id$
-# Copyright 2009 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 tempfile
-import shutil
-import logging
-import os.path as op
-
-from nose.tools import eq_
-
-from hsutil.path import Path
-from hsutil.testcase import TestCase
-from hsutil.decorators import log_calls
-from hsutil import io
-
-from . import data
-from .results_test import GetTestGroups
-from .. import engine, fs
-try:
-    from ..app_cocoa import DupeGuru as DupeGuruBase
-except ImportError:
-    from nose.plugins.skip import SkipTest
-    raise SkipTest("These tests can only be run on OS X")
-
-class DupeGuru(DupeGuruBase):
-    def __init__(self):
-        DupeGuruBase.__init__(self, data, '/tmp', appid=4)
-    
-    def _start_job(self, jobid, func):
-        func(nulljob)
-    
-def r2np(rows):
-    #Transforms a list of rows [1,2,3] into a list of node paths [[1],[2],[3]]
-    return [[i] for i in rows]
-
-class TCDupeGuru(TestCase):
-    def setUp(self):
-        self.app = DupeGuru()
-        self.objects,self.matches,self.groups = GetTestGroups()
-        self.app.results.groups = self.groups
-        tmppath = self.tmppath()
-        io.mkdir(tmppath + 'foo')
-        io.mkdir(tmppath + 'bar')
-        self.app.directories.add_path(tmppath)
-    
-    def test_GetObjects(self):
-        app = self.app
-        objects = self.objects
-        groups = self.groups
-        g,d = app.GetObjects([0])
-        self.assert_(g is groups[0])
-        self.assert_(d is None)
-        g,d = app.GetObjects([0,0])
-        self.assert_(g is groups[0])
-        self.assert_(d is objects[1])
-        g,d = app.GetObjects([1,0])
-        self.assert_(g is groups[1])
-        self.assert_(d is objects[4])
-    
-    def test_GetObjects_after_sort(self):
-        app = self.app
-        objects = self.objects
-        groups = self.groups[:] #To keep the old order in memory
-        app.sort_groups(0,False) #0 = Filename
-        #Now, the group order is supposed to be reversed
-        g,d = app.GetObjects([0,0])
-        self.assert_(g is groups[1])
-        self.assert_(d is objects[4])
-    
-    def test_GetObjects_out_of_range(self):
-        app = self.app
-        self.assertEqual((None,None),app.GetObjects([2]))
-        self.assertEqual((None,None),app.GetObjects([]))
-        self.assertEqual((None,None),app.GetObjects([1,2]))
-    
-    def test_selected_result_node_paths(self):
-        # app.selected_dupes is correctly converted into node paths
-        app = self.app
-        objects = self.objects
-        paths = [[0, 0], [0, 1], [1]]
-        app.SelectResultNodePaths(paths)
-        eq_(app.selected_result_node_paths(), paths)
-    
-    def test_selected_result_node_paths_after_deletion(self):
-        # cases where the selected dupes aren't there are correctly handled
-        app = self.app
-        objects = self.objects
-        paths = [[0, 0], [0, 1], [1]]
-        app.SelectResultNodePaths(paths)
-        app.RemoveSelected()
-        # The first 2 dupes have been removed. The 3rd one is a ref. it stays there, in first pos.
-        eq_(app.selected_result_node_paths(), [[0]]) # no exception
-    
-    def test_selectResultNodePaths(self):
-        app = self.app
-        objects = self.objects
-        app.SelectResultNodePaths([[0,0],[0,1]])
-        self.assertEqual(2,len(app.selected_dupes))
-        self.assert_(app.selected_dupes[0] is objects[1])
-        self.assert_(app.selected_dupes[1] is objects[2])
-    
-    def test_selectResultNodePaths_with_ref(self):
-        app = self.app
-        objects = self.objects
-        app.SelectResultNodePaths([[0,0],[0,1],[1]])
-        self.assertEqual(3,len(app.selected_dupes))
-        self.assert_(app.selected_dupes[0] is objects[1])
-        self.assert_(app.selected_dupes[1] is objects[2])
-        self.assert_(app.selected_dupes[2] is self.groups[1].ref)
-    
-    def test_selectResultNodePaths_empty(self):
-        self.app.SelectResultNodePaths([])
-        self.assertEqual(0,len(self.app.selected_dupes))        
-    
-    def test_selectResultNodePaths_after_sort(self):
-        app = self.app
-        objects = self.objects
-        groups = self.groups[:] #To keep the old order in memory
-        app.sort_groups(0,False) #0 = Filename
-        #Now, the group order is supposed to be reversed
-        app.SelectResultNodePaths([[0,0],[1],[1,0]])
-        self.assertEqual(3,len(app.selected_dupes))
-        self.assert_(app.selected_dupes[0] is objects[4])
-        self.assert_(app.selected_dupes[1] is groups[0].ref)
-        self.assert_(app.selected_dupes[2] is objects[1])
-    
-    def test_selectResultNodePaths_out_of_range(self):
-        app = self.app
-        app.SelectResultNodePaths([[0,0],[0,1],[1],[1,1],[2]])
-        self.assertEqual(3,len(app.selected_dupes))
-    
-    def test_selected_powermarker_node_paths(self):
-        # app.selected_dupes is correctly converted into paths
-        app = self.app
-        objects = self.objects
-        paths = r2np([0, 1, 2])
-        app.SelectPowerMarkerNodePaths(paths)
-        eq_(app.selected_powermarker_node_paths(), paths)
-    
-    def test_selected_powermarker_node_paths_after_deletion(self):
-        # cases where the selected dupes aren't there are correctly handled
-        app = self.app
-        objects = self.objects
-        paths = r2np([0, 1, 2])
-        app.SelectPowerMarkerNodePaths(paths)
-        app.RemoveSelected()
-        eq_(app.selected_powermarker_node_paths(), []) # no exception
-    
-    def test_selectPowerMarkerRows(self):
-        app = self.app
-        objects = self.objects
-        app.SelectPowerMarkerNodePaths(r2np([0,1,2]))
-        self.assertEqual(3,len(app.selected_dupes))
-        self.assert_(app.selected_dupes[0] is objects[1])
-        self.assert_(app.selected_dupes[1] is objects[2])
-        self.assert_(app.selected_dupes[2] is objects[4])
-    
-    def test_selectPowerMarkerRows_empty(self):
-        self.app.SelectPowerMarkerNodePaths([])
-        self.assertEqual(0,len(self.app.selected_dupes))
-    
-    def test_selectPowerMarkerRows_after_sort(self):
-        app = self.app
-        objects = self.objects
-        app.sort_dupes(0,False) #0 = Filename
-        app.SelectPowerMarkerNodePaths(r2np([0,1,2]))
-        self.assertEqual(3,len(app.selected_dupes))
-        self.assert_(app.selected_dupes[0] is objects[4])
-        self.assert_(app.selected_dupes[1] is objects[2])
-        self.assert_(app.selected_dupes[2] is objects[1])
-    
-    def test_selectPowerMarkerRows_out_of_range(self):
-        app = self.app
-        app.SelectPowerMarkerNodePaths(r2np([0,1,2,3]))
-        self.assertEqual(3,len(app.selected_dupes))
-    
-    def test_toggleSelectedMark(self):
-        app = self.app
-        objects = self.objects
-        app.ToggleSelectedMarkState()
-        self.assertEqual(0,app.results.mark_count)
-        app.SelectPowerMarkerNodePaths(r2np([0,2]))
-        app.ToggleSelectedMarkState()
-        self.assertEqual(2,app.results.mark_count)
-        self.assert_(not app.results.is_marked(objects[0]))
-        self.assert_(app.results.is_marked(objects[1]))
-        self.assert_(not app.results.is_marked(objects[2]))
-        self.assert_(not app.results.is_marked(objects[3]))
-        self.assert_(app.results.is_marked(objects[4]))
-    
-    def test_refreshDetailsWithSelected(self):
-        def mock_refresh(dupe,group):
-            self.called = True
-            if self.app.selected_dupes:
-                self.assert_(dupe is self.app.selected_dupes[0])
-                self.assert_(group is self.app.results.get_group_of_duplicate(dupe))
-            else:
-                self.assert_(dupe is None)
-                self.assert_(group is None)
-        
-        self.app.RefreshDetailsTable = mock_refresh
-        self.called = False
-        self.app.SelectPowerMarkerNodePaths(r2np([0,2]))
-        self.app.RefreshDetailsWithSelected()
-        self.assert_(self.called)
-        self.called = False
-        self.app.SelectPowerMarkerNodePaths([])
-        self.app.RefreshDetailsWithSelected()
-        self.assert_(self.called)
-    
-    def test_makeSelectedReference(self):
-        app = self.app
-        objects = self.objects
-        groups = self.groups
-        app.SelectPowerMarkerNodePaths(r2np([0,2]))
-        app.MakeSelectedReference()
-        self.assert_(groups[0].ref is objects[1])
-        self.assert_(groups[1].ref is objects[4])
-    
-    def test_makeSelectedReference_by_selecting_two_dupes_in_the_same_group(self):
-        app = self.app
-        objects = self.objects
-        groups = self.groups
-        app.SelectPowerMarkerNodePaths(r2np([0,1,2]))
-        #Only 0 and 2 must go ref, not 1 because it is a part of the same group
-        app.MakeSelectedReference()
-        self.assert_(groups[0].ref is objects[1])
-        self.assert_(groups[1].ref is objects[4])
-    
-    def test_removeSelected(self):
-        app = self.app
-        app.SelectPowerMarkerNodePaths(r2np([0,2]))
-        app.RemoveSelected()
-        self.assertEqual(1,len(app.results.dupes))
-        app.RemoveSelected()
-        self.assertEqual(1,len(app.results.dupes))
-        app.SelectPowerMarkerNodePaths(r2np([0,2]))
-        app.RemoveSelected()
-        self.assertEqual(0,len(app.results.dupes))
-    
-    def test_addDirectory_simple(self):
-        # There's already a directory in self.app, so adding another once makes 2 of em
-        app = self.app
-        eq_(app.add_directory(self.datadirpath()), 0)
-        eq_(len(app.directories), 2)
-    
-    def test_addDirectory_already_there(self):
-        app = self.app
-        self.assertEqual(0,app.add_directory(self.datadirpath()))
-        self.assertEqual(1,app.add_directory(self.datadirpath()))
-    
-    def test_addDirectory_does_not_exist(self):
-        app = self.app
-        self.assertEqual(2,app.add_directory('/does_not_exist'))
-    
-    def test_ignore(self):
-        app = self.app
-        app.SelectPowerMarkerNodePaths(r2np([2])) #The dupe of the second, 2 sized group
-        app.AddSelectedToIgnoreList()
-        self.assertEqual(1,len(app.scanner.ignore_list))
-        app.SelectPowerMarkerNodePaths(r2np([0])) #first dupe of the 3 dupes group
-        app.AddSelectedToIgnoreList()
-        #BOTH the ref and the other dupe should have been added
-        self.assertEqual(3,len(app.scanner.ignore_list))
-    
-    def test_purgeIgnoreList(self):
-        app = self.app
-        p1 = self.filepath('zerofile')
-        p2 = self.filepath('zerofill')
-        dne = '/does_not_exist'
-        app.scanner.ignore_list.Ignore(dne,p1)
-        app.scanner.ignore_list.Ignore(p2,dne)
-        app.scanner.ignore_list.Ignore(p1,p2)
-        app.PurgeIgnoreList()
-        self.assertEqual(1,len(app.scanner.ignore_list))
-        self.assert_(app.scanner.ignore_list.AreIgnored(p1,p2))
-        self.assert_(not app.scanner.ignore_list.AreIgnored(dne,p1))
-    
-    def test_only_unicode_is_added_to_ignore_list(self):
-        def FakeIgnore(first,second):
-            if not isinstance(first,unicode):
-                self.fail()
-            if not isinstance(second,unicode):
-                self.fail()
-        
-        app = self.app
-        app.scanner.ignore_list.Ignore = FakeIgnore
-        app.SelectPowerMarkerNodePaths(r2np([2])) #The dupe of the second, 2 sized group
-        app.AddSelectedToIgnoreList()
-    
-    def test_GetOutlineViewChildCounts_out_of_range(self):
-        # Out of range requests don't crash and return an empty value
-        app = self.app
-        # [0, 2] is out of range
-        eq_(app.GetOutlineViewChildCounts(1, [0, 2]), []) # no crash
-    
-    def test_GetOutlineViewValues_out_of_range(self):
-        # Out of range requests don't crash and return an empty value
-        app = self.app
-        # [0, 2] is out of range
-        eq_(app.GetOutlineViewValues(1, [0, 2]), []) # no crash
-    
-
-class TCDupeGuru_renameSelected(TestCase):
-    def setUp(self):
-        p = self.tmppath()
-        fp = open(unicode(p + 'foo bar 1'),mode='w')
-        fp.close()
-        fp = open(unicode(p + 'foo bar 2'),mode='w')
-        fp.close()
-        fp = open(unicode(p + 'foo bar 3'),mode='w')
-        fp.close()
-        files = fs.get_files(p)
-        matches = engine.getmatches(files)
-        groups = engine.get_groups(matches)
-        g = groups[0]
-        g.prioritize(lambda x:x.name)
-        app = DupeGuru()
-        app.results.groups = groups
-        self.app = app
-        self.groups = groups
-        self.p = p
-        self.files = files
-    
-    def test_simple(self):
-        app = self.app
-        g = self.groups[0]
-        app.SelectPowerMarkerNodePaths(r2np([0]))
-        assert app.RenameSelected('renamed')
-        names = io.listdir(self.p)
-        assert 'renamed' in names
-        assert 'foo bar 2' not in names
-        eq_(g.dupes[0].name, 'renamed')
-    
-    def test_none_selected(self):
-        app = self.app
-        g = self.groups[0]
-        app.SelectPowerMarkerNodePaths([])
-        self.mock(logging, 'warning', log_calls(lambda msg: None))
-        assert not app.RenameSelected('renamed')
-        msg = logging.warning.calls[0]['msg']
-        eq_('dupeGuru Warning: list index out of range', msg)
-        names = io.listdir(self.p)
-        assert 'renamed' not in names
-        assert 'foo bar 2' in names
-        eq_(g.dupes[0].name, 'foo bar 2')
-    
-    def test_name_already_exists(self):
-        app = self.app
-        g = self.groups[0]
-        app.SelectPowerMarkerNodePaths(r2np([0]))
-        self.mock(logging, 'warning', log_calls(lambda msg: None))
-        assert not app.RenameSelected('foo bar 1')
-        msg = logging.warning.calls[0]['msg']
-        assert msg.startswith('dupeGuru Warning: \'foo bar 1\' already exists in')
-        names = io.listdir(self.p)
-        assert 'foo bar 1' in names
-        assert 'foo bar 2' in names
-        eq_(g.dupes[0].name, 'foo bar 2')
-    

base/py/tests/app_test.py

@@ -1,136 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2007-06-23
-# $Id$
-# Copyright 2009 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 os
-
-from hsutil.testcase import TestCase
-from hsutil import io
-from hsutil.path import Path
-from hsutil.decorators import log_calls
-import hsutil.files
-from hsutil.job import nulljob
-
-from . import data
-from .. import app, fs
-from ..app import DupeGuru as DupeGuruBase
-
-class DupeGuru(DupeGuruBase):
-    def __init__(self):
-        DupeGuruBase.__init__(self, data, '/tmp', appid=4)
-    
-    def _start_job(self, jobid, func):
-        func(nulljob)
-    
-
-class TCDupeGuru(TestCase):
-    cls_tested_module = app
-    def test_apply_filter_calls_results_apply_filter(self):
-        app = DupeGuru()
-        self.mock(app.results, 'apply_filter', log_calls(app.results.apply_filter))
-        app.apply_filter('foo')
-        self.assertEqual(2, len(app.results.apply_filter.calls))
-        call = app.results.apply_filter.calls[0]
-        self.assert_(call['filter_str'] is None)
-        call = app.results.apply_filter.calls[1]
-        self.assertEqual('foo', call['filter_str'])
-    
-    def test_apply_filter_escapes_regexp(self):
-        app = DupeGuru()
-        self.mock(app.results, 'apply_filter', log_calls(app.results.apply_filter))
-        app.apply_filter('()[]\\.|+?^abc')
-        call = app.results.apply_filter.calls[1]
-        self.assertEqual('\\(\\)\\[\\]\\\\\\.\\|\\+\\?\\^abc', call['filter_str'])
-        app.apply_filter('(*)') # In "simple mode", we want the * to behave as a wilcard
-        call = app.results.apply_filter.calls[3]
-        self.assertEqual('\(.*\)', call['filter_str'])
-        app.options['escape_filter_regexp'] = False
-        app.apply_filter('(abc)')
-        call = app.results.apply_filter.calls[5]
-        self.assertEqual('(abc)', call['filter_str'])
-    
-    def test_copy_or_move(self):
-        # The goal here is just to have a test for a previous blowup I had. I know my test coverage
-        # for this unit is pathetic. What's done is done. My approach now is to add tests for
-        # every change I want to make. The blowup was caused by a missing import.
-        p = self.tmppath()
-        io.open(p + 'foo', 'w').close()
-        self.mock(hsutil.files, 'copy', log_calls(lambda source_path, dest_path: None))
-        self.mock(os, 'makedirs', lambda path: None) # We don't want the test to create that fake directory
-        app = DupeGuru()
-        app.directories.add_path(p)
-        [f] = app.directories.get_files()
-        app.copy_or_move(f, True, 'some_destination', 0)
-        self.assertEqual(1, len(hsutil.files.copy.calls))
-        call = hsutil.files.copy.calls[0]
-        self.assertEqual('some_destination', call['dest_path'])
-        self.assertEqual(f.path, call['source_path'])
-    
-    def test_copy_or_move_clean_empty_dirs(self):
-        tmppath = Path(self.tmpdir())
-        sourcepath = tmppath + 'source'
-        io.mkdir(sourcepath)
-        io.open(sourcepath + 'myfile', 'w')
-        app = DupeGuru()
-        app.directories.add_path(tmppath)
-        [myfile] = app.directories.get_files()
-        self.mock(app, 'clean_empty_dirs', log_calls(lambda path: None))
-        app.copy_or_move(myfile, False, tmppath + 'dest', 0)
-        calls = app.clean_empty_dirs.calls
-        self.assertEqual(1, len(calls))
-        self.assertEqual(sourcepath, calls[0]['path'])
-    
-    def test_Scan_with_objects_evaluating_to_false(self):
-        class FakeFile(fs.File):
-            def __nonzero__(self):
-                return False
-            
-        
-        # At some point, any() was used in a wrong way that made Scan() wrongly return 1
-        app = DupeGuru()
-        f1, f2 = [FakeFile('foo') for i in range(2)]
-        f1.is_ref, f2.is_ref = (False, False)
-        assert not (bool(f1) and bool(f2))
-        app.directories.get_files = lambda: [f1, f2]
-        app.directories._dirs.append('this is just so Scan() doesnt return 3')
-        app.start_scanning() # no exception
-    
-
-class TCDupeGuru_clean_empty_dirs(TestCase):
-    cls_tested_module = app
-    def setUp(self):
-        self.mock(hsutil.files, 'delete_if_empty', log_calls(lambda path, files_to_delete=[]: None))
-        self.app = DupeGuru()
-    
-    def test_option_off(self):
-        self.app.clean_empty_dirs(Path('/foo/bar'))
-        self.assertEqual(0, len(hsutil.files.delete_if_empty.calls))
-    
-    def test_option_on(self):
-        self.app.options['clean_empty_dirs'] = True
-        self.app.clean_empty_dirs(Path('/foo/bar'))
-        calls = hsutil.files.delete_if_empty.calls
-        self.assertEqual(1, len(calls))
-        self.assertEqual(Path('/foo/bar'), calls[0]['path'])
-        self.assertEqual(['.DS_Store'], calls[0]['files_to_delete'])
-    
-    def test_recurse_up(self):
-        # delete_if_empty must be recursively called up in the path until it returns False
-        @log_calls
-        def mock_delete_if_empty(path, files_to_delete=[]):
-            return len(path) > 1
-        
-        self.mock(hsutil.files, 'delete_if_empty', mock_delete_if_empty)
-        self.app.options['clean_empty_dirs'] = True
-        self.app.clean_empty_dirs(Path('not-empty/empty/empty'))
-        calls = hsutil.files.delete_if_empty.calls
-        self.assertEqual(3, len(calls))
-        self.assertEqual(Path('not-empty/empty/empty'), calls[0]['path'])
-        self.assertEqual(Path('not-empty/empty'), calls[1]['path'])
-        self.assertEqual(Path('not-empty'), calls[2]['path'])
-    

base/qt/dg.qrc

@@ -1,16 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file alias="details">images/details32.png</file>
-    <file alias="logo_pe">images/dgpe_logo_32.png</file>
-    <file alias="logo_pe_big">images/dgpe_logo_128.png</file>
-    <file alias="logo_me">images/dgme_logo_32.png</file>
-    <file alias="logo_me_big">images/dgme_logo_128.png</file>
-    <file alias="logo_se">images/dgse_logo_32.png</file>
-    <file alias="logo_se_big">images/dgse_logo_128.png</file>
-    <file alias="folder">images/folderwin32.png</file>
-    <file alias="preferences">images/preferences32.png</file>
-    <file alias="actions">images/actions32.png</file>
-    <file alias="delta">images/delta32.png</file>
-    <file alias="power_marker">images/power_marker32.png</file>
-</qresource>
-</RCC>

base/qt/results_model.py

@@ -1,204 +0,0 @@
-# Created By: Virgil Dupras
-# Created On: 2009-04-23
-# $Id$
-# Copyright 2009 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
-
-from PyQt4.QtCore import SIGNAL, Qt, QAbstractItemModel, QModelIndex, QRect
-from PyQt4.QtGui import QBrush, QStyledItemDelegate, QFont, QTreeView, QColor
-
-from qtlib.tree_model import TreeNode, TreeModel
-
-class ResultNode(TreeNode):
-    def __init__(self, model, parent, row, dupe, group):
-        TreeNode.__init__(self, model, parent, row)
-        self.dupe = dupe
-        self.group = group
-        self._normalData = None
-        self._deltaData = None
-    
-    def _createNode(self, ref, row):
-        return ResultNode(self.model, self, row, ref, self.group)
-    
-    def _getChildren(self):
-        return self.group.dupes if self.dupe is self.group.ref else []
-    
-    def invalidate(self):
-        self._normalData = None
-        self._deltaData = None
-        TreeNode.invalidate(self)
-    
-    @property
-    def normalData(self):
-        if self._normalData is None:
-            self._normalData = self.model._app._get_display_info(self.dupe, self.group, delta=False)
-        return self._normalData
-    
-    @property
-    def deltaData(self):
-        if self._deltaData is None:
-            self._deltaData = self.model._app._get_display_info(self.dupe, self.group, delta=True)
-        return self._deltaData
-    
-
-class ResultsDelegate(QStyledItemDelegate):
-    def initStyleOption(self, option, index):
-        QStyledItemDelegate.initStyleOption(self, option, index)
-        node = index.internalPointer()
-        if node.group.ref is node.dupe:
-            newfont = QFont(option.font)
-            newfont.setBold(True)
-            option.font = newfont
-    
-
-class ResultsModel(TreeModel):
-    def __init__(self, app):
-        self._app = app
-        self._results = app.results
-        self._data = app.data
-        self._delta_columns = app.DELTA_COLUMNS
-        self.delta = False
-        self._power_marker = False
-        TreeModel.__init__(self)
-    
-    def _createNode(self, ref, row):
-        if self.power_marker:
-            # ref is a dupe
-            group = self._results.get_group_of_duplicate(ref)
-            return ResultNode(self, None, row, ref, group)
-        else:
-            # ref is a group
-            return ResultNode(self, None, row, ref.ref, ref)
-    
-    def _getChildren(self):
-        return self._results.dupes if self.power_marker else self._results.groups
-    
-    def columnCount(self, parent):
-        return len(self._data.COLUMNS)
-    
-    def data(self, index, role):
-        if not index.isValid():
-            return None
-        node = index.internalPointer()
-        if role == Qt.DisplayRole:
-            data = node.deltaData if self.delta else node.normalData
-            return data[index.column()]
-        elif role == Qt.CheckStateRole:
-            if index.column() == 0 and node.dupe is not node.group.ref:
-                state = Qt.Checked if self._results.is_marked(node.dupe) else Qt.Unchecked
-                return state
-        elif role == Qt.ForegroundRole:
-            if node.dupe is node.group.ref or node.dupe.is_ref:
-                return QBrush(Qt.blue)
-            elif self.delta and index.column() in self._delta_columns:
-                return QBrush(QColor(255, 142, 40)) # orange
-        elif role == Qt.EditRole:
-            if index.column() == 0:
-                return node.normalData[index.column()]
-        return None
-    
-    def dupesForIndexes(self, indexes):
-        nodes = [index.internalPointer() for index in indexes]
-        return [node.dupe for node in nodes]
-    
-    def indexesForDupes(self, dupes):
-        def index(dupe):
-            try:
-                if self.power_marker:
-                    row = self._results.dupes.index(dupe)
-                    node = self.subnodes[row]
-                    assert node.dupe is dupe
-                    return self.createIndex(row, 0, node)
-                else:
-                    group = self._results.get_group_of_duplicate(dupe)
-                    row = self._results.groups.index(group)
-                    node = self.subnodes[row]
-                    if dupe is group.ref:
-                        assert node.dupe is dupe
-                        return self.createIndex(row, 0, node)
-                    subrow = group.dupes.index(dupe)
-                    subnode = node.subnodes[subrow]
-                    assert subnode.dupe is dupe
-                    return self.createIndex(subrow, 0, subnode)
-            except ValueError: # the dupe is not there anymore
-                return QModelIndex()
-        
-        return map(index, dupes)
-    
-    def flags(self, index):
-        if not index.isValid():
-            return Qt.ItemIsEnabled
-        flags = Qt.ItemIsEnabled | Qt.ItemIsSelectable
-        if index.column() == 0:
-            flags |= Qt.ItemIsUserCheckable | Qt.ItemIsEditable
-        return flags
-    
-    def headerData(self, section, orientation, role):
-        if orientation == Qt.Horizontal and role == Qt.DisplayRole and section < len(self._data.COLUMNS):
-            return self._data.COLUMNS[section]['display']
-        return None
-    
-    def setData(self, index, value, role):
-        if not index.isValid():
-            return False
-        node = index.internalPointer()
-        if role == Qt.CheckStateRole:
-            if index.column() == 0:
-                self._app.toggle_marking_for_dupes([node.dupe])
-                return True
-        if role == Qt.EditRole:
-            if index.column() == 0:
-                value = unicode(value.toString())
-                if self._app.rename_dupe(node.dupe, value):
-                    node.invalidate()
-                    return True
-        return False
-    
-    def sort(self, column, order):
-        if self.power_marker:
-            self._results.sort_dupes(column, order == Qt.AscendingOrder, self.delta)
-        else:
-            self._results.sort_groups(column, order == Qt.AscendingOrder)
-        self.reset()
-    
-    def toggleMarked(self, indexes):
-        assert indexes
-        dupes = self.dupesForIndexes(indexes)
-        self._app.toggle_marking_for_dupes(dupes)
-    
-    #--- Properties
-    @property
-    def power_marker(self):
-        return self._power_marker
-    
-    @power_marker.setter
-    def power_marker(self, value):
-        if value == self._power_marker:
-            return
-        self._power_marker = value
-        self.reset()
-    
-
-class ResultsView(QTreeView):
-    #--- Override
-    def keyPressEvent(self, event):
-        if event.text() == ' ':
-            self.model().toggleMarked(self.selectionModel().selectedRows())
-            return
-        QTreeView.keyPressEvent(self, event)
-    
-    def mouseDoubleClickEvent(self, event):
-        self.emit(SIGNAL('doubleClicked()'))
-        # We don't call the superclass' method because the default behavior is to rename the cell.
-    
-    def setModel(self, model):
-        assert isinstance(model, ResultsModel)
-        QTreeView.setModel(self, model)
-    
-    #--- Public
-    def selectedDupes(self):
-        return self.model().dupesForIndexes(self.selectionModel().selectedRows())
-    

build.py

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2009-12-30
+# 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 sys
+import os
+import os.path as op
+import shutil
+
+from setuptools import setup
+import yaml
+
+from hsdocgen import generate_help, filters
+from hsutil.build import add_to_pythonpath, print_and_do, build_all_qt_ui, copy_packages
+
+def build_cocoa(edition, dev, help_destpath):
+    if not dev:
+        print "Building help index"
+        os.system('open -a /Developer/Applications/Utilities/Help\\ Indexer.app {0}'.format(help_destpath))
+    
+    print "Building dg_cocoa.plugin"
+    if op.exists('build'):
+        shutil.rmtree('build')
+    os.mkdir('build')
+    if not dev:
+        specific_packages = {
+            'se': ['core_se'],
+            'me': ['core_me', 'hsmedia'],
+            'pe': ['core_pe'],
+        }[edition]
+        copy_packages(['core', 'hsutil'] + specific_packages, 'build')
+    cocoa_project_path = 'cocoa/{0}'.format(edition)
+    shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
+    os.chdir('build')
+    script_args = ['py2app', '-A'] if dev else ['py2app']
+    setup(
+        script_args = script_args,
+        plugin = ['dg_cocoa.py'],
+        setup_requires = ['py2app'],
+    )
+    os.chdir('..')
+    pluginpath = op.join(cocoa_project_path, 'dg_cocoa.plugin')
+    if op.exists(pluginpath):
+        shutil.rmtree(pluginpath)
+    shutil.move('build/dist/dg_cocoa.plugin', pluginpath)
+    if dev:
+        # In alias mode, the tweakings we do to the pythonpath aren't counted in. We have to
+        # manually put a .pth in the plugin
+        pthpath = op.join(pluginpath, 'Contents/Resources/dev.pth')
+        open(pthpath, 'w').write(op.abspath('.'))
+    os.chdir(cocoa_project_path)
+    print "Building the XCode project"
+    args = []
+    if dev:
+        args.append('-configuration dev')
+    else:
+        args.append('-configuration release')
+    args = ' '.join(args)
+    os.system('xcodebuild {0}'.format(args))
+    os.chdir('..')
+
+def build_qt(edition, dev):
+    build_all_qt_ui(op.join('qtlib', 'ui'))
+    build_all_qt_ui(op.join('qt', 'base'))
+    build_all_qt_ui(op.join('qt', edition))
+    print_and_do("pyrcc4 {0} > {1}".format(op.join('qt', 'base', 'dg.qrc'), op.join('qt', 'base', 'dg_rc.py')))
+    if edition == 'pe':
+        os.chdir(op.join('qt', edition))
+        os.system('python gen.py')
+        os.chdir(op.join('..', '..'))
+
+def main():
+    conf = yaml.load(open('conf.yaml'))
+    edition = conf['edition']
+    ui = conf['ui']
+    dev = conf['dev']
+    print "Building dupeGuru {0} with UI {1}".format(edition.upper(), ui)
+    if dev:
+        print "Building in Dev mode"
+    add_to_pythonpath('.')
+    print "Generating Help"
+    windows = sys.platform == 'win32'
+    tix = filters.tixgen("https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}")
+    help_dir = 'help_{0}'.format(edition)
+    dest_dir = 'dupeguru_{0}_help'.format(edition) if edition != 'se' else 'dupeguru_help'
+    help_basepath = op.abspath(help_dir)
+    help_destpath = op.abspath(op.join(help_dir, dest_dir))
+    generate_help.main(help_basepath, help_destpath, force_render=not dev, tix=tix, windows=windows)
+    
+    print "Building dupeGuru"
+    if edition == 'pe':
+        os.chdir('core_pe')
+        os.system('python gen.py')
+        os.chdir('..')
+    if ui == 'cocoa':
+        build_cocoa(edition, dev, help_destpath)
+    elif ui == 'qt':
+        build_qt(edition, dev)
+
+if __name__ == '__main__':
+    main()

cocoa/base/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -11,6 +11,7 @@ http://www.hardcoded.net/licenses/hs_license
 #import "PyDupeGuru.h"
 #import "ResultWindow.h"
 #import "DetailsPanel.h"
+#import "DirectoryPanel.h"
 
 @interface AppDelegateBase : NSObject
 {
@@ -19,12 +20,15 @@ http://www.hardcoded.net/licenses/hs_license
     IBOutlet NSMenuItem *unlockMenuItem;
     IBOutlet ResultWindowBase *result;
     
-    NSString *_appName;
-    DetailsPanelBase *_detailsPanel;
+    DirectoryPanel *_directoryPanel;
+    DetailsPanel *_detailsPanel;
+    BOOL _savedResults;
 }
 - (IBAction)unlockApp:(id)sender;
 
 - (PyDupeGuruBase *)py;
 - (RecentDirectories *)recentDirectories;
-- (DetailsPanelBase *)detailsPanel; // Virtual
+- (DirectoryPanel *)directoryPanel;
+- (DetailsPanel *)detailsPanel;
+- (void)saveResults;
 @end

cocoa/base/AppDelegate.m

@@ -0,0 +1,117 @@
+/* 
+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 "AppDelegate.h"
+#import "ProgressController.h"
+#import "RegistrationInterface.h"
+#import "Utils.h"
+#import "Consts.h"
+#import <Sparkle/SUUpdater.h>
+
+@implementation AppDelegateBase
+- (IBAction)unlockApp:(id)sender
+{
+    if ([[self py] isRegistered])
+        return;
+    RegistrationInterface *ri = [[RegistrationInterface alloc] initWithApp:[self py]];
+    if ([ri enterCode] == NSOKButton)
+    {
+        NSString *menuTitle = [NSString stringWithFormat:@"Thanks for buying %@!",[py appName]];
+        [unlockMenuItem setTitle:menuTitle];
+    }
+    [ri release];
+}
+
+- (PyDupeGuruBase *)py { return py; }
+- (RecentDirectories *)recentDirectories { return recentDirectories; }
+- (DirectoryPanel *)directoryPanel
+{
+    if (!_directoryPanel)
+        _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self];
+    return _directoryPanel;
+}
+
+- (DetailsPanel *)detailsPanel
+{
+    if (!_detailsPanel)
+        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
+    return _detailsPanel;
+}
+
+- (void)saveResults
+{
+    if (_savedResults) {
+        return;
+    }
+    [py saveIgnoreList];
+    [py saveResults];
+    _savedResults = YES;
+}
+
+/* Delegate */
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+    [[ProgressController mainProgressController] setWorker:py];
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    //Restore Columns
+    NSArray *columnsOrder = [ud arrayForKey:@"columnsOrder"];
+    NSDictionary *columnsWidth = [ud dictionaryForKey:@"columnsWidth"];
+    if ([columnsOrder count])
+        [result restoreColumnsPosition:columnsOrder widths:columnsWidth];
+    else
+        [result resetColumnsToDefault:nil];
+    //Reg stuff
+    if ([RegistrationInterface showNagWithApp:[self py]])
+        [unlockMenuItem setTitle:[NSString stringWithFormat:@"Thanks for buying %@!",[py appName]]];
+    //Restore results
+    [py loadIgnoreList];
+    [py loadResults];
+    _savedResults = NO;
+}
+
+- (void)applicationWillBecomeActive:(NSNotification *)aNotification
+{
+    if (![[result window] isVisible])
+        [result showWindow:NSApp];
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [ud setObject: [result getColumnsOrder] forKey:@"columnsOrder"];
+    [ud setObject: [result getColumnsWidth] forKey:@"columnsWidth"];
+    [self saveResults];
+    NSInteger sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
+    if (sc >= 10)
+    {
+        sc = -1;
+        [py purgeIgnoreList];
+    }
+    sc++;
+    [ud setInteger:sc forKey:@"sessionCountSinceLastIgnorePurge"];
+    // NSApplication does not release nib instances objects, we must do it manually
+    // Well, it isn't needed because the memory is freed anyway (we are quitting the application
+    // But I need to release RecentDirectories so it saves the user defaults
+    [recentDirectories release];
+}
+
+- (void)recentDirecoryClicked:(NSString *)directory
+{
+    [[self directoryPanel] addDirectory:directory];
+}
+
+/* SUUpdater delegate */
+
+- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation;
+{
+    /* If results aren't saved now, we might get a weird utf-8 lookup error when saving later.
+    **/
+    [self saveResults];
+    return NO;
+}
+@end

cocoa/base/Consts.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>
+
+#define RegistrationRequired @"RegistrationRequired"
+#define JobStarted @"JobStarted"
+#define JobInProgress @"JobInProgress"
+
+#define jobLoad @"job_load"
+#define jobScan @"job_scan"
+#define jobCopy @"job_copy"
+#define jobMove @"job_move"
+#define jobDelete @"job_delete"

cocoa/base/DetailsPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,19 +7,19 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
+#import "HSWindowController.h"
 #import "PyApp.h"
-#import "Table.h"
+#import "PyDetailsPanel.h"
 
-
-@interface DetailsPanelBase : NSWindowController
+@interface DetailsPanel : HSWindowController
 {
-    IBOutlet TableView *detailsTable;
+    IBOutlet NSTableView *detailsTable;
 }
 - (id)initWithPy:(PyApp *)aPy;
+- (PyDetailsPanel *)py;
 
-- (void)refresh;
 - (void)toggleVisibility;
 
-/* Notifications */
-- (void)duplicateSelectionChanged:(NSNotification *)aNotification;
+/* Python --> Cocoa */
+- (void)refresh;
 @end

cocoa/base/DetailsPanel.m

@@ -0,0 +1,66 @@
+/* 
+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 "DetailsPanel.h"
+#import "Utils.h"
+
+@implementation DetailsPanel
+- (id)initWithPy:(PyApp *)aPy
+{
+    self = [super initWithNibName:@"DetailsPanel" pyClassName:@"PyDetailsPanel" pyParent:aPy];
+    [self window]; //So the detailsTable is initialized.
+    [self connect];
+    return self;
+}
+
+- (void)dealloc
+{
+    [self disconnect];
+    [super dealloc];
+}
+
+- (PyDetailsPanel *)py
+{
+    return (PyDetailsPanel *)py;
+}
+
+- (void)refreshDetails
+{
+    [detailsTable reloadData];
+}
+
+- (void)toggleVisibility
+{
+    if ([[self window] isVisible]) {
+        [[self window] close];
+    }
+    else {
+        [self refreshDetails]; // selection might have changed since last time
+        [[self window] orderFront:nil];
+    }
+}
+
+/* NSTableView Delegate */
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
+{
+    return [[self py] numberOfRows];
+}
+
+- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row
+{
+    return [[self py] valueForColumn:[column identifier] row:row];
+}
+
+/* Python --> Cocoa */
+- (void)refresh
+{
+    if ([[self window] isVisible]) {
+        [self refreshDetails];
+    }
+}
+@end

cocoa/base/DirectoryOutline.h

@@ -0,0 +1,16 @@
+/* 
+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 "PyDirectoryOutline.h"
+
+@interface DirectoryOutline : HSOutline {}
+- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView;
+- (PyDirectoryOutline *)py;
+@end;

cocoa/base/DirectoryOutline.m

@@ -0,0 +1,84 @@
+/* 
+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 "DirectoryOutline.h"
+
+@implementation DirectoryOutline
+- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView
+{
+    self = [super initWithPyClassName:@"PyDirectoryOutline" pyParent:aPyParent view:aOutlineView];
+    [outlineView registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
+    [self connect];
+    return self;
+}
+
+- (void)dealloc
+{
+    [self disconnect];
+    [super dealloc];
+}
+
+- (PyDirectoryOutline *)py
+{
+    return (PyDirectoryOutline *)py;
+}
+
+/* Delegate */
+- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id < NSDraggingInfo >)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
+{
+    NSPasteboard *pboard;
+    NSDragOperation sourceDragMask;
+    sourceDragMask = [info draggingSourceOperationMask];
+    pboard = [info draggingPasteboard];
+    if ([[pboard types] containsObject:NSFilenamesPboardType]) {
+        if (sourceDragMask & NSDragOperationLink)
+            return NSDragOperationLink;
+    }
+    return NSDragOperationNone;    
+}
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id < NSDraggingInfo >)info item:(id)item childIndex:(NSInteger)index
+{
+    NSPasteboard *pboard;
+    NSDragOperation sourceDragMask; 
+    sourceDragMask = [info draggingSourceOperationMask];
+    pboard = [info draggingPasteboard];
+    if ([[pboard types] containsObject:NSFilenamesPboardType]) {
+        NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
+        if (!(sourceDragMask & NSDragOperationLink))
+            return NO;
+        for (NSString *filename in filenames) {
+            [[self py] addDirectory:filename];
+        }
+    }
+    return YES;
+}
+
+- (void)outlineView:(NSOutlineView *)aOutlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{ 
+    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
+        NSTextFieldCell *textCell = cell;
+        NSIndexPath *path = item;
+        BOOL selected = [path isEqualTo:[outlineView selectedPath]];
+        if (selected) {
+            [textCell setTextColor:[NSColor blackColor]];
+            return;
+        }
+        NSInteger state = [self intProperty:@"state" valueAtPath:path];
+        if (state == 1) {
+            [textCell setTextColor:[NSColor blueColor]];
+        }
+        else if (state == 2) {
+            [textCell setTextColor:[NSColor redColor]];
+        }
+        else {
+            [textCell setTextColor:[NSColor blackColor]];
+        }
+    }
+}
+@end

cocoa/base/DirectoryPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -8,31 +8,23 @@ http://www.hardcoded.net/licenses/hs_license
 
 #import <Cocoa/Cocoa.h>
 #import "RecentDirectories.h"
-#import "Outline.h"
+#import "HSOutlineView.h"
+#import "DirectoryOutline.h"
 #import "PyDupeGuru.h"
 
-@interface DirectoryOutline : OutlineView
-{
-}
-@end
-
-@protocol DirectoryOutlineDelegate
-- (void)outlineView:(NSOutlineView *)outlineView addDirectory:(NSString *)directory;
-@end
-
-@interface DirectoryPanelBase : NSWindowController
+@interface DirectoryPanel : NSWindowController
 {
     IBOutlet NSPopUpButton *addButtonPopUp;
-    IBOutlet DirectoryOutline *directories;
+    IBOutlet HSOutlineView *outlineView;
     IBOutlet NSButton *removeButton;
     
     PyDupeGuruBase *_py;
     RecentDirectories *_recentDirectories;
+    DirectoryOutline *outline;
 }
 - (id)initWithParentApp:(id)aParentApp;
 
 - (IBAction)askForDirectory:(id)sender;
-- (IBAction)changeDirectoryState:(id)sender;
 - (IBAction)popupAddDirectoryMenu:(id)sender;
 - (IBAction)removeSelectedDirectory:(id)sender;
 - (IBAction)toggleVisible:(id)sender;

cocoa/base/DirectoryPanel.m

@@ -0,0 +1,142 @@
+/* 
+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 "DirectoryPanel.h"
+#import "Dialogs.h"
+#import "Utils.h"
+#import "AppDelegate.h"
+
+@implementation DirectoryPanel
+- (id)initWithParentApp:(id)aParentApp
+{
+    self = [super initWithWindowNibName:@"DirectoryPanel"];
+    [self window];
+    AppDelegateBase *app = aParentApp;
+    _py = [app py];
+    _recentDirectories = [app recentDirectories];
+    outline = [[DirectoryOutline alloc] initWithPyParent:_py view:outlineView];
+    [self refreshRemoveButtonText];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(directorySelectionChanged:)
+        name:NSOutlineViewSelectionDidChangeNotification object:outlineView];
+    return self;
+}
+
+- (void)dealloc
+{
+    [outline release];
+    [super dealloc];
+}
+
+/* Actions */
+
+- (IBAction)askForDirectory:(id)sender
+{
+    NSOpenPanel *op = [NSOpenPanel openPanel];
+    [op setCanChooseFiles:YES];
+    [op setCanChooseDirectories:YES];
+    [op setAllowsMultipleSelection:NO];
+    [op setTitle:@"Select a directory to add to the scanning list"];
+    [op setDelegate:self];
+    if ([op runModalForTypes:nil] == NSOKButton)
+    {
+        NSString *directory = [[op filenames] objectAtIndex:0];
+        [self addDirectory:directory];
+    }
+}
+
+- (IBAction)popupAddDirectoryMenu:(id)sender
+{
+    if ([[_recentDirectories directories] count] == 0)
+    {
+        [self askForDirectory:sender];
+        return;
+    }
+    NSMenu *m = [addButtonPopUp menu];
+    while ([m numberOfItems] > 0)
+        [m removeItemAtIndex:0];
+    NSMenuItem *mi = [m addItemWithTitle:@"Add New Directory..." action:@selector(askForDirectory:) keyEquivalent:@""];
+    [mi setTarget:self];
+    [m addItem:[NSMenuItem separatorItem]];
+    [_recentDirectories fillMenu:m];
+    [addButtonPopUp selectItem:nil];
+    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+}
+
+- (IBAction)removeSelectedDirectory:(id)sender
+{
+    [[self window] makeKeyAndOrderFront:nil];
+    if ([outlineView selectedRow] < 0)
+        return;
+    NSIndexPath *path = [outline selectedIndexPath];
+    NSInteger state = [outline intProperty:@"state" valueAtPath:path];
+    if (([path length] == 1) && (state != 2)) {
+        [_py removeDirectory:i2n([path indexAtPosition:0])];
+    }
+    else {
+        NSInteger newState = state == 2 ? 0 : 2; // If excluded, put it back
+        [outline setIntProperty:@"state" value:newState atPath:path];
+        [outlineView display];
+    }
+    [self refreshRemoveButtonText];
+}
+
+- (IBAction)toggleVisible:(id)sender
+{
+    [[self window] makeKeyAndOrderFront:nil];
+}
+
+/* Public */
+- (void)addDirectory:(NSString *)directory
+{
+    NSInteger r = [[_py addDirectory:directory] intValue];
+    if (r) {
+        NSString *m;
+        switch (r) {
+            case 1: {
+                m = @"This directory already is in the list.";
+                break;
+            }
+            case 2: {
+                m = @"This directory does not exist.";
+                break;
+            }
+        }
+        [Dialogs showMessage:m];
+    }
+    [_recentDirectories addDirectory:directory];
+    [[self window] makeKeyAndOrderFront:nil];
+}
+
+- (void)refreshRemoveButtonText
+{
+    if ([outlineView selectedRow] < 0) {
+        [removeButton setEnabled:NO];
+        return;
+    }
+    [removeButton setEnabled:YES];
+    NSInteger state = [outline intProperty:@"state" valueAtPath:[outline selectedIndexPath]];
+    NSString *buttonText = state == 2 ? @"Put Back" : @"Remove";
+    [removeButton setTitle:buttonText];
+}
+
+/* Delegate */
+- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)path
+{
+    BOOL isdir;
+    [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isdir];
+    return isdir;
+}
+
+/* Notifications */
+
+- (void)directorySelectionChanged:(NSNotification *)aNotification
+{
+    [self refreshRemoveButtonText];
+}
+
+@end

cocoa/base/PyDetailsPanel.h

@@ -0,0 +1,15 @@
+/* 
+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 "PyGUI.h"
+
+@interface PyDetailsPanel : PyGUI
+- (NSInteger)numberOfRows;
+- (id)valueForColumn:(NSString *)column row:(NSInteger)row;
+@end

cocoa/base/PyDirectoryOutline.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,8 +7,8 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DetailsPanel.h"
+#import "PyOutline.h"
 
-
-@interface DetailsPanel : DetailsPanelBase
+@interface PyDirectoryOutline : PyOutline
+- (void)addDirectory:(NSString *)directoryPath;
 @end

cocoa/base/PyDupeGuru.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -13,7 +13,6 @@ http://www.hardcoded.net/licenses/hs_license
 //Actions
 - (NSNumber *)addDirectory:(NSString *)name;
 - (void)removeDirectory:(NSNumber *)index;
-- (void)setDirectory:(NSArray *)indexPath state:(NSNumber *)state;
 - (void)loadResults;
 - (void)saveResults;
 - (void)loadIgnoreList;
@@ -24,28 +23,17 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (NSNumber *)doScan;
 
-- (NSArray *)selectedPowerMarkerNodePaths;
-- (void)selectPowerMarkerNodePaths:(NSArray *)aIndexPaths;
-- (NSArray *)selectedResultNodePaths;
-- (void)selectResultNodePaths:(NSArray *)aIndexPaths;
-
 - (void)toggleSelectedMark;
 - (void)markAll;
 - (void)markInvert;
 - (void)markNone;
 
 - (void)addSelectedToIgnoreList;
-- (void)refreshDetailsWithSelected;
-- (void)removeSelected;
 - (void)openSelected;
-- (NSNumber *)renameSelected:(NSString *)aNewName;
 - (void)revealSelected;
 - (void)makeSelectedReference;
 - (void)applyFilter:(NSString *)filter;
 
-- (void)sortGroupsBy:(NSNumber *)aIdentifier ascending:(NSNumber *)aAscending;
-- (void)sortDupesBy:(NSNumber *)aIdentifier ascending:(NSNumber *)aAscending;
-
 - (void)copyOrMove:(NSNumber *)aCopy markedTo:(NSString *)destination recreatePath:(NSNumber *)aRecreateType;
 - (void)deleteMarked;
 - (void)removeMarked;
@@ -53,14 +41,12 @@ http://www.hardcoded.net/licenses/hs_license
 //Data
 - (NSNumber *)getIgnoreListCount;
 - (NSNumber *)getMarkCount;
-- (NSString *)getStatLine;
 - (NSNumber *)getOperationalErrorCount;
 
 //Scanning options
 - (void)setMinMatchPercentage:(NSNumber *)percentage;
 - (void)setMixFileKind:(NSNumber *)mix_file_kind;
-- (void)setDisplayDeltaValues:(NSNumber *)display_delta_values;
 - (void)setEscapeFilterRegexp:(NSNumber *)escape_filter_regexp;
 - (void)setRemoveEmptyFolders:(NSNumber *)remove_empty_folders;
-- (void)setSizeThreshold:(int)size_threshold;
+- (void)setSizeThreshold:(NSInteger)size_threshold;
 @end

cocoa/base/PyResultTree.h

@@ -0,0 +1,24 @@
+/* 
+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
+- (BOOL)powerMarkerMode;
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
+- (BOOL)deltaValuesMode;
+- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
+
+- (NSString *)valueForPath:(NSArray *)aPath column:(NSInteger)aColumn;
+- (BOOL)renameSelected:(NSString *)aNewName;
+- (void)sortBy:(NSInteger)aIdentifier ascending:(BOOL)aAscending;
+- (void)markSelected;
+- (void)removeSelected;
+- (NSArray *)rootChildrenCounts;
+@end

cocoa/base/PyStatsLabel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,8 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DetailsPanel.h"
+#import "PyGUI.h"
 
-@interface DetailsPanel : DetailsPanelBase
+@interface PyStatsLabel : PyGUI
+- (NSString *)display;
 @end

cocoa/base/ResultOutline.h

@@ -0,0 +1,26 @@
+/* 
+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
+{
+    NSIndexSet *_deltaColumns;
+    NSArray *_rootChildrenCounts;
+}
+- (PyResultTree *)py;
+- (BOOL)powerMarkerMode;
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
+- (BOOL)deltaValuesMode;
+- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
+- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns;
+- (NSInteger)selectedDupeCount;
+- (void)removeSelected;
+@end;

cocoa/base/ResultOutline.m

@@ -0,0 +1,207 @@
+/* 
+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];
+    _rootChildrenCounts = nil;
+    [self connect];
+    return self;
+}
+
+- (void)dealloc
+{
+    [self disconnect];
+    [_deltaColumns release];
+    [super dealloc];
+}
+
+- (PyResultTree *)py
+{
+    return (PyResultTree *)py;
+}
+
+/* Public */
+- (BOOL)powerMarkerMode
+{
+    return [[self py] powerMarkerMode];
+}
+
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode
+{
+    [[self py] setPowerMarkerMode:aPowerMarkerMode];
+}
+
+- (BOOL)deltaValuesMode
+{
+    return [[self py] deltaValuesMode];
+}
+
+- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode
+{
+    [[self py] setDeltaValuesMode:aDeltaValuesMode];
+}
+
+- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns
+{
+    [_deltaColumns release];
+    _deltaColumns = [aDeltaColumns retain];
+}
+
+- (NSInteger)selectedDupeCount
+{
+    NSArray *selected = [self selectedIndexPaths];
+    if ([self powerMarkerMode]) {
+        return [selected count];
+    }
+    else {
+        NSInteger r = 0;
+        for (NSIndexPath *path in selected) {
+            if ([path length] == 2) {
+                r++;
+            }
+        }
+        return r;
+    }
+}
+
+- (void)removeSelected
+{
+    NSInteger selectedDupeCount = [self selectedDupeCount];
+    if (!selectedDupeCount)
+        return;
+    NSString *msg = [NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",selectedDupeCount];
+    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
+        return;
+    [[self py] removeSelected];
+}
+
+/* Datasource */
+- (NSInteger)outlineView:(NSOutlineView *)aOutlineView numberOfChildrenOfItem:(id)item
+{
+    NSIndexPath *path = item;
+    if ((path != nil) && ([path length] == 1)) {
+        if (_rootChildrenCounts == nil) {
+            _rootChildrenCounts = [[[self py] rootChildrenCounts] retain];
+        }
+        NSInteger index = [path indexAtPosition:0];
+        return n2i([_rootChildrenCounts objectAtIndex:index]);
+    }
+    return [super outlineView:aOutlineView numberOfChildrenOfItem:item];
+}
+
+- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)column byItem:(id)item
+{
+    NSIndexPath *path = item;
+    NSString *identifier = [column identifier];
+    if ([identifier isEqual:@"marked"]) {
+        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"]) {
+        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) {
+                [Dialogs showMessage:[NSString stringWithFormat:@"The name '%@' already exists.", newName]];
+            }
+            else {
+                [self refreshItemAtPath:path];
+            }
+        }
+    }
+    else {
+        [super outlineView:aOutlineView setObjectValue:object forTableColumn:tableColumn byItem:item];
+    }
+}
+
+/* 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:@"marked"]) {
+        [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 (([self deltaValuesMode]) && ([self powerMarkerMode] || ([path length] > 1))) {
+            NSInteger i = [[tableColumn identifier] integerValue];
+            if ([_deltaColumns containsIndex:i]) {
+                [textCell setTextColor:[NSColor orangeColor]];
+            }
+        }
+    }
+}
+
+- (BOOL)tableViewHadDeletePressed:(NSTableView *)tableView
+{
+    [self removeSelected];
+    return YES;
+}
+
+- (BOOL)tableViewHadSpacePressed:(NSTableView *)tableView
+{
+    [[self py] markSelected];
+    return YES;
+}
+
+/* don't calls saveEdits and cancelEdits */
+- (void)outlineViewDidEndEditing:(HSOutlineView *)outlineView
+{
+}
+
+- (void)outlineViewCancelsEdition:(HSOutlineView *)outlineView
+{
+}
+
+/* Python --> Cocoa */
+- (void)refresh /* Override */
+{
+    [_rootChildrenCounts release];
+    _rootChildrenCounts = nil;
+    [super refresh];
+    [outlineView expandItem:nil expandChildren:YES];
+}
+
+- (void)invalidateMarkings
+{
+    for (NSMutableDictionary *props in [itemData objectEnumerator]) {
+        [props removeObjectForKey:@"marked"];
+    }
+    [outlineView setNeedsDisplay:YES];
+}
+@end

cocoa/base/ResultWindow.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,54 +7,62 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "Outline.h"
+#import "HSOutlineView.h"
+#import "StatsLabel.h"
+#import "ResultOutline.h"
 #import "PyDupeGuru.h"
 
-@interface MatchesView : OutlineView
-- (void)keyDown:(NSEvent *)theEvent;
-@end
-
 @interface ResultWindowBase : NSWindowController
 {
 @protected
     IBOutlet PyDupeGuruBase *py;
     IBOutlet id app;
     IBOutlet NSSegmentedControl *deltaSwitch;
-    IBOutlet MatchesView *matches;
+    IBOutlet HSOutlineView *matches;
 	IBOutlet NSSegmentedControl *pmSwitch;
 	IBOutlet NSTextField *stats;
 	IBOutlet NSMenu *columnsMenu;
+	IBOutlet NSSearchField *filterField;
     
-    BOOL _powerMode;
-    BOOL _displayDelta;
     NSMutableArray *_resultColumns;
     NSWindowController *preferencesPanel;
+    ResultOutline *outline;
+    StatsLabel *statsLabel;
 }
 /* Helpers */
 - (void)fillColumnsMenu;
-- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn;
+- (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)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;
 
 /* Actions */
+- (IBAction)clearIgnoreList:(id)sender;
 - (IBAction)changeDelta:(id)sender;
 - (IBAction)changePowerMarker:(id)sender;
 - (IBAction)copyMarked:(id)sender;
 - (IBAction)deleteMarked:(id)sender;
-- (IBAction)expandAll:(id)sender;
 - (IBAction)exportToXHTML:(id)sender;
+- (IBAction)filter:(id)sender;
+- (IBAction)ignoreSelected:(id)sender;
+- (IBAction)markAll:(id)sender;
+- (IBAction)markInvert:(id)sender;
+- (IBAction)markNone:(id)sender;
+- (IBAction)markSelected:(id)sender;
 - (IBAction)moveMarked:(id)sender;
+- (IBAction)openClicked:(id)sender;
+- (IBAction)openSelected:(id)sender;
+- (IBAction)removeMarked:(id)sender;
+- (IBAction)removeSelected:(id)sender;
+- (IBAction)renameSelected:(id)sender;
 - (IBAction)resetColumnsToDefault:(id)sender;
+- (IBAction)revealSelected:(id)sender;
 - (IBAction)showPreferencesPanel:(id)sender;
+- (IBAction)startDuplicateScan:(id)sender;
 - (IBAction)switchSelected:(id)sender;
 - (IBAction)toggleColumn:(id)sender;
+- (IBAction)toggleDelta:(id)sender;
 - (IBAction)toggleDetailsPanel:(id)sender;
 - (IBAction)togglePowerMarker:(id)sender;
 

cocoa/base/ResultWindow.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -14,56 +14,29 @@ http://www.hardcoded.net/licenses/hs_license
 #import "AppDelegate.h"
 #import "Consts.h"
 
-@implementation MatchesView
-- (void)keyDown:(NSEvent *)theEvent
-{
-    unichar key = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
-    // get flags and strip the lower 16 (device dependant) bits
-    unsigned int flags = ( [theEvent modifierFlags] & 0x00FF );
-    if (((key == NSDeleteFunctionKey) || (key == NSDeleteCharacter)) && (flags == 0))
-        [self sendAction:@selector(removeSelected:) to:[self delegate]];
-    else
-    if ((key == 0x20) && (flags == 0)) // Space
-        [self sendAction:@selector(markSelected:) to:[self delegate]];
-    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
 - (void)awakeFromNib
 {
     [self window];
     preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
+    outline = [[ResultOutline alloc] initWithPyParent:py view:matches];
+    statsLabel = [[StatsLabel alloc] initWithPyParent:py labelView:stats];
     [self initResultColumns];
     [self fillColumnsMenu];
+    [deltaSwitch setSelectedSegment:0];
+    [pmSwitch setSelectedSegment:0];
+    [matches setTarget:self];
+    [matches setDoubleAction:@selector(openClicked:)];
+    
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationRequired:) name:RegistrationRequired object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobStarted:) name:JobStarted object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobInProgress:) name:JobInProgress 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];
 }
@@ -85,9 +58,9 @@ http://www.hardcoded.net/licenses/hs_license
     [mi setTarget:self];
 }
 
-- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn
+- (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn
 {
-    NSNumber *n = [NSNumber numberWithInt:aIdentifier];
+    NSNumber *n = [NSNumber numberWithInteger:aIdentifier];
     NSTableColumn *col = [[NSTableColumn alloc] initWithIdentifier:[n stringValue]];
     [col setWidth:aWidth];
     [col setEditable:NO];
@@ -101,13 +74,9 @@ http://www.hardcoded.net/licenses/hs_license
 //Returns an array of identifiers, in order.
 - (NSArray *)getColumnsOrder
 {
-    NSTableColumn *col;
-    NSString *colId;
     NSMutableArray *result = [NSMutableArray array];
-    NSEnumerator *e = [[matches tableColumns] objectEnumerator];
-    while (col = [e nextObject])
-    {
-        colId = [col identifier];
+    for (NSTableColumn *col in [matches tableColumns]) {
+        NSString *colId = [col identifier];
         [result addObject:colId];
     }
     return result;
@@ -116,48 +85,14 @@ http://www.hardcoded.net/licenses/hs_license
 - (NSDictionary *)getColumnsWidth
 {
     NSMutableDictionary *result = [NSMutableDictionary dictionary];
-    NSTableColumn *col;
-    NSString *colId;
-    NSNumber *width;
-    NSEnumerator *e = [[matches tableColumns] objectEnumerator];
-    while (col = [e nextObject])
-    {
-        colId = [col identifier];
-        width = [NSNumber numberWithFloat:[col width]];
+    for (NSTableColumn *col in [matches tableColumns]) {
+        NSString *colId = [col identifier];
+        NSNumber *width = [NSNumber numberWithDouble:[col width]];
         [result setObject:width forKey:colId];
     }
     return result;
 }
 
-- (NSArray *)getSelected:(BOOL)aDupesOnly
-{
-    if (_powerMode)
-        aDupesOnly = NO;
-    NSIndexSet *indexes = [matches selectedRowIndexes];
-    NSMutableArray *nodeList = [NSMutableArray array];
-    OVNode *node;
-    int i = [indexes firstIndex];
-    while (i != NSNotFound)
-    {
-        node = [matches itemAtRow:i];
-        if (!aDupesOnly || ([node level] > 1))
-            [nodeList addObject:node];
-        i = [indexes indexGreaterThanIndex:i];
-    }
-    return nodeList;
-}
-
-- (NSArray *)getSelectedPaths:(BOOL)aDupesOnly
-{
-    NSMutableArray *r = [NSMutableArray array];
-    NSArray *selected = [self getSelected:aDupesOnly];
-    NSEnumerator *e = [selected objectEnumerator];
-    OVNode *node;
-    while (node = [e nextObject])
-        [r addObject:p2a([node indexPath])];
-    return r;
-}
-
 - (void)initResultColumns
 {
     // Virtual
@@ -165,80 +100,51 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth
 {
-    NSTableColumn *col;
-    NSString *colId;
-    NSNumber *width;
-    NSMenuItem *mi;
-    //Remove all columns
-    NSEnumerator *e = [[columnsMenu itemArray] objectEnumerator];
-    while (mi = [e nextObject])
-    {
-        if ([mi state] == NSOnState)
+    for (NSMenuItem *mi in [columnsMenu itemArray]) {
+        if ([mi state] == NSOnState) {
             [self toggleColumn:mi];
         }
+    }
     //Add columns and set widths
-    e = [aColumnsOrder objectEnumerator];
-    while (colId = [e nextObject])
-    {
-        if (![colId isEqual:@"mark"])
-        {
-            col = [_resultColumns objectAtIndex:[colId intValue]];
-            width = [aColumnsWidth objectForKey:[col identifier]];
-            mi = [columnsMenu itemWithTag:[colId intValue]];
-            if (width)
+    for (NSString *colId in aColumnsOrder) {
+        NSInteger colIndex = [colId integerValue];
+        if ((colIndex == 0) && (![colId isEqual:@"0"])) {
+            continue;
+        }
+        NSTableColumn *col = [_resultColumns objectAtIndex:colIndex];
+        NSNumber *width = [aColumnsWidth objectForKey:[col identifier]];
+        NSMenuItem *mi = [columnsMenu itemWithTag:colIndex];
+        if (width) {
             [col setWidth:[width floatValue]];
+        }
         [self toggleColumn:mi];
     }
 }
-}
-
-- (void)updatePySelection
-{
-	NSArray *selection;
-    if (_powerMode)
-		selection = [py selectedPowerMarkerNodePaths];
-    else
-		selection = [py selectedResultNodePaths];
-	[matches selectNodePaths:selection];
-}
-
-- (void)performPySelection:(NSArray *)aIndexPaths
-{
-    if (_powerMode)
-        [py selectPowerMarkerNodePaths:aIndexPaths];
-    else
-        [py selectResultNodePaths:aIndexPaths];
-}
-
-- (void)refreshStats
-{
-    [stats setStringValue:[py getStatLine]];
-}
 
 /* Actions */
+- (IBAction)clearIgnoreList:(id)sender
+{
+    NSInteger i = n2i([py getIgnoreListCount]);
+    if (!i)
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"Do you really want to remove all %d items from the ignore list?",i]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [py clearIgnoreList];
+}
+
 - (IBAction)changeDelta:(id)sender
 {
-    _displayDelta = [deltaSwitch selectedSegment] == 1;
-    [py setDisplayDeltaValues:b2n(_displayDelta)];
-    [matches reloadData];
-    [self expandAll:nil];
+    [outline setDeltaValuesMode:[deltaSwitch selectedSegment] == 1];
 }
 
 - (IBAction)changePowerMarker:(id)sender
 {
-    _powerMode = [pmSwitch selectedSegment] == 1;
-    if (_powerMode)
-        [matches setTag:2];
-    else
-        [matches setTag:0];
-    [self expandAll:nil];
-    [self outlineView:matches didClickTableColumn:nil];
-	[self updatePySelection];
+    [outline setPowerMarkerMode:[pmSwitch selectedSegment] == 1];
 }
 
 - (IBAction)copyMarked:(id)sender
 {
-    int mark_count = [[py getMarkCount] intValue];
+    NSInteger mark_count = [[py getMarkCount] intValue];
     if (!mark_count)
         return;
     NSOpenPanel *op = [NSOpenPanel openPanel];
@@ -257,7 +163,7 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (IBAction)deleteMarked:(id)sender
 {
-    int mark_count = [[py getMarkCount] intValue];
+    NSInteger mark_count = [[py getMarkCount] intValue];
     if (!mark_count)
         return;
     if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to send %d files to Trash. Continue?",mark_count]] == NSAlertSecondButtonReturn) // NO
@@ -267,21 +173,53 @@ http://www.hardcoded.net/licenses/hs_license
     [py deleteMarked];
 }
 
-- (IBAction)expandAll:(id)sender
-{
-    for (int i=0;i < [matches numberOfRows];i++)
-        [matches expandItem:[matches itemAtRow:i]];
-}
-
 - (IBAction)exportToXHTML:(id)sender
 {
     NSString *exported = [py exportToXHTMLwithColumns:[self getColumnsOrder]];
     [[NSWorkspace sharedWorkspace] openFile:exported];
 }
 
+- (IBAction)filter:(id)sender
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [py setEscapeFilterRegexp:b2n(!n2b([ud objectForKey:@"useRegexpFilter"]))];
+    [py applyFilter:[filterField stringValue]];
+}
+
+- (IBAction)ignoreSelected:(id)sender
+{
+    NSInteger selectedDupeCount = [outline selectedDupeCount];
+    if (!selectedDupeCount)
+        return;
+    NSString *msg = [NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",selectedDupeCount];
+    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
+        return;
+    [py addSelectedToIgnoreList];
+}
+
+- (IBAction)markAll:(id)sender
+{
+    [py markAll];
+}
+
+- (IBAction)markInvert:(id)sender
+{
+    [py markInvert];
+}
+
+- (IBAction)markNone:(id)sender
+{
+    [py markNone];
+}
+
+- (IBAction)markSelected:(id)sender
+{
+    [py toggleSelectedMark];
+}
+
 - (IBAction)moveMarked:(id)sender
 {
-    int mark_count = [[py getMarkCount] intValue];
+    NSInteger mark_count = [[py getMarkCount] intValue];
     if (!mark_count)
         return;
     NSOpenPanel *op = [NSOpenPanel openPanel];
@@ -299,31 +237,65 @@ http://www.hardcoded.net/licenses/hs_license
     }
 }
 
+- (IBAction)openClicked:(id)sender
+{
+    if ([matches clickedRow] < 0) {
+        return;
+    }
+    [matches selectRowIndexes:[NSIndexSet indexSetWithIndex:[matches clickedRow]] byExtendingSelection:NO];
+    [py openSelected];
+}
+
+- (IBAction)openSelected:(id)sender
+{
+    [py openSelected];
+}
+
+- (IBAction)removeMarked:(id)sender
+{
+    int mark_count = [[py getMarkCount] intValue];
+    if (!mark_count)
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",mark_count]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [py removeMarked];
+}
+
+- (IBAction)removeSelected:(id)sender
+{
+    [outline removeSelected];
+}
+
+- (IBAction)renameSelected:(id)sender
+{
+    NSInteger col = [matches columnWithIdentifier:@"0"];
+    NSInteger row = [matches selectedRow];
+    [matches editColumn:col row:row withEvent:[NSApp currentEvent] select:YES];
+}
+
 - (IBAction)resetColumnsToDefault:(id)sender
 {
     // Virtual
 }
 
+- (IBAction)revealSelected:(id)sender
+{
+    [py revealSelected];
+}
+
 - (IBAction)showPreferencesPanel:(id)sender
 {
     [preferencesPanel showWindow:sender];
 }
 
+- (IBAction)startDuplicateScan:(id)sender
+{
+    // Virtual
+}
+
 - (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.
-    int matchesTag = _powerMode ? 2 : 0;
-    int startLen = [[py getOutlineView:matchesTag childCountsForPath:[NSArray array]] count];
-    [self performPySelection:[self getSelectedPaths:YES]];
     [py makeSelectedReference];
-    // 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
@@ -346,6 +318,15 @@ http://www.hardcoded.net/licenses/hs_license
     }
 }
 
+- (IBAction)toggleDelta:(id)sender
+{
+    if ([deltaSwitch selectedSegment] == 1)
+        [deltaSwitch setSelectedSegment:0];
+    else
+        [deltaSwitch setSelectedSegment:1];
+    [self changeDelta:sender];
+}
+
 - (IBAction)toggleDetailsPanel:(id)sender
 {
     [[(AppDelegateBase *)app detailsPanel] toggleVisibility];
@@ -360,21 +341,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])];
-    [matches reloadData];
-    [self expandAll:nil];
-}
-
 /* Notifications */
 - (void)windowWillClose:(NSNotification *)aNotification
 {
@@ -383,27 +349,22 @@ http://www.hardcoded.net/licenses/hs_license
 
 - (void)jobCompleted:(NSNotification *)aNotification
 {
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
-    int r = n2i([py getOperationalErrorCount]);
+    NSInteger r = n2i([py getOperationalErrorCount]);
     id lastAction = [[ProgressController mainProgressController] jobId];
-    if ([lastAction isEqualTo:jobCopy])
-    {
+    if ([lastAction isEqualTo:jobCopy]) {
         if (r > 0)
             [Dialogs showMessage:[NSString stringWithFormat:@"%d file(s) couldn't be copied.",r]];
         else
             [Dialogs showMessage:@"All marked files were copied sucessfully."];
     }
-    if ([lastAction isEqualTo:jobMove])
-    {
+    else if ([lastAction isEqualTo:jobMove]) {
         if (r > 0)
             [Dialogs showMessage:[NSString stringWithFormat:@"%d file(s) couldn't be moved. They were kept in the results, and still are marked.",r]];
         else
             [Dialogs showMessage:@"All marked files were moved sucessfully."];
     }
-    if ([lastAction isEqualTo:jobDelete])
-    {
-        if (r > 0)
-        {
+    else if ([lastAction isEqualTo:jobDelete]) {
+        if (r > 0) {
             NSString *msg = @"%d file(s) couldn't be sent to Trash. They were kept in the results, "\
                 "and still are marked. See the F.A.Q. section in the help file for details.";
             [Dialogs showMessage:[NSString stringWithFormat:msg,r]];
@@ -411,6 +372,12 @@ http://www.hardcoded.net/licenses/hs_license
         else
             [Dialogs showMessage:@"All marked files were sucessfully sent to Trash."];
     }
+    else if ([lastAction isEqualTo:jobScan]) {
+        NSInteger groupCount = [outline intProperty:@"children_count" valueAtPath:nil];
+        if (groupCount == 0)
+            [Dialogs showMessage:@"No duplicates found."];
+    }
+    
     // Re-activate toolbar items right after the progress bar stops showing instead of waiting until
     // a mouse-over is performed
     [[[self window] toolbar] validateVisibleItems];
@@ -427,7 +394,6 @@ http://www.hardcoded.net/licenses/hs_license
     NSString *desc = [ui valueForKey:@"desc"];
     [[ProgressController mainProgressController] setJobDesc:desc];
     NSString *jobid = [ui valueForKey:@"jobid"];
-    // NSLog(jobid);
     [[ProgressController mainProgressController] setJobId:jobid];
     [[ProgressController mainProgressController] showSheetForParent:[self window]];
 }
@@ -438,20 +404,6 @@ http://www.hardcoded.net/licenses/hs_license
     [Dialogs showMessage:msg];
 }
 
-- (void)resultsChanged:(NSNotification *)aNotification
-{
-    [matches reloadData];
-    [self expandAll:nil];
-    [self outlineViewSelectionDidChange:nil];
-    [self refreshStats];
-}
-
-- (void)resultsUpdated:(NSNotification *)aNotification
-{
-	[matches invalidateBuffers];
-    [matches invalidateMarkings];
-}
-
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
 {
     return ![[ProgressController mainProgressController] isShown];

cocoa/base/StatsLabel.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 "HSGUIController.h"
+#import "PyStatsLabel.h"
+
+@interface StatsLabel : HSGUIController
+{
+    NSTextField *labelView;
+}
+- (id)initWithPyParent:(id)aPyParent labelView:(NSTextField *)aLabelView;
+- (PyStatsLabel *)py;
+@end

cocoa/base/StatsLabel.m

@@ -0,0 +1,38 @@
+/* 
+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 "StatsLabel.h"
+#import "Utils.h"
+
+@implementation StatsLabel
+- (id)initWithPyParent:(id)aPyParent labelView:(NSTextField *)aLabelView
+{
+    self = [super initWithPyClassName:@"PyStatsLabel" pyParent:aPyParent];
+    labelView = [aLabelView retain];
+    [self connect];
+    return self;
+}
+
+- (void)dealloc
+{
+    [self disconnect];
+    [labelView release];
+    [super dealloc];
+}
+
+- (PyStatsLabel *)py
+{
+    return (PyStatsLabel *)py;
+}
+
+/* Python --> Cocoa */
+- (void)refresh
+{
+    [labelView setStringValue:[[self py] display]];
+}
+@end

cocoa/base/xib/DetailsPanel.xib

@@ -2,17 +2,17 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10B504</string>
+		<string key="IBDocument.SystemVersion">10C540</string>
 		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.2</string>
-		<string key="IBDocument.HIToolboxVersion">437.00</string>
+		<string key="IBDocument.AppKitVersion">1038.25</string>
+		<string key="IBDocument.HIToolboxVersion">458.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">740</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="5"/>
+			<integer value="6"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -297,13 +297,21 @@
 					</object>
 					<int key="connectionID">12</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="251969872"/>
+						<reference key="destination" ref="449947658"/>
+					</object>
+					<int key="connectionID">21</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">detailsTable</string>
 						<reference key="source" ref="449947658"/>
 						<reference key="destination" ref="251969872"/>
 					</object>
-					<int key="connectionID">13</int>
+					<int key="connectionID">22</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -438,15 +446,22 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="NSArray" key="dict.sortedKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-3.IBPluginDependency</string>
 					<string>10.IBPluginDependency</string>
 					<string>10.ImportedFromIB2</string>
 					<string>11.IBPluginDependency</string>
 					<string>11.ImportedFromIB2</string>
+					<string>15.IBPluginDependency</string>
 					<string>15.IBShouldRemoveOnLegacySave</string>
+					<string>16.IBPluginDependency</string>
 					<string>16.IBShouldRemoveOnLegacySave</string>
+					<string>17.IBPluginDependency</string>
 					<string>17.IBShouldRemoveOnLegacySave</string>
+					<string>18.IBPluginDependency</string>
 					<string>18.IBShouldRemoveOnLegacySave</string>
+					<string>19.IBPluginDependency</string>
 					<string>19.IBShouldRemoveOnLegacySave</string>
+					<string>20.IBPluginDependency</string>
 					<string>20.IBShouldRemoveOnLegacySave</string>
 					<string>5.IBEditorWindowLastContentRect</string>
 					<string>5.IBPluginDependency</string>
@@ -458,7 +473,6 @@
 					<string>6.ImportedFromIB2</string>
 					<string>7.IBPluginDependency</string>
 					<string>7.ImportedFromIB2</string>
-					<string>8.CustomClassName</string>
 					<string>8.IBPluginDependency</string>
 					<string>8.ImportedFromIB2</string>
 					<string>9.IBPluginDependency</string>
@@ -467,14 +481,21 @@
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>{{109, 656}, {451, 161}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -486,7 +507,6 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>TableView</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -509,81 +529,34 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">20</int>
+			<int key="maxID">22</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
 					<string key="className">DetailsPanel</string>
-					<string key="superclassName">DetailsPanelBase</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">DetailsPanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">DetailsPanel</string>
-					<string key="superclassName">DetailsPanelBase</string>
+					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="outlets">
 						<string key="NS.key.0">detailsTable</string>
 						<string key="NS.object.0">NSTableView</string>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../base/DetailsPanel.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">DetailsPanelBase</string>
+					<string key="className">DetailsPanel</string>
 					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">detailsTable</string>
-						<string key="NS.object.0">TableView</string>
-					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">dgbase/DetailsPanel.h</string>
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FirstResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PyApp</string>
-					<string key="superclassName">PyRegistrable</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/PyApp.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PyRegistrable</string>
 					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/PyRegistrable.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TableView</string>
-					<string key="superclassName">NSTableView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">py</string>
-						<string key="NS.object.0">PyApp</string>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/Table.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TableView</string>
-					<string key="superclassName">NSTableView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>

cocoa/base/xib/DirectoryPanel.xib

@@ -2,17 +2,17 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10B504</string>
+		<string key="IBDocument.SystemVersion">10C540</string>
 		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.2</string>
-		<string key="IBDocument.HIToolboxVersion">437.00</string>
+		<string key="IBDocument.AppKitVersion">1038.25</string>
+		<string key="IBDocument.HIToolboxVersion">458.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">740</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="6"/>
+			<integer value="50"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -70,7 +70,6 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{327, 165}</string>
 											<reference key="NSSuperview" ref="514281221"/>
-											<int key="NSTag">1</int>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="885660940">
 												<reference key="NSNextResponder" ref="395832192"/>
@@ -88,7 +87,7 @@
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="547470852">
-													<string key="NSIdentifier">0</string>
+													<string key="NSIdentifier">name</string>
 													<double key="NSWidth">236</double>
 													<double key="NSMinWidth">16</double>
 													<double key="NSMaxWidth">1000</double>
@@ -142,7 +141,7 @@
 													<reference key="NSTableView" ref="10140319"/>
 												</object>
 												<object class="NSTableColumn" id="50798966">
-													<string key="NSIdentifier">1</string>
+													<string key="NSIdentifier">state</string>
 													<double key="NSWidth">85.35595703125</double>
 													<double key="NSMinWidth">30.35595703125</double>
 													<double key="NSMaxWidth">1000</double>
@@ -173,15 +172,41 @@
 														<string key="NSKeyEquivalent"/>
 														<int key="NSPeriodicDelay">400</int>
 														<int key="NSPeriodicInterval">75</int>
-														<nil key="NSMenuItem"/>
+														<object class="NSMenuItem" key="NSMenuItem" id="71151438">
+															<reference key="NSMenu" ref="104112446"/>
+															<string key="NSTitle">Normal</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<int key="NSState">1</int>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="867721721"/>
+														</object>
 														<bool key="NSMenuItemRespectAlignment">YES</bool>
 														<object class="NSMenu" key="NSMenu" id="104112446">
-															<string key="NSTitle"/>
+															<string key="NSTitle">Normal</string>
 															<object class="NSMutableArray" key="NSMenuItems">
 																<bool key="EncodedWithXMLCoder">YES</bool>
+																<reference ref="71151438"/>
+																<object class="NSMenuItem" id="828402206">
+																	<reference key="NSMenu" ref="104112446"/>
+																	<string key="NSTitle">Reference</string>
+																	<string key="NSKeyEquiv"/>
+																	<int key="NSMnemonicLoc">2147483647</int>
+																	<string key="NSAction">_popUpItemAction:</string>
+																	<reference key="NSTarget" ref="867721721"/>
+																</object>
+																<object class="NSMenuItem" id="142495353">
+																	<reference key="NSMenu" ref="104112446"/>
+																	<string key="NSTitle">Excluded</string>
+																	<string key="NSKeyEquiv"/>
+																	<int key="NSMnemonicLoc">2147483647</int>
+																	<string key="NSAction">_popUpItemAction:</string>
+																	<reference key="NSTarget" ref="867721721"/>
 																</object>
 															</object>
-														<int key="NSSelectedIndex">-1</int>
+															<bool key="NSNoAutoenable">YES</bool>
+															<bool key="NSMenuExcludeMarkColumn">YES</bool>
+														</object>
 														<int key="NSPreferredEdge">3</int>
 														<bool key="NSUsesItemFromMenu">YES</bool>
 														<bool key="NSAltersState">YES</bool>
@@ -189,6 +214,7 @@
 													</object>
 													<int key="NSResizingMask">2</int>
 													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
 													<reference key="NSTableView" ref="10140319"/>
 												</object>
 											</object>
@@ -415,30 +441,6 @@
 					</object>
 					<int key="connectionID">19</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nextKeyView</string>
-						<reference key="source" ref="963602908"/>
-						<reference key="destination" ref="10140319"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nextKeyView</string>
-						<reference key="source" ref="10140319"/>
-						<reference key="destination" ref="630693842"/>
-					</object>
-					<int key="connectionID">21</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nextKeyView</string>
-						<reference key="source" ref="630693842"/>
-						<reference key="destination" ref="963602908"/>
-					</object>
-					<int key="connectionID">22</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">popupAddDirectoryMenu:</string>
@@ -471,22 +473,6 @@
 					</object>
 					<int key="connectionID">26</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">directories</string>
-						<reference key="source" ref="566600593"/>
-						<reference key="destination" ref="10140319"/>
-					</object>
-					<int key="connectionID">27</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="10140319"/>
-						<reference key="destination" ref="566600593"/>
-					</object>
-					<int key="connectionID">29</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">performClose:</string>
@@ -503,6 +489,14 @@
 					</object>
 					<int key="connectionID">43</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">outlineView</string>
+						<reference key="source" ref="566600593"/>
+						<reference key="destination" ref="10140319"/>
+					</object>
+					<int key="connectionID">54</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -685,6 +679,12 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">50</int>
 						<reference key="object" ref="104112446"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="71151438"/>
+							<reference ref="828402206"/>
+							<reference ref="142495353"/>
+						</object>
 						<reference key="parent" ref="867721721"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -702,6 +702,21 @@
 						<reference key="object" ref="885660940"/>
 						<reference key="parent" ref="242279311"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">55</int>
+						<reference key="object" ref="71151438"/>
+						<reference key="parent" ref="104112446"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="828402206"/>
+						<reference key="parent" ref="104112446"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="142495353"/>
+						<reference key="parent" ref="104112446"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -739,6 +754,7 @@
 					<string>5.ImportedFromIB2</string>
 					<string>5.windowTemplate.hasMinSize</string>
 					<string>5.windowTemplate.minSize</string>
+					<string>50.IBEditorWindowLastContentRect</string>
 					<string>50.IBPluginDependency</string>
 					<string>51.IBPluginDependency</string>
 					<string>51.IBShouldRemoveOnLegacySave</string>
@@ -746,6 +762,9 @@
 					<string>52.IBShouldRemoveOnLegacySave</string>
 					<string>53.IBPluginDependency</string>
 					<string>53.IBShouldRemoveOnLegacySave</string>
+					<string>55.IBPluginDependency</string>
+					<string>56.IBPluginDependency</string>
+					<string>57.IBPluginDependency</string>
 					<string>6.IBPluginDependency</string>
 					<string>6.ImportedFromIB2</string>
 					<string>7.IBPluginDependency</string>
@@ -761,7 +780,7 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>DirectoryOutline</string>
+					<string>HSOutlineView</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -788,6 +807,7 @@
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{369, 269}</string>
+					<string>{{98, 740}, {327, 63}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -796,6 +816,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -821,78 +844,19 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">53</int>
+			<int key="maxID">57</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">DirectoryOutline</string>
-					<string key="superclassName">OutlineView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="462913745">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">dgbase/DirectoryPanel.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">DirectoryPanel</string>
-					<string key="superclassName">DirectoryPanelBase</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">DirectoryPanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">DirectoryPanel</string>
-					<string key="superclassName">DirectoryPanelBase</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>askForDirectory:</string>
-							<string>changeDirectoryState:</string>
-							<string>popupAddDirectoryMenu:</string>
-							<string>removeSelectedDirectory:</string>
-							<string>toggleVisible:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addButtonPopUp</string>
-							<string>directories</string>
-							<string>removeButton</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSPopUpButton</string>
-							<string>NSOutlineView</string>
-							<string>NSButton</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">DirectoryPanelBase</string>
 					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="actions">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>askForDirectory:</string>
-							<string>changeDirectoryState:</string>
 							<string>popupAddDirectoryMenu:</string>
 							<string>removeSelectedDirectory:</string>
 							<string>toggleVisible:</string>
@@ -903,7 +867,6 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -911,17 +874,28 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addButtonPopUp</string>
-							<string>directories</string>
+							<string>outlineView</string>
 							<string>removeButton</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSPopUpButton</string>
-							<string>DirectoryOutline</string>
+							<string>HSOutlineView</string>
 							<string>NSButton</string>
 						</object>
 					</object>
-					<reference key="sourceIdentifier" ref="462913745"/>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../base/DirectoryPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">DirectoryPanel</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FirstResponder</string>
@@ -932,40 +906,27 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">OutlineView</string>
+					<string key="className">HSOutlineView</string>
 					<string key="superclassName">NSOutlineView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">py</string>
-						<string key="NS.object.0">PyApp</string>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="53364925">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/Outline.h</string>
+						<string key="minorKey">../views/HSOutlineView.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">OutlineView</string>
-					<string key="superclassName">NSOutlineView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="53364925"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="42597526">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../views/NSTableViewAdditions.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">PyApp</string>
-					<string key="superclassName">PyRegistrable</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/PyApp.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PyRegistrable</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/PyRegistrable.h</string>
-					</object>
+					<string key="className">NSTableView</string>
+					<reference key="sourceIdentifier" ref="42597526"/>
 				</object>
 			</object>
 			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
@@ -1497,7 +1458,7 @@
 			<integer value="3000" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../../dupeguru.xcodeproj</string>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../../se/dupeguru.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 	</data>
 </archive>

cocoa/base/xib/MainMenu.xib

@@ -2,18 +2,18 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10B504</string>
+		<string key="IBDocument.SystemVersion">10C540</string>
 		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.2</string>
-		<string key="IBDocument.HIToolboxVersion">437.00</string>
+		<string key="IBDocument.AppKitVersion">1038.25</string>
+		<string key="IBDocument.HIToolboxVersion">458.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">740</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="219"/>
 			<integer value="29"/>
-			<integer value="21"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -83,11 +83,9 @@
 								<string key="NSToolbarItemPaletteLabel">Power Marker</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSegmentedControl" key="NSToolbarItemView" id="35398541">
-									<reference key="NSNextResponder"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{7, 14}, {67, 24}}</string>
-									<reference key="NSSuperview"/>
-									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSegmentedCell" key="NSCell" id="431579725">
 										<int key="NSCellFlags">67239424</int>
@@ -178,11 +176,9 @@
 								<string key="NSToolbarItemPaletteLabel">Filter</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSearchField" key="NSToolbarItemView" id="1013657232">
-									<reference key="NSNextResponder"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">258</int>
 									<string key="NSFrame">{{0, 14}, {81, 22}}</string>
-									<reference key="NSSuperview"/>
-									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSearchFieldCell" key="NSCell" id="484816507">
 										<int key="NSCellFlags">343014976</int>
@@ -324,11 +320,9 @@
 								<string key="NSToolbarItemPaletteLabel">Action</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSPopUpButton" key="NSToolbarItemView" id="165812138">
-									<reference key="NSNextResponder"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{0, 14}, {58, 26}}</string>
-									<reference key="NSSuperview"/>
-									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSPopUpButtonCell" key="NSCell" id="436420677">
 										<int key="NSCellFlags">-2076049856</int>
@@ -531,11 +525,9 @@
 								<string key="NSToolbarItemPaletteLabel">Delta Values</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSegmentedControl" key="NSToolbarItemView" id="311230297">
-									<reference key="NSNextResponder"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{4, 14}, {67, 24}}</string>
-									<reference key="NSSuperview"/>
-									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSegmentedCell" key="NSCell" id="211272396">
 										<int key="NSCellFlags">67239424</int>
@@ -718,7 +710,7 @@
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="430098394">
-													<string key="NSIdentifier">mark</string>
+													<string key="NSIdentifier">marked</string>
 													<double key="NSWidth">47</double>
 													<double key="NSMinWidth">16</double>
 													<double key="NSMaxWidth">1000</double>
@@ -760,6 +752,7 @@
 														<int key="NSPeriodicDelay">400</int>
 														<int key="NSPeriodicInterval">75</int>
 													</object>
+													<bool key="NSIsEditable">YES</bool>
 													<reference key="NSTableView" ref="40047569"/>
 												</object>
 												<object class="NSTableColumn" id="932540235">
@@ -1675,14 +1668,6 @@
 					</object>
 					<int key="connectionID">212</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">matches</string>
-						<reference key="source" ref="339936126"/>
-						<reference key="destination" ref="40047569"/>
-					</object>
-					<int key="connectionID">245</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">initialFirstResponder</string>
@@ -1691,22 +1676,6 @@
 					</object>
 					<int key="connectionID">279</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="40047569"/>
-						<reference key="destination" ref="339936126"/>
-					</object>
-					<int key="connectionID">410</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">markToggle:</string>
-						<reference key="source" ref="339936126"/>
-						<reference key="destination" ref="705360835"/>
-					</object>
-					<int key="connectionID">414</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">stats</string>
@@ -1947,14 +1916,6 @@
 					</object>
 					<int key="connectionID">758</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">py</string>
-						<reference key="source" ref="40047569"/>
-						<reference key="destination" ref="875360857"/>
-					</object>
-					<int key="connectionID">764</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">removeSelected:</string>
@@ -2227,6 +2188,22 @@
 					</object>
 					<int key="connectionID">1174</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="23220930"/>
+						<reference key="destination" ref="91622651"/>
+					</object>
+					<int key="connectionID">1175</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">matches</string>
+						<reference key="source" ref="339936126"/>
+						<reference key="destination" ref="40047569"/>
+					</object>
+					<int key="connectionID">1176</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -3406,7 +3383,7 @@
 					<string>{340, 340}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>MatchesView</string>
+					<string>HSOutlineView</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3584,7 +3561,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1174</int>
+			<int key="maxID">1176</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3663,7 +3640,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">dgbase/AppDelegate.h</string>
+						<string key="minorKey">../base/AppDelegate.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3675,19 +3652,22 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">MatchesView</string>
-					<string key="superclassName">OutlineView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="417275989">
+					<string key="className">HSOutlineView</string>
+					<string key="superclassName">NSOutlineView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="384069338">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">dgbase/ResultWindow.h</string>
+						<string key="minorKey">../views/HSOutlineView.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">MatchesView</string>
-					<string key="superclassName">OutlineView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="384069338"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="653924221">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../views/NSTableViewAdditions.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3699,31 +3679,15 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">OutlineView</string>
-					<string key="superclassName">NSOutlineView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">py</string>
-						<string key="NS.object.0">PyApp</string>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/Outline.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">OutlineView</string>
-					<string key="superclassName">NSOutlineView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
+					<string key="className">NSTableView</string>
+					<reference key="sourceIdentifier" ref="653924221"/>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">PyApp</string>
 					<string key="superclassName">PyRegistrable</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/PyApp.h</string>
+						<string key="minorKey">../PyApp.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3755,7 +3719,7 @@
 					<string key="superclassName">PyApp</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">dgbase/PyDupeGuru.h</string>
+						<string key="minorKey">../base/PyDupeGuru.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3763,7 +3727,7 @@
 					<string key="superclassName">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/PyRegistrable.h</string>
+						<string key="minorKey">../PyRegistrable.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3797,7 +3761,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/RecentDirectories.h</string>
+						<string key="minorKey">../RecentDirectories.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3812,123 +3776,14 @@
 					<string key="className">ResultWindow</string>
 					<string key="superclassName">ResultWindowBase</string>
 					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>clearIgnoreList:</string>
-							<string>filter:</string>
-							<string>ignoreSelected:</string>
-							<string>markAll:</string>
-							<string>markInvert:</string>
-							<string>markNone:</string>
-							<string>markSelected:</string>
-							<string>markToggle:</string>
-							<string>openSelected:</string>
-							<string>refresh:</string>
-							<string>removeMarked:</string>
-							<string>removeSelected:</string>
-							<string>renameSelected:</string>
-							<string>resetColumnsToDefault:</string>
-							<string>revealSelected:</string>
-							<string>startDuplicateScan:</string>
-							<string>toggleDelta:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">filterField</string>
-						<string key="NS.object.0">NSSearchField</string>
+						<string key="NS.key.0">removeDeadTracks:</string>
+						<string key="NS.object.0">id</string>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">ResultWindow.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ResultWindow</string>
-					<string key="superclassName">ResultWindowBase</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>changeDelta:</string>
-							<string>changePowerMarker:</string>
-							<string>collapseAll:</string>
-							<string>copyMarked:</string>
-							<string>deleteMarked:</string>
-							<string>expandAll:</string>
-							<string>exportToXHTML:</string>
-							<string>moveMarked:</string>
-							<string>switchSelected:</string>
-							<string>togglePowerMarker:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>actionMenuView</string>
-							<string>app</string>
-							<string>deltaSwitch</string>
-							<string>deltaSwitchView</string>
-							<string>filterFieldView</string>
-							<string>matches</string>
-							<string>pmSwitch</string>
-							<string>pmSwitchView</string>
-							<string>py</string>
-							<string>stats</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSView</string>
-							<string>id</string>
-							<string>NSSegmentedControl</string>
-							<string>NSView</string>
-							<string>NSView</string>
-							<string>MatchesView</string>
-							<string>NSSegmentedControl</string>
-							<string>NSView</string>
-							<string>PyDupeGuru</string>
-							<string>NSTextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">ResultWindowBase</string>
 					<string key="superclassName">NSWindowController</string>
@@ -3938,15 +3793,29 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>changeDelta:</string>
 							<string>changePowerMarker:</string>
+							<string>clearIgnoreList:</string>
 							<string>copyMarked:</string>
 							<string>deleteMarked:</string>
-							<string>expandAll:</string>
 							<string>exportToXHTML:</string>
+							<string>filter:</string>
+							<string>ignoreSelected:</string>
+							<string>markAll:</string>
+							<string>markInvert:</string>
+							<string>markNone:</string>
+							<string>markSelected:</string>
 							<string>moveMarked:</string>
+							<string>openClicked:</string>
+							<string>openSelected:</string>
+							<string>removeMarked:</string>
+							<string>removeSelected:</string>
+							<string>renameSelected:</string>
 							<string>resetColumnsToDefault:</string>
+							<string>revealSelected:</string>
 							<string>showPreferencesPanel:</string>
+							<string>startDuplicateScan:</string>
 							<string>switchSelected:</string>
 							<string>toggleColumn:</string>
+							<string>toggleDelta:</string>
 							<string>toggleDetailsPanel:</string>
 							<string>togglePowerMarker:</string>
 						</object>
@@ -3965,6 +3834,20 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -3974,6 +3857,7 @@
 							<string>app</string>
 							<string>columnsMenu</string>
 							<string>deltaSwitch</string>
+							<string>filterField</string>
 							<string>matches</string>
 							<string>pmSwitch</string>
 							<string>py</string>
@@ -3984,13 +3868,17 @@
 							<string>id</string>
 							<string>NSMenu</string>
 							<string>NSSegmentedControl</string>
-							<string>MatchesView</string>
+							<string>NSSearchField</string>
+							<string>HSOutlineView</string>
 							<string>NSSegmentedControl</string>
 							<string>PyDupeGuruBase</string>
 							<string>NSTextField</string>
 						</object>
 					</object>
-					<reference key="sourceIdentifier" ref="417275989"/>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../base/ResultWindow.h</string>
+					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">SUUpdater</string>
@@ -4612,7 +4500,7 @@
 			<integer value="3000" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../../dupeguru.xcodeproj</string>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../../me/dupeguru.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 	</data>
 </archive>

cocoa/me/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,18 +7,13 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/AppDelegate.h"
+#import "../base/AppDelegate.h"
 #import "ResultWindow.h"
-#import "DirectoryPanel.h"
 #import "PyDupeGuru.h"
 
-@interface AppDelegate : AppDelegateBase
-{   
-    DirectoryPanel *_directoryPanel;
-}
+@interface AppDelegate : AppDelegateBase {}
 - (IBAction)openWebsite:(id)sender;
 - (IBAction)toggleDirectories:(id)sender;
 
-- (DirectoryPanel *)directoryPanel;
 - (PyDupeGuru *)py;
 @end

cocoa/me/AppDelegate.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,12 +7,13 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import "AppDelegate.h"
-#import "cocoalib/ProgressController.h"
-#import "cocoalib/RegistrationInterface.h"
-#import "cocoalib/Utils.h"
-#import "cocoalib/ValueTransformers.h"
-#import "cocoalib/Dialogs.h"
+#import "../../cocoalib/ProgressController.h"
+#import "../../cocoalib/RegistrationInterface.h"
+#import "../../cocoalib/Utils.h"
+#import "../../cocoalib/ValueTransformers.h"
+#import "../../cocoalib/Dialogs.h"
 #import "DetailsPanel.h"
+#import "DirectoryPanel.h"
 #import "Consts.h"
 
 @implementation AppDelegate
@@ -52,7 +53,6 @@ http://www.hardcoded.net/licenses/hs_license
     VTIsIntIn *vtScanTypeIsTag = [[[VTIsIntIn alloc] initWithValues:[NSIndexSet indexSetWithIndex:3] reverse:NO] autorelease];
     [NSValueTransformer setValueTransformer:vtScanTypeIsTag forName:@"vtScanTypeIsTag"];
     _directoryPanel = nil;
-    _appName = APPNAME;
     return self;
 }
 
@@ -66,52 +66,22 @@ http://www.hardcoded.net/licenses/hs_license
     [[self directoryPanel] toggleVisible:sender];
 }
 
-
-- (DetailsPanelBase *)detailsPanel
-{
-    if (!_detailsPanel)
-        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
-    return _detailsPanel;
-}
-
 - (DirectoryPanel *)directoryPanel
 {
     if (!_directoryPanel)
-        _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self];
+        _directoryPanel = [[DirectoryPanelME alloc] initWithParentApp:self];
     return _directoryPanel;
 }
 - (PyDupeGuru *)py { return (PyDupeGuru *)py; }
 
 //Delegate
-- (void)applicationWillBecomeActive:(NSNotification *)aNotification
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-    if (![[result window] isVisible])
-        [result showWindow:NSApp];
-}
-
-- (void)applicationWillTerminate:(NSNotification *)aNotification
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [ud setObject: [result getColumnsOrder] forKey:@"columnsOrder"];
-    [ud setObject: [result getColumnsWidth] forKey:@"columnsWidth"];
-    [py saveIgnoreList];
-    [py saveResults];
-    int sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
-    if (sc >= 10)
-    {
-        sc = -1;
-        [py purgeIgnoreList];
-    }
-    sc++;
-    [ud setInteger:sc forKey:@"sessionCountSinceLastIgnorePurge"];
-    // NSApplication does not release nib instances objects, we must do it manually
-    // Well, it isn't needed because the memory is freed anyway (we are quitting the application
-    // But I need to release RecentDirectories so it saves the user defaults
-    [recentDirectories release];
-}
-
-- (void)recentDirecoryClicked:(NSString *)directory
-{
-    [[self directoryPanel] addDirectory:directory];
+    NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu];
+    // index 3 is just after "Export Results to XHTML"
+    NSMenuItem *mi = [actionsMenu insertItemWithTitle:@"Remove Dead Tracks in iTunes" 
+        action:@selector(removeDeadTracks:) keyEquivalent:@"" atIndex:3];
+    [mi setTarget:result];
+    [super applicationDidFinishLaunching:aNotification];
 }
 @end

cocoa/me/Consts.h

@@ -1,13 +1,11 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 "dgbase/Consts.h"
-
-#define APPNAME @"dupeGuru ME"
+#import "../base/Consts.h"
 
 #define jobScanDeadTracks @"jobScanDeadTracks"

cocoa/me/DirectoryPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,9 +7,9 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DirectoryPanel.h"
+#import "../base/DirectoryPanel.h"
 
-@interface DirectoryPanel : DirectoryPanelBase
+@interface DirectoryPanelME : DirectoryPanel
 {
 }
 - (IBAction)addiTunes:(id)sender;

cocoa/me/DirectoryPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -8,7 +8,7 @@ http://www.hardcoded.net/licenses/hs_license
 
 #import "DirectoryPanel.h"
 
-@implementation DirectoryPanel
+@implementation DirectoryPanelME
 - (IBAction)addiTunes:(id)sender
 {
     [self addDirectory:[@"~/Music/iTunes/iTunes Music" stringByExpandingTildeInPath]];

cocoa/me/Info.plist

@@ -23,13 +23,13 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>5.6.6</string>
+	<string>5.7.2</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© Hardcoded Software, 2009</string>
+	<string>© Hardcoded Software, 2010</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru_me.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/me/PyDupeGuru.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/PyDupeGuru.h"
+#import "../base/PyDupeGuru.h"
 
 @interface PyDupeGuru : PyDupeGuruBase
 //Scanning options
@@ -19,5 +19,5 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)enable:(NSNumber *)enable scanForTag:(NSString *)tag;
 - (void)scanDeadTracks;
 - (void)removeDeadTracks;
-- (int)deadTrackCount;
+- (NSInteger)deadTrackCount;
 @end

cocoa/me/ResultWindow.h

@@ -1,12 +1,15 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 "../base/ResultWindow.h"
 #import "DirectoryPanel.h"
 
-@implementation DirectoryPanel
+@interface ResultWindow : ResultWindowBase {}
+- (IBAction)removeDeadTracks:(id)sender;
 @end

cocoa/me/ResultWindow.m

@@ -0,0 +1,133 @@
+/* 
+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 "ResultWindow.h"
+#import "../../cocoalib/Dialogs.h"
+#import "../../cocoalib/ProgressController.h"
+#import "../../cocoalib/RegistrationInterface.h"
+#import "../../cocoalib/Utils.h"
+#import "AppDelegate.h"
+#import "Consts.h"
+
+@implementation ResultWindow
+/* Override */
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    [[self window] setTitle:@"dupeGuru Music Edition"];
+    NSMutableIndexSet *deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)] retain];
+    [deltaColumns removeIndex:6];
+    [outline setDeltaColumns:deltaColumns];
+}
+
+/* Actions */
+- (IBAction)removeDeadTracks:(id)sender
+{
+    [(PyDupeGuru *)py scanDeadTracks];
+}
+
+- (IBAction)resetColumnsToDefault:(id)sender
+{
+    NSMutableArray *columnsOrder = [NSMutableArray array];
+    [columnsOrder addObject:@"0"];
+    [columnsOrder addObject:@"2"];
+    [columnsOrder addObject:@"3"];
+    [columnsOrder addObject:@"4"];
+    [columnsOrder addObject:@"16"];
+    NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
+    [columnsWidth setObject:i2n(214) forKey:@"0"];
+    [columnsWidth setObject:i2n(63) forKey:@"2"];
+    [columnsWidth setObject:i2n(50) forKey:@"3"];
+    [columnsWidth setObject:i2n(50) forKey:@"4"];
+    [columnsWidth setObject:i2n(57) forKey:@"16"];
+    [self restoreColumnsPosition:columnsOrder widths:columnsWidth];
+}
+
+- (IBAction)startDuplicateScan:(id)sender
+{
+    if ([matches numberOfRows] > 0)
+    {
+        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
+            return;
+    }
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    PyDupeGuru *_py = (PyDupeGuru *)py;
+    [_py setScanType:[ud objectForKey:@"scanType"]];
+    [_py enable:[ud objectForKey:@"scanTagTrack"] scanForTag:@"track"];
+    [_py enable:[ud objectForKey:@"scanTagArtist"] scanForTag:@"artist"];
+    [_py enable:[ud objectForKey:@"scanTagAlbum"] scanForTag:@"album"];
+    [_py enable:[ud objectForKey:@"scanTagTitle"] scanForTag:@"title"];
+    [_py enable:[ud objectForKey:@"scanTagGenre"] scanForTag:@"genre"];
+    [_py enable:[ud objectForKey:@"scanTagYear"] scanForTag:@"year"];
+    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
+    [_py setWordWeighting:[ud objectForKey:@"wordWeighting"]];
+    [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
+    [_py setMatchSimilarWords:[ud objectForKey:@"matchSimilarWords"]];
+    NSInteger r = n2i([py doScan]);
+    if (r == 1)
+        [Dialogs showMessage:@"You cannot make a duplicate scan with only reference directories."];
+    if (r == 3)
+    {
+        [Dialogs showMessage:@"The selected directories contain no scannable file."];
+        [app toggleDirectories:nil];
+    }
+}
+
+/* Public */
+- (void)initResultColumns
+{
+    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
+    _resultColumns = [[NSMutableArray alloc] init];
+    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
+    [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
+    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (MB)" width:63 refCol:refCol];
+    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:sizeCol];
+    NSTableColumn *timeCol = [self getColumnForIdentifier:3 title:@"Time" width:50 refCol:refCol];
+    [[timeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:timeCol];
+    NSTableColumn *brCol = [self getColumnForIdentifier:4 title:@"Bitrate" width:50 refCol:refCol];
+    [[brCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:brCol];
+    [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Sample Rate" width:60 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Kind" width:40 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Creation" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Modification" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:9 title:@"Title" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:10 title:@"Artist" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:11 title:@"Album" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:12 title:@"Genre" width:80 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:13 title:@"Year" width:40 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:14 title:@"Track Number" width:40 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:15 title:@"Comment" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:16 title:@"Match %" width:57 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:17 title:@"Words Used" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:18 title:@"Dupe Count" width:80 refCol:refCol]];
+}
+
+/* Notifications */
+- (void)jobCompleted:(NSNotification *)aNotification
+{
+    [super jobCompleted:aNotification];
+    id lastAction = [[ProgressController mainProgressController] jobId];
+    if ([lastAction isEqualTo:jobScanDeadTracks])
+    {
+        NSInteger deadTrackCount = [(PyDupeGuru *)py deadTrackCount];
+        if (deadTrackCount > 0)
+        {
+            NSString *msg = @"Your iTunes Library contains %d dead tracks ready to be removed. Continue?";
+            if ([Dialogs askYesNo:[NSString stringWithFormat:msg,deadTrackCount]] == NSAlertFirstButtonReturn)
+                [(PyDupeGuru *)py removeDeadTracks];
+        }
+        else
+        {
+            [Dialogs showMessage:@"You have no dead tracks in your iTunes Library"];
+        }
+    }
+}
+@end

cocoa/me/dg_cocoa.py

@@ -0,0 +1,67 @@
+# 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
+
+from hsutil.cocoa import signature
+
+from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
+from core_me.app_cocoa import DupeGuruME
+from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
+    SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
+
+# Fix py2app imports which chokes on relative imports
+from core_me import app_cocoa, data, fs, scanner
+from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
+
+class PyDupeGuru(PyDupeGuruBase):
+    def init(self):
+        self = super(PyDupeGuru,self).init()
+        self.py = DupeGuruME()
+        return self
+    
+    def removeDeadTracks(self):
+        self.py.remove_dead_tracks()
+    
+    def scanDeadTracks(self):
+        self.py.scan_dead_tracks()
+    
+    #---Information
+    @signature('i@:')
+    def deadTrackCount(self):
+        return len(self.py.dead_tracks)
+    
+    #---Properties
+    def setMinMatchPercentage_(self, percentage):
+        self.py.scanner.min_match_percentage = int(percentage)
+    
+    def setScanType_(self, scan_type):
+        try:
+            self.py.scanner.scan_type = [
+                SCAN_TYPE_FILENAME,
+                SCAN_TYPE_FIELDS,
+                SCAN_TYPE_FIELDS_NO_ORDER,
+                SCAN_TYPE_TAG,
+                SCAN_TYPE_CONTENT,
+                SCAN_TYPE_CONTENT_AUDIO
+            ][scan_type]
+        except IndexError:
+            pass
+    
+    def setWordWeighting_(self, words_are_weighted):
+        self.py.scanner.word_weighting = words_are_weighted
+    
+    def setMatchSimilarWords_(self, match_similar_words):
+        self.py.scanner.match_similar_words = match_similar_words
+    
+    def enable_scanForTag_(self, enable, scan_tag):
+        if enable:
+            self.py.scanner.scanned_tags.add(scan_tag)
+        else:
+            self.py.scanner.scanned_tags.discard(scan_tag)
+    
+    #---Registration
+    def appName(self):
+        return "dupeGuru Music Edition"
+    

cocoa/me/dupeguru.xcodeproj/project.pbxproj

@@ -21,7 +21,16 @@
 /* Begin PBXBuildFile section */
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+		CE003CC611242D00004B0AA7 /* HSGUIController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CB411242D00004B0AA7 /* HSGUIController.m */; };
+		CE003CC711242D00004B0AA7 /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CB611242D00004B0AA7 /* HSOutline.m */; };
+		CE003CC811242D00004B0AA7 /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CB811242D00004B0AA7 /* HSWindowController.m */; };
+		CE003CC911242D00004B0AA7 /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */; };
+		CE003CCA11242D00004B0AA7 /* HSOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CC111242D00004B0AA7 /* HSOutlineView.m */; };
+		CE003CCB11242D00004B0AA7 /* NSIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CC311242D00004B0AA7 /* NSIndexPathAdditions.m */; };
+		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 */; };
@@ -30,19 +39,16 @@
 		CE3FBDD31094637800B72D77 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3FBDD11094637800B72D77 /* DetailsPanel.xib */; };
 		CE3FBDD41094637800B72D77 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */; };
 		CE49DEF60FDFEB810098617B /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */; };
-		CE49DEF70FDFEB810098617B /* NSCharacterSet_Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE49DEF50FDFEB810098617B /* NSCharacterSet_Extensions.m */; };
+		CE4B59C81119919700C06C9E /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */; };
+		CE4B59C91119919700C06C9E /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C61119919700C06C9E /* progress.xib */; };
+		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 */; };
-		CE515DF90FC6C12E00EC695D /* Table.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DEE0FC6C12E00EC695D /* Table.m */; };
 		CE515DFA0FC6C12E00EC695D /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DF00FC6C12E00EC695D /* Utils.m */; };
 		CE515DFB0FC6C12E00EC695D /* ValueTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DF20FC6C12E00EC695D /* ValueTransformers.m */; };
-		CE515E020FC6C13E00EC695D /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE515DFC0FC6C13E00EC695D /* ErrorReportWindow.xib */; };
-		CE515E030FC6C13E00EC695D /* progress.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE515DFE0FC6C13E00EC695D /* progress.nib */; };
-		CE515E040FC6C13E00EC695D /* registration.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE515E000FC6C13E00EC695D /* registration.nib */; };
 		CE515E1D0FC6C19300EC695D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515E160FC6C19300EC695D /* AppDelegate.m */; };
 		CE515E1E0FC6C19300EC695D /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515E190FC6C19300EC695D /* DirectoryPanel.m */; };
 		CE515E1F0FC6C19300EC695D /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515E1C0FC6C19300EC695D /* ResultWindow.m */; };
@@ -52,8 +58,7 @@
 		CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; };
 		CE900AD2109B238600754048 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE900AD1109B238600754048 /* Preferences.xib */; };
 		CE900AD7109B2A9B00754048 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE900AD6109B2A9B00754048 /* MainMenu.xib */; };
-		CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; };
-		CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; };
+		CEDF07A3112493B200EE5BC0 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDF07A2112493B200EE5BC0 /* StatsLabel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
 		CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
@@ -68,7 +73,6 @@
 			dstSubfolderSpec = 10;
 			files = (
 				CE14259F0AFB719300BD5167 /* Sparkle.framework in CopyFiles */,
-				CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */,
 				CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -83,63 +87,84 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		8D1107320486CEB800E47090 /* dupeGuru ME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "dupeGuru ME.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_me_help; path = help/dupeguru_me_help; sourceTree = "<group>"; };
+		CE003CB311242D00004B0AA7 /* HSGUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSGUIController.h; sourceTree = "<group>"; };
+		CE003CB411242D00004B0AA7 /* HSGUIController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSGUIController.m; sourceTree = "<group>"; };
+		CE003CB511242D00004B0AA7 /* HSOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutline.h; sourceTree = "<group>"; };
+		CE003CB611242D00004B0AA7 /* HSOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutline.m; sourceTree = "<group>"; };
+		CE003CB711242D00004B0AA7 /* HSWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSWindowController.h; sourceTree = "<group>"; };
+		CE003CB811242D00004B0AA7 /* HSWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSWindowController.m; sourceTree = "<group>"; };
+		CE003CB911242D00004B0AA7 /* NSEventAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSEventAdditions.h; path = ../../cocoalib/NSEventAdditions.h; sourceTree = SOURCE_ROOT; };
+		CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
+		CE003CBC11242D00004B0AA7 /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = "<group>"; };
+		CE003CBD11242D00004B0AA7 /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = "<group>"; };
+		CE003CBE11242D00004B0AA7 /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
+		CE003CC011242D00004B0AA7 /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
+		CE003CC111242D00004B0AA7 /* HSOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutlineView.m; sourceTree = "<group>"; };
+		CE003CC211242D00004B0AA7 /* NSIndexPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSIndexPathAdditions.h; sourceTree = "<group>"; };
+		CE003CC311242D00004B0AA7 /* NSIndexPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSIndexPathAdditions.m; sourceTree = "<group>"; };
+		CE003CC411242D00004B0AA7 /* NSTableViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTableViewAdditions.h; sourceTree = "<group>"; };
+		CE003CC511242D00004B0AA7 /* NSTableViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSTableViewAdditions.m; sourceTree = "<group>"; };
+		CE003CCD11242D2C004B0AA7 /* DirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryOutline.h; path = ../base/DirectoryOutline.h; sourceTree = SOURCE_ROOT; };
+		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; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dg_cocoa.plugin; path = py/dist/dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
-		CE3FBDD11094637800B72D77 /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DetailsPanel.xib; sourceTree = "<group>"; };
-		CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DirectoryPanel.xib; sourceTree = "<group>"; };
-		CE49DEF20FDFEB810098617B /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
-		CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
-		CE49DEF40FDFEB810098617B /* NSCharacterSet_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSCharacterSet_Extensions.h; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.h; sourceTree = SOURCE_ROOT; };
-		CE49DEF50FDFEB810098617B /* NSCharacterSet_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSCharacterSet_Extensions.m; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.m; sourceTree = SOURCE_ROOT; };
-		CE515DE00FC6C12E00EC695D /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
-		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; };
-		CE515DE90FC6C12E00EC695D /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CE515DEB0FC6C12E00EC695D /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
-		CE515DED0FC6C12E00EC695D /* Table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Table.h; path = cocoalib/Table.h; sourceTree = SOURCE_ROOT; };
-		CE515DEE0FC6C12E00EC695D /* Table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Table.m; path = cocoalib/Table.m; sourceTree = SOURCE_ROOT; };
-		CE515DEF0FC6C12E00EC695D /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
-		CE515DF00FC6C12E00EC695D /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
-		CE515DF10FC6C12E00EC695D /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
-		CE515DF20FC6C12E00EC695D /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
-		CE515DFD0FC6C13E00EC695D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = cocoalib/English.lproj/ErrorReportWindow.xib; sourceTree = "<group>"; };
-		CE515DFF0FC6C13E00EC695D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/progress.nib; sourceTree = "<group>"; };
-		CE515E010FC6C13E00EC695D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/registration.nib; sourceTree = "<group>"; };
-		CE515E150FC6C19300EC695D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = dgbase/AppDelegate.h; sourceTree = SOURCE_ROOT; };
-		CE515E160FC6C19300EC695D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = dgbase/AppDelegate.m; sourceTree = SOURCE_ROOT; };
-		CE515E170FC6C19300EC695D /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = dgbase/Consts.h; sourceTree = SOURCE_ROOT; };
-		CE515E180FC6C19300EC695D /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = dgbase/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
-		CE515E190FC6C19300EC695D /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = dgbase/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = dgbase/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
-		CE515E1B0FC6C19300EC695D /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = dgbase/ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CE515E1C0FC6C19300EC695D /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = dgbase/ResultWindow.m; sourceTree = SOURCE_ROOT; };
-		CE6032BE0FE6784C007E33FF /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = dgbase/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
-		CE6032BF0FE6784C007E33FF /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = dgbase/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
+		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
+		CE3FBDD11094637800B72D77 /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailsPanel.xib; path = ../../base/xib/DetailsPanel.xib; sourceTree = "<group>"; };
+		CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
+		CE49DEF20FDFEB810098617B /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
+		CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
+		CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; };
+		CE4B59C61119919700C06C9E /* progress.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = progress.xib; sourceTree = "<group>"; };
+		CE4B59C71119919700C06C9E /* registration.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = registration.xib; sourceTree = "<group>"; };
+		CE515DE00FC6C12E00EC695D /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
+		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; };
+		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; };
+		CE515DE90FC6C12E00EC695D /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
+		CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
+		CE515DEB0FC6C12E00EC695D /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
+		CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
+		CE515DEF0FC6C12E00EC695D /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
+		CE515DF00FC6C12E00EC695D /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
+		CE515DF10FC6C12E00EC695D /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
+		CE515DF20FC6C12E00EC695D /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = ../../cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
+		CE515E150FC6C19300EC695D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../base/AppDelegate.h; sourceTree = SOURCE_ROOT; };
+		CE515E160FC6C19300EC695D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ../base/AppDelegate.m; sourceTree = SOURCE_ROOT; };
+		CE515E170FC6C19300EC695D /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = ../base/Consts.h; sourceTree = SOURCE_ROOT; };
+		CE515E180FC6C19300EC695D /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = ../base/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
+		CE515E190FC6C19300EC695D /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = ../base/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
+		CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = ../base/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
+		CE515E1B0FC6C19300EC695D /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = ../base/ResultWindow.h; sourceTree = SOURCE_ROOT; };
+		CE515E1C0FC6C19300EC695D /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = ../base/ResultWindow.m; sourceTree = SOURCE_ROOT; };
+		CE6032BE0FE6784C007E33FF /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
+		CE6032BF0FE6784C007E33FF /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
 		CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
 		CE68EE6609ABC48000971085 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = dgbase/dsa_pub.pem; sourceTree = "<group>"; };
+		CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
 		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
-		CE900AD1109B238600754048 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = ../../xib/Preferences.xib; sourceTree = "<group>"; };
-		CE900AD6109B2A9B00754048 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
+		CE900AD1109B238600754048 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
+		CE900AD6109B2A9B00754048 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../../base/xib/MainMenu.xib; sourceTree = "<group>"; };
 		CECA899A09DB132E00A3D774 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanel.h; sourceTree = "<group>"; };
 		CECA899B09DB132E00A3D774 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DetailsPanel.m; sourceTree = "<group>"; };
+		CED0A591111C9FD10020AD7D /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
+		CEDF07A0112493B200EE5BC0 /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
+		CEDF07A1112493B200EE5BC0 /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
+		CEDF07A2112493B200EE5BC0 /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
-		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = images/folder32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = images/details32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = images/preferences32.png; sourceTree = SOURCE_ROOT; };
+		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
+		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = ../../images/details32.png; sourceTree = SOURCE_ROOT; };
+		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
 		CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -245,6 +270,44 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		CE003CB211242D00004B0AA7 /* controllers */ = {
+			isa = PBXGroup;
+			children = (
+				CE003CB311242D00004B0AA7 /* HSGUIController.h */,
+				CE003CB411242D00004B0AA7 /* HSGUIController.m */,
+				CE003CB511242D00004B0AA7 /* HSOutline.h */,
+				CE003CB611242D00004B0AA7 /* HSOutline.m */,
+				CE003CB711242D00004B0AA7 /* HSWindowController.h */,
+				CE003CB811242D00004B0AA7 /* HSWindowController.m */,
+			);
+			name = controllers;
+			path = ../../cocoalib/controllers;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE003CBB11242D00004B0AA7 /* proxies */ = {
+			isa = PBXGroup;
+			children = (
+				CE003CBC11242D00004B0AA7 /* PyGUI.h */,
+				CE003CBD11242D00004B0AA7 /* PyOutline.h */,
+			);
+			name = proxies;
+			path = ../../cocoalib/proxies;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE003CBF11242D00004B0AA7 /* views */ = {
+			isa = PBXGroup;
+			children = (
+				CE003CC011242D00004B0AA7 /* HSOutlineView.h */,
+				CE003CC111242D00004B0AA7 /* HSOutlineView.m */,
+				CE003CC211242D00004B0AA7 /* NSIndexPathAdditions.h */,
+				CE003CC311242D00004B0AA7 /* NSIndexPathAdditions.m */,
+				CE003CC411242D00004B0AA7 /* NSTableViewAdditions.h */,
+				CE003CC511242D00004B0AA7 /* NSTableViewAdditions.m */,
+			);
+			name = views;
+			path = ../../cocoalib/views;
+			sourceTree = SOURCE_ROOT;
+		};
 		CE3FBDD01094637800B72D77 /* xib */ = {
 			isa = PBXGroup;
 			children = (
@@ -253,8 +316,7 @@
 				CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */,
 				CE900AD1109B238600754048 /* Preferences.xib */,
 			);
-			name = xib;
-			path = dgbase/xib;
+			path = xib;
 			sourceTree = "<group>";
 		};
 		CE49DEF10FDFEB810098617B /* brsinglelineformatter */ = {
@@ -262,35 +324,44 @@
 			children = (
 				CE49DEF20FDFEB810098617B /* BRSingleLineFormatter.h */,
 				CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */,
-				CE49DEF40FDFEB810098617B /* NSCharacterSet_Extensions.h */,
-				CE49DEF50FDFEB810098617B /* NSCharacterSet_Extensions.m */,
 			);
 			name = brsinglelineformatter;
-			path = cocoalib/brsinglelineformatter;
+			path = ../../cocoalib/brsinglelineformatter;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE4B59C41119919700C06C9E /* xib */ = {
+			isa = PBXGroup;
+			children = (
+				CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */,
+				CE4B59C61119919700C06C9E /* progress.xib */,
+				CE4B59C71119919700C06C9E /* registration.xib */,
+			);
+			name = xib;
+			path = ../../cocoalib/xib;
 			sourceTree = SOURCE_ROOT;
 		};
 		CE515DDD0FC6C09400EC695D /* cocoalib */ = {
 			isa = PBXGroup;
 			children = (
+				CE003CB211242D00004B0AA7 /* controllers */,
+				CE003CBB11242D00004B0AA7 /* proxies */,
+				CE003CBF11242D00004B0AA7 /* views */,
+				CE4B59C41119919700C06C9E /* xib */,
 				CE49DEF10FDFEB810098617B /* brsinglelineformatter */,
-				CE515DFC0FC6C13E00EC695D /* ErrorReportWindow.xib */,
-				CE515DFE0FC6C13E00EC695D /* progress.nib */,
-				CE515E000FC6C13E00EC695D /* registration.nib */,
 				CE515DE00FC6C12E00EC695D /* Dialogs.h */,
 				CE515DE10FC6C12E00EC695D /* Dialogs.m */,
 				CE515DE20FC6C12E00EC695D /* HSErrorReportWindow.h */,
 				CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */,
-				CE515DE40FC6C12E00EC695D /* Outline.h */,
-				CE515DE50FC6C12E00EC695D /* Outline.m */,
+				CE003CB911242D00004B0AA7 /* NSEventAdditions.h */,
+				CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */,
 				CE515DE60FC6C12E00EC695D /* ProgressController.h */,
 				CE515DE70FC6C12E00EC695D /* ProgressController.m */,
 				CE515DE80FC6C12E00EC695D /* PyApp.h */,
+				CE003CBE11242D00004B0AA7 /* PyRegistrable.h */,
 				CE515DE90FC6C12E00EC695D /* RecentDirectories.h */,
 				CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */,
 				CE515DEB0FC6C12E00EC695D /* RegistrationInterface.h */,
 				CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */,
-				CE515DED0FC6C12E00EC695D /* Table.h */,
-				CE515DEE0FC6C12E00EC695D /* Table.m */,
 				CE515DEF0FC6C12E00EC695D /* Utils.h */,
 				CE515DF00FC6C12E00EC695D /* Utils.m */,
 				CE515DF10FC6C12E00EC695D /* ValueTransformers.h */,
@@ -302,6 +373,9 @@
 		CE515E140FC6C17900EC695D /* dgbase */ = {
 			isa = PBXGroup;
 			children = (
+				CE003CCD11242D2C004B0AA7 /* DirectoryOutline.h */,
+				CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */,
+				CE003CCF11242D2C004B0AA7 /* PyDirectoryOutline.h */,
 				CE515E150FC6C19300EC695D /* AppDelegate.h */,
 				CE515E160FC6C19300EC695D /* AppDelegate.m */,
 				CE515E170FC6C19300EC695D /* Consts.h */,
@@ -309,9 +383,16 @@
 				CE6032BF0FE6784C007E33FF /* DetailsPanel.m */,
 				CE515E180FC6C19300EC695D /* DirectoryPanel.h */,
 				CE515E190FC6C19300EC695D /* DirectoryPanel.m */,
-				CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */,
 				CE515E1B0FC6C19300EC695D /* ResultWindow.h */,
 				CE515E1C0FC6C19300EC695D /* ResultWindow.m */,
+				CE0B3D6511243F83009A7A30 /* ResultOutline.h */,
+				CE0B3D6611243F83009A7A30 /* ResultOutline.m */,
+				CEDF07A1112493B200EE5BC0 /* StatsLabel.h */,
+				CEDF07A2112493B200EE5BC0 /* StatsLabel.m */,
+				CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */,
+				CED0A591111C9FD10020AD7D /* PyDetailsPanel.h */,
+				CE0B3D6411243F83009A7A30 /* PyResultTree.h */,
+				CEDF07A0112493B200EE5BC0 /* PyStatsLabel.h */,
 			);
 			name = dgbase;
 			sourceTree = "<group>";
@@ -377,14 +458,14 @@
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
 				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
 				CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
-				CE515E020FC6C13E00EC695D /* ErrorReportWindow.xib in Resources */,
-				CE515E030FC6C13E00EC695D /* progress.nib in Resources */,
-				CE515E040FC6C13E00EC695D /* registration.nib in Resources */,
 				CE6E0E9F1054EB97008D9390 /* dsa_pub.pem in Resources */,
 				CE3FBDD31094637800B72D77 /* DetailsPanel.xib in Resources */,
 				CE3FBDD41094637800B72D77 /* DirectoryPanel.xib in Resources */,
 				CE900AD2109B238600754048 /* Preferences.xib in Resources */,
 				CE900AD7109B2A9B00754048 /* MainMenu.xib in Resources */,
+				CE4B59C81119919700C06C9E /* ErrorReportWindow.xib in Resources */,
+				CE4B59C91119919700C06C9E /* progress.xib in Resources */,
+				CE4B59CA1119919700C06C9E /* registration.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -399,84 +480,82 @@
 				CE381C9609914ACE003581CE /* AppDelegate.m in Sources */,
 				CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */,
 				CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */,
-				CECA899D09DB132E00A3D774 /* DetailsPanel.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 */,
-				CE515DF90FC6C12E00EC695D /* Table.m in Sources */,
 				CE515DFA0FC6C12E00EC695D /* Utils.m in Sources */,
 				CE515DFB0FC6C12E00EC695D /* ValueTransformers.m in Sources */,
 				CE515E1D0FC6C19300EC695D /* AppDelegate.m in Sources */,
 				CE515E1E0FC6C19300EC695D /* DirectoryPanel.m in Sources */,
 				CE515E1F0FC6C19300EC695D /* ResultWindow.m in Sources */,
 				CE49DEF60FDFEB810098617B /* BRSingleLineFormatter.m in Sources */,
-				CE49DEF70FDFEB810098617B /* NSCharacterSet_Extensions.m in Sources */,
 				CE6032C00FE6784C007E33FF /* DetailsPanel.m in Sources */,
+				CE003CC611242D00004B0AA7 /* HSGUIController.m in Sources */,
+				CE003CC711242D00004B0AA7 /* HSOutline.m in Sources */,
+				CE003CC811242D00004B0AA7 /* HSWindowController.m in Sources */,
+				CE003CC911242D00004B0AA7 /* NSEventAdditions.m in Sources */,
+				CE003CCA11242D00004B0AA7 /* HSOutlineView.m in Sources */,
+				CE003CCB11242D00004B0AA7 /* NSIndexPathAdditions.m in Sources */,
+				CE003CCC11242D00004B0AA7 /* NSTableViewAdditions.m in Sources */,
+				CE003CD011242D2C004B0AA7 /* DirectoryOutline.m in Sources */,
+				CE0B3D6711243F83009A7A30 /* ResultOutline.m in Sources */,
+				CEDF07A3112493B200EE5BC0 /* StatsLabel.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXVariantGroup section */
-		CE515DFC0FC6C13E00EC695D /* ErrorReportWindow.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CE515DFD0FC6C13E00EC695D /* English */,
-			);
-			name = ErrorReportWindow.xib;
-			sourceTree = SOURCE_ROOT;
-		};
-		CE515DFE0FC6C13E00EC695D /* progress.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CE515DFF0FC6C13E00EC695D /* English */,
-			);
-			name = progress.nib;
-			sourceTree = SOURCE_ROOT;
-		};
-		CE515E000FC6C13E00EC695D /* registration.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CE515E010FC6C13E00EC695D /* English */,
-			);
-			name = registration.nib;
-			sourceTree = SOURCE_ROOT;
-		};
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
-		C01FCF4C08A954540054247B /* Release */ = {
+		C01FCF4C08A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(FRAMEWORK_SEARCH_PATHS)",
-					"$(SRCROOT)/../../../cocoalib/build/Release",
-					"\"$(SRCROOT)/../../base/cocoa/build/Release\"",
-				);
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				PRODUCT_NAME = "dupeGuru ME";
 				WRAPPER_EXTENSION = app;
 			};
-			name = Release;
+			name = release;
 		};
-		C01FCF5008A954540054247B /* Release */ = {
+		C01FCF5008A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+				ARCHS = (
+					i386,
+					x86_64,
+					ppc,
+				);
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
 			};
-			name = Release;
+			name = release;
+		};
+		CED596C5111AF56D00C0CF2B /* dev */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+			};
+			name = dev;
+		};
+		CED596C6111AF56D00C0CF2B /* dev */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Applications";
+				PRODUCT_NAME = "dupeGuru ME";
+				WRAPPER_EXTENSION = app;
+			};
+			name = dev;
 		};
 /* End XCBuildConfiguration section */
 
@@ -484,18 +563,20 @@
 		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF4C08A954540054247B /* Release */,
+				C01FCF4C08A954540054247B /* release */,
+				CED596C6111AF56D00C0CF2B /* dev */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = release;
 		};
 		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF5008A954540054247B /* Release */,
+				C01FCF5008A954540054247B /* release */,
+				CED596C5111AF56D00C0CF2B /* dev */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = release;
 		};
 /* End XCConfigurationList section */
 	};

cocoa/me/main.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,10 +7,12 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
+#import "Utils.h"
 
 int main(int argc, char *argv[])
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    [Utils setPluginName:@"dg_cocoa"];
     NSString *pluginPath = [[NSBundle mainBundle]
                                 pathForResource:@"dg_cocoa"
                                          ofType:@"plugin"];

cocoa/me/xib/Preferences.xib

@@ -133,7 +133,7 @@
 							<object class="NSTextFieldCell" key="NSCell" id="602722407">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">71303168</int>
-								<string key="NSContents">Less results</string>
+								<string key="NSContents">Fewer results</string>
 								<reference key="NSSupport" ref="262032469"/>
 								<reference key="NSControlView" ref="735544762"/>
 								<reference key="NSBackgroundColor" ref="221998487"/>

cocoa/pe/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,17 +7,12 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/AppDelegate.h"
-#import "DirectoryPanel.h"
+#import "../base/AppDelegate.h"
 #import "PyDupeGuru.h"
 
-@interface AppDelegate : AppDelegateBase
-{
-    DirectoryPanel *_directoryPanel;
-}
+@interface AppDelegate : AppDelegateBase {}
 - (IBAction)openWebsite:(id)sender;
 - (IBAction)toggleDirectories:(id)sender;
 
-- (DirectoryPanel *)directoryPanel;
 - (PyDupeGuru *)py;
 @end

cocoa/pe/AppDelegate.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -13,6 +13,7 @@ http://www.hardcoded.net/licenses/hs_license
 #import "ValueTransformers.h"
 #import "Consts.h"
 #import "DetailsPanel.h"
+#import "DirectoryPanel.h"
 
 @implementation AppDelegate
 + (void)initialize
@@ -37,14 +38,13 @@ http://www.hardcoded.net/licenses/hs_license
 {
     self = [super init];
     _directoryPanel = nil;
-    _appName = APPNAME;
     return self;
 }
 
-- (DetailsPanelBase *)detailsPanel
+- (DetailsPanel *)detailsPanel
 {
     if (!_detailsPanel)
-        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
+        _detailsPanel = [[DetailsPanelPE alloc] initWithPy:py];
     return _detailsPanel;
 }
 
@@ -61,7 +61,7 @@ http://www.hardcoded.net/licenses/hs_license
 - (DirectoryPanel *)directoryPanel
 {
     if (!_directoryPanel)
-        _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self];
+        _directoryPanel = [[DirectoryPanelPE alloc] initWithParentApp:self];
     return _directoryPanel;
 }
 - (PyDupeGuru *)py { return (PyDupeGuru *)py; }
@@ -76,36 +76,4 @@ http://www.hardcoded.net/licenses/hs_license
     [mi setKeyEquivalentModifierMask:NSCommandKeyMask|NSShiftKeyMask];
     [super applicationDidFinishLaunching:aNotification];
 }
-
-- (void)applicationWillBecomeActive:(NSNotification *)aNotification
-{
-    if (![[result window] isVisible])
-        [result showWindow:NSApp];
-}
-
-- (void)applicationWillTerminate:(NSNotification *)aNotification
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [ud setObject: [result getColumnsOrder] forKey:@"columnsOrder"];
-    [ud setObject: [result getColumnsWidth] forKey:@"columnsWidth"];
-    [py saveIgnoreList];
-    [py saveResults];
-    int sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
-    if (sc >= 10)
-    {
-        sc = -1;
-        [py purgeIgnoreList];
-    }
-    sc++;
-    [ud setInteger:sc forKey:@"sessionCountSinceLastIgnorePurge"];
-    // NSApplication does not release nib instances objects, we must do it manually
-    // Well, it isn't needed because the memory is freed anyway (we are quitting the application
-    // But I need to release RecentDirectories so it saves the user defaults
-    [recentDirectories release];
-}
-
-- (void)recentDirecoryClicked:(NSString *)directory
-{
-    [[self directoryPanel] addDirectory:directory];
-}
 @end

cocoa/pe/Consts.h

@@ -1,12 +1,11 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 "dgbase/Consts.h"
+#import "../base/Consts.h"
 
-#define APPNAME @"dupeGuru PE"
 #define ImageLoadedNotification @"ImageLoadedNotification"

cocoa/pe/DetailsPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,16 +7,16 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DetailsPanel.h"
+#import "../base/DetailsPanel.h"
 
-@interface DetailsPanel : DetailsPanelBase
+@interface DetailsPanelPE : DetailsPanel
 {
     IBOutlet NSImageView *dupeImage;
     IBOutlet NSProgressIndicator *dupeProgressIndicator;
     IBOutlet NSImageView *refImage;
     IBOutlet NSProgressIndicator *refProgressIndicator;
     
-    PyApp *py;
+    PyApp *pyApp;
     BOOL _needsRefresh;
     NSString *_dupePath;
     NSString *_refPath;

cocoa/pe/DetailsPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -13,11 +13,11 @@ http://www.hardcoded.net/licenses/hs_license
 #import "DetailsPanel.h"
 #import "Consts.h"
 
-@implementation DetailsPanel
+@implementation DetailsPanelPE
 - (id)initWithPy:(PyApp *)aPy
 {
     self = [super initWithPy:aPy];
-    py = aPy;
+    pyApp = aPy;
     _needsRefresh = YES;
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(imageLoaded:) name:ImageLoadedNotification object:self];
     return self;
@@ -36,18 +36,18 @@ http://www.hardcoded.net/licenses/hs_license
     [pool release];
 }
 
-- (void)refresh
+- (void)refreshDetails
 {
     if (!_needsRefresh)
         return;
     [detailsTable reloadData];
     
-    NSString *refPath = [(PyDupeGuru *)py getSelectedDupeRefPath];
+    NSString *refPath = [(PyDupeGuru *)pyApp getSelectedDupeRefPath];
     if (_refPath != nil)
         [_refPath autorelease];
     _refPath = [refPath retain];
     [NSThread detachNewThreadSelector:@selector(loadImageAsync:) toTarget:self withObject:refPath];
-    NSString *dupePath = [(PyDupeGuru *)py getSelectedDupePath];
+    NSString *dupePath = [(PyDupeGuru *)pyApp getSelectedDupePath];
     if (_dupePath != nil)
         [_dupePath autorelease];
     _dupePath = [dupePath retain];
@@ -59,12 +59,6 @@ http://www.hardcoded.net/licenses/hs_license
 }
 
 /* Notifications */
-- (void)duplicateSelectionChanged:(NSNotification *)aNotification
-{
-    _needsRefresh = YES;
-	[super duplicateSelectionChanged:aNotification];
-}
-
 - (void)imageLoaded:(NSNotification *)aNotification
 {
     NSString *imagePath = [[aNotification userInfo] valueForKey:@"imagePath"];
@@ -80,4 +74,11 @@ http://www.hardcoded.net/licenses/hs_license
         [dupeProgressIndicator stopAnimation:nil];
     }
 }
+
+/* Python --> Cocoa */
+- (void)refresh
+{
+    _needsRefresh = YES;
+    [super refresh];
+}
 @end

cocoa/pe/DirectoryPanel.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,9 +7,9 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/DirectoryPanel.h"
+#import "../base/DirectoryPanel.h"
 
-@interface DirectoryPanel : DirectoryPanelBase
+@interface DirectoryPanelPE : DirectoryPanel
 {
 }
 - (IBAction)addiPhoto:(id)sender;

cocoa/pe/DirectoryPanel.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -11,7 +11,7 @@ http://www.hardcoded.net/licenses/hs_license
 
 static NSString* jobAddIPhoto = @"jobAddIPhoto";
 
-@implementation DirectoryPanel
+@implementation DirectoryPanelPE
 - (id)initWithParentApp:(id)aParentApp
 {
     self = [super initWithParentApp:aParentApp];
@@ -44,9 +44,8 @@ static NSString* jobAddIPhoto = @"jobAddIPhoto";
 
 - (void)jobCompleted:(NSNotification *)aNotification
 {
-    if ([[ProgressController mainProgressController] jobId] == jobAddIPhoto)
-    {
-        [directories reloadData];
+    if ([[ProgressController mainProgressController] jobId] == jobAddIPhoto) {
+        [outlineView reloadData];
     }
 }
 @end

cocoa/pe/Info.plist

@@ -23,13 +23,13 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.0</string>
+	<string>1.8.3</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© Hardcoded Software, 2009</string>
+	<string>© Hardcoded Software, 2010</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru_pe.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/pe/PyDupeGuru.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/PyDupeGuru.h"
+#import "../base/PyDupeGuru.h"
 
 @interface PyDupeGuru : PyDupeGuruBase
 - (void)clearPictureCache;

cocoa/pe/ResultWindow.h

@@ -0,0 +1,17 @@
+/* 
+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 "Outline.h"
+#import "../base/ResultWindow.h"
+
+@interface ResultWindow : ResultWindowBase {}
+- (IBAction)clearPictureCache:(id)sender;
+- (IBAction)startDuplicateScan:(id)sender;
+- (IBAction)toggleDirectories:(id)sender;
+@end

cocoa/pe/ResultWindow.m

@@ -0,0 +1,101 @@
+/* 
+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 "ResultWindow.h"
+#import "Dialogs.h"
+#import "ProgressController.h"
+#import "RegistrationInterface.h"
+#import "Utils.h"
+#import "AppDelegate.h"
+#import "Consts.h"
+
+@implementation ResultWindow
+/* Override */
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    [[self window] setTitle:@"dupeGuru Picture Edition"];
+    _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,5)] retain];
+    [_deltaColumns removeIndex:3];
+    [_deltaColumns removeIndex:4];
+}
+
+/* Actions */
+- (IBAction)clearPictureCache:(id)sender
+{
+    if ([Dialogs askYesNo:@"Do you really want to remove all your cached picture analysis?"] == NSAlertSecondButtonReturn) // NO
+        return;
+    [(PyDupeGuru *)py clearPictureCache];
+}
+
+- (IBAction)resetColumnsToDefault:(id)sender
+{
+    NSMutableArray *columnsOrder = [NSMutableArray array];
+    [columnsOrder addObject:@"0"];
+    [columnsOrder addObject:@"1"];
+    [columnsOrder addObject:@"2"];
+    [columnsOrder addObject:@"4"];
+    [columnsOrder addObject:@"7"];
+    NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
+    [columnsWidth setObject:i2n(121) forKey:@"0"];
+    [columnsWidth setObject:i2n(120) forKey:@"1"];
+    [columnsWidth setObject:i2n(63) forKey:@"2"];
+    [columnsWidth setObject:i2n(73) forKey:@"4"];
+    [columnsWidth setObject:i2n(58) forKey:@"7"];
+    [self restoreColumnsPosition:columnsOrder widths:columnsWidth];
+}
+
+- (IBAction)startDuplicateScan:(id)sender
+{
+    if ([matches numberOfRows] > 0)
+    {
+        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
+            return;
+    }
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    PyDupeGuru *_py = (PyDupeGuru *)py;
+    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
+    [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
+    [_py setMatchScaled:[ud objectForKey:@"matchScaled"]];
+    int r = n2i([py doScan]);
+    [matches reloadData];
+    [self refreshStats];
+    if (r != 0)
+        [[ProgressController mainProgressController] hide];
+    if (r == 1)
+        [Dialogs showMessage:@"You cannot make a duplicate scan with only reference directories."];
+    if (r == 3)
+    {
+        [Dialogs showMessage:@"The selected directories contain no scannable file."];
+        [app toggleDirectories:nil];
+    }
+}
+
+- (IBAction)toggleDirectories:(id)sender
+{
+    [(AppDelegate *)app toggleDirectories:sender];
+}
+
+/* Public */
+- (void)initResultColumns
+{
+    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
+    _resultColumns = [[NSMutableArray alloc] init];
+    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
+    [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
+    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (KB)" width:63 refCol:refCol];
+    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:sizeCol];
+    [_resultColumns addObject:[self getColumnForIdentifier:3 title:@"Kind" width:40 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:4 title:@"Dimensions" width:80 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Creation" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Modification" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Match %" width:58 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Dupe Count" width:80 refCol:refCol]];
+}
+@end

cocoa/pe/dg_cocoa.py

@@ -0,0 +1,39 @@
+# 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
+
+from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
+from core_pe import app_cocoa as app_pe_cocoa
+
+# Fix py2app imports which chokes on relative imports
+from core_pe import block, cache, matchbase, data, _block_osx
+
+class PyDupeGuru(PyDupeGuruBase):
+    def init(self):
+        self = super(PyDupeGuru, self).init()
+        self.py = app_pe_cocoa.DupeGuruPE()
+        return self
+    
+    def clearPictureCache(self):
+        self.py.scanner.clear_picture_cache()
+    
+    #---Information    
+    def getSelectedDupePath(self):
+        return unicode(self.py.selected_dupe_path())
+    
+    def getSelectedDupeRefPath(self):
+        return unicode(self.py.selected_dupe_ref_path())
+    
+    #---Properties
+    def setMatchScaled_(self,match_scaled):
+        self.py.scanner.match_scaled = match_scaled
+    
+    def setMinMatchPercentage_(self,percentage):
+        self.py.scanner.threshold = int(percentage)
+    
+    #---Registration
+    def appName(self):
+        return "dupeGuru Picture Edition"
+    

cocoa/pe/dupeguru.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		CE031751109B340A00517EE6 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031750109B340A00517EE6 /* Preferences.xib */; };
 		CE031754109B345200517EE6 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031753109B345200517EE6 /* MainMenu.xib */; };
 		CE073F6309CAE1A3005C1D2F /* dupeguru_pe_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */; };
-		CE0C46AA0FA0647E000BE99B /* PictureBlocks.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C46A90FA0647E000BE99B /* PictureBlocks.m */; };
 		CE15C8A80ADEB8B50061D4A5 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
 		CE15C8C00ADEB8D40061D4A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
@@ -23,26 +22,32 @@
 		CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */; };
 		CE77C89E10946C6D0078B0DB /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */; };
 		CE77C8A810946CE20078B0DB /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE77C8A710946CE20078B0DB /* DetailsPanel.xib */; };
+		CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */; };
+		CE7AC9191119911200D02F6C /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9161119911200D02F6C /* progress.xib */; };
+		CE7AC91A1119911200D02F6C /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9171119911200D02F6C /* registration.xib */; };
 		CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1C0FC192D60086DCA6 /* Dialogs.m */; };
 		CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */; };
 		CE80DB300FC192D60086DCA6 /* Outline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB200FC192D60086DCA6 /* Outline.m */; };
 		CE80DB310FC192D60086DCA6 /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB220FC192D60086DCA6 /* ProgressController.m */; };
 		CE80DB320FC192D60086DCA6 /* RecentDirectories.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB250FC192D60086DCA6 /* RecentDirectories.m */; };
 		CE80DB330FC192D60086DCA6 /* RegistrationInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */; };
-		CE80DB340FC192D60086DCA6 /* Table.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB290FC192D60086DCA6 /* Table.m */; };
 		CE80DB350FC192D60086DCA6 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB2B0FC192D60086DCA6 /* Utils.m */; };
 		CE80DB360FC192D60086DCA6 /* ValueTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB2D0FC192D60086DCA6 /* ValueTransformers.m */; };
 		CE80DB470FC193650086DCA6 /* NSNotificationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB460FC193650086DCA6 /* NSNotificationAdditions.m */; };
 		CE80DB4A0FC193770086DCA6 /* NSImageAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB490FC193770086DCA6 /* NSImageAdditions.m */; };
-		CE80DB760FC194760086DCA6 /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE80DB700FC194760086DCA6 /* ErrorReportWindow.xib */; };
-		CE80DB770FC194760086DCA6 /* progress.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE80DB720FC194760086DCA6 /* progress.nib */; };
-		CE80DB780FC194760086DCA6 /* registration.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE80DB740FC194760086DCA6 /* registration.nib */; };
 		CE80DB8A0FC1951C0086DCA6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB830FC1951C0086DCA6 /* AppDelegate.m */; };
 		CE80DB8B0FC1951C0086DCA6 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */; };
 		CE80DB8C0FC1951C0086DCA6 /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB890FC1951C0086DCA6 /* ResultWindow.m */; };
 		CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; };
+		CE9EA7561122C96C008CD2BC /* HSGUIController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7441122C96C008CD2BC /* HSGUIController.m */; };
+		CE9EA7571122C96C008CD2BC /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7461122C96C008CD2BC /* HSOutline.m */; };
+		CE9EA7581122C96C008CD2BC /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7481122C96C008CD2BC /* HSWindowController.m */; };
+		CE9EA7591122C96C008CD2BC /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA74A1122C96C008CD2BC /* NSEventAdditions.m */; };
+		CE9EA75A1122C96C008CD2BC /* HSOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7511122C96C008CD2BC /* HSOutlineView.m */; };
+		CE9EA75B1122C96C008CD2BC /* NSIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7531122C96C008CD2BC /* NSIndexPathAdditions.m */; };
+		CE9EA75C1122C96C008CD2BC /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7551122C96C008CD2BC /* NSTableViewAdditions.m */; };
+		CE9EA7721122CA0B008CD2BC /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */; };
 		CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */; };
-		CEBAE4280FDA97E000B7887D /* NSCharacterSet_Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBAE4260FDA97E000B7887D /* NSCharacterSet_Extensions.m */; };
 		CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; };
 		CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
@@ -75,70 +80,85 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		8D1107320486CEB800E47090 /* dupeGuru PE.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "dupeGuru PE.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE031750109B340A00517EE6 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = ../../xib/Preferences.xib; sourceTree = "<group>"; };
-		CE031753109B345200517EE6 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_pe_help; path = help/dupeguru_pe_help; sourceTree = SOURCE_ROOT; };
-		CE0C46A80FA0647E000BE99B /* PictureBlocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureBlocks.h; sourceTree = "<group>"; };
-		CE0C46A90FA0647E000BE99B /* PictureBlocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureBlocks.m; sourceTree = "<group>"; };
+		CE031750109B340A00517EE6 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
+		CE031753109B345200517EE6 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../../base/xib/MainMenu.xib; sourceTree = "<group>"; };
+		CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_pe_help; path = ../../help_pe/dupeguru_pe_help; sourceTree = SOURCE_ROOT; };
 		CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
+		CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		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; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dg_cocoa.plugin; path = py/dist/dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
-		CE6044EA0FE6796200B71262 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = dgbase/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
-		CE6044EB0FE6796200B71262 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = dgbase/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
+		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
+		CE6044EA0FE6796200B71262 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
+		CE6044EB0FE6796200B71262 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
 		CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
 		CE68EE6609ABC48000971085 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = dgbase/dsa_pub.pem; sourceTree = "<group>"; };
-		CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DirectoryPanel.xib; sourceTree = "<group>"; };
-		CE77C8A710946CE20078B0DB /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailsPanel.xib; path = ../../xib/DetailsPanel.xib; sourceTree = "<group>"; };
-		CE80DB1B0FC192D60086DCA6 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
-		CE80DB1C0FC192D60086DCA6 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
-		CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
-		CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow.m; path = cocoalib/HSErrorReportWindow.m; sourceTree = SOURCE_ROOT; };
-		CE80DB1F0FC192D60086DCA6 /* Outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Outline.h; path = cocoalib/Outline.h; sourceTree = SOURCE_ROOT; };
-		CE80DB200FC192D60086DCA6 /* Outline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Outline.m; path = cocoalib/Outline.m; sourceTree = SOURCE_ROOT; };
-		CE80DB210FC192D60086DCA6 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
-		CE80DB220FC192D60086DCA6 /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
-		CE80DB230FC192D60086DCA6 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
-		CE80DB240FC192D60086DCA6 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CE80DB250FC192D60086DCA6 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CE80DB260FC192D60086DCA6 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
-		CE80DB280FC192D60086DCA6 /* Table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Table.h; path = cocoalib/Table.h; sourceTree = SOURCE_ROOT; };
-		CE80DB290FC192D60086DCA6 /* Table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Table.m; path = cocoalib/Table.m; sourceTree = SOURCE_ROOT; };
-		CE80DB2A0FC192D60086DCA6 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
-		CE80DB2B0FC192D60086DCA6 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
-		CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
-		CE80DB2D0FC192D60086DCA6 /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
-		CE80DB450FC193650086DCA6 /* NSNotificationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSNotificationAdditions.h; path = cocoalib/NSNotificationAdditions.h; sourceTree = SOURCE_ROOT; };
-		CE80DB460FC193650086DCA6 /* NSNotificationAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSNotificationAdditions.m; path = cocoalib/NSNotificationAdditions.m; sourceTree = SOURCE_ROOT; };
-		CE80DB480FC193770086DCA6 /* NSImageAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSImageAdditions.h; path = cocoalib/NSImageAdditions.h; sourceTree = SOURCE_ROOT; };
-		CE80DB490FC193770086DCA6 /* NSImageAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSImageAdditions.m; path = cocoalib/NSImageAdditions.m; sourceTree = SOURCE_ROOT; };
-		CE80DB710FC194760086DCA6 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = cocoalib/English.lproj/ErrorReportWindow.xib; sourceTree = SOURCE_ROOT; };
-		CE80DB730FC194760086DCA6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/progress.nib; sourceTree = SOURCE_ROOT; };
-		CE80DB750FC194760086DCA6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/registration.nib; sourceTree = SOURCE_ROOT; };
-		CE80DB820FC1951C0086DCA6 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = dgbase/AppDelegate.h; sourceTree = SOURCE_ROOT; };
-		CE80DB830FC1951C0086DCA6 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = dgbase/AppDelegate.m; sourceTree = SOURCE_ROOT; };
-		CE80DB840FC1951C0086DCA6 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = dgbase/Consts.h; sourceTree = SOURCE_ROOT; };
-		CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = dgbase/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
-		CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = dgbase/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = dgbase/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
-		CE80DB880FC1951C0086DCA6 /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = dgbase/ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CE80DB890FC1951C0086DCA6 /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = dgbase/ResultWindow.m; sourceTree = SOURCE_ROOT; };
+		CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
+		CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
+		CE77C8A710946CE20078B0DB /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DetailsPanel.xib; sourceTree = "<group>"; };
+		CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; };
+		CE7AC9161119911200D02F6C /* progress.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = progress.xib; sourceTree = "<group>"; };
+		CE7AC9171119911200D02F6C /* registration.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = registration.xib; sourceTree = "<group>"; };
+		CE80DB1B0FC192D60086DCA6 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
+		CE80DB1C0FC192D60086DCA6 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
+		CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
+		CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow.m; path = ../../cocoalib/HSErrorReportWindow.m; sourceTree = SOURCE_ROOT; };
+		CE80DB1F0FC192D60086DCA6 /* Outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Outline.h; path = ../../cocoalib/Outline.h; sourceTree = SOURCE_ROOT; };
+		CE80DB200FC192D60086DCA6 /* Outline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Outline.m; path = ../../cocoalib/Outline.m; sourceTree = SOURCE_ROOT; };
+		CE80DB210FC192D60086DCA6 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
+		CE80DB220FC192D60086DCA6 /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
+		CE80DB230FC192D60086DCA6 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
+		CE80DB240FC192D60086DCA6 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
+		CE80DB250FC192D60086DCA6 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
+		CE80DB260FC192D60086DCA6 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
+		CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
+		CE80DB2A0FC192D60086DCA6 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
+		CE80DB2B0FC192D60086DCA6 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
+		CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
+		CE80DB2D0FC192D60086DCA6 /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = ../../cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
+		CE80DB450FC193650086DCA6 /* NSNotificationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSNotificationAdditions.h; path = ../../cocoalib/NSNotificationAdditions.h; sourceTree = SOURCE_ROOT; };
+		CE80DB460FC193650086DCA6 /* NSNotificationAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSNotificationAdditions.m; path = ../../cocoalib/NSNotificationAdditions.m; sourceTree = SOURCE_ROOT; };
+		CE80DB480FC193770086DCA6 /* NSImageAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSImageAdditions.h; path = ../../cocoalib/NSImageAdditions.h; sourceTree = SOURCE_ROOT; };
+		CE80DB490FC193770086DCA6 /* NSImageAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSImageAdditions.m; path = ../../cocoalib/NSImageAdditions.m; sourceTree = SOURCE_ROOT; };
+		CE80DB820FC1951C0086DCA6 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../base/AppDelegate.h; sourceTree = SOURCE_ROOT; };
+		CE80DB830FC1951C0086DCA6 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ../base/AppDelegate.m; sourceTree = SOURCE_ROOT; };
+		CE80DB840FC1951C0086DCA6 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = ../base/Consts.h; sourceTree = SOURCE_ROOT; };
+		CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = ../base/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
+		CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = ../base/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
+		CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = ../base/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
+		CE80DB880FC1951C0086DCA6 /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = ../base/ResultWindow.h; sourceTree = SOURCE_ROOT; };
+		CE80DB890FC1951C0086DCA6 /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = ../base/ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
-		CEBAE4230FDA97E000B7887D /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
-		CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
-		CEBAE4250FDA97E000B7887D /* NSCharacterSet_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSCharacterSet_Extensions.h; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.h; sourceTree = SOURCE_ROOT; };
-		CEBAE4260FDA97E000B7887D /* NSCharacterSet_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSCharacterSet_Extensions.m; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.m; sourceTree = SOURCE_ROOT; };
+		CE9EA7431122C96C008CD2BC /* HSGUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSGUIController.h; sourceTree = "<group>"; };
+		CE9EA7441122C96C008CD2BC /* HSGUIController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSGUIController.m; sourceTree = "<group>"; };
+		CE9EA7451122C96C008CD2BC /* HSOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutline.h; sourceTree = "<group>"; };
+		CE9EA7461122C96C008CD2BC /* HSOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutline.m; sourceTree = "<group>"; };
+		CE9EA7471122C96C008CD2BC /* HSWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSWindowController.h; sourceTree = "<group>"; };
+		CE9EA7481122C96C008CD2BC /* HSWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSWindowController.m; sourceTree = "<group>"; };
+		CE9EA7491122C96C008CD2BC /* NSEventAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSEventAdditions.h; path = ../../cocoalib/NSEventAdditions.h; sourceTree = SOURCE_ROOT; };
+		CE9EA74A1122C96C008CD2BC /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
+		CE9EA74C1122C96C008CD2BC /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = "<group>"; };
+		CE9EA74D1122C96C008CD2BC /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = "<group>"; };
+		CE9EA74E1122C96C008CD2BC /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
+		CE9EA7501122C96C008CD2BC /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
+		CE9EA7511122C96C008CD2BC /* HSOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutlineView.m; sourceTree = "<group>"; };
+		CE9EA7521122C96C008CD2BC /* NSIndexPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSIndexPathAdditions.h; sourceTree = "<group>"; };
+		CE9EA7531122C96C008CD2BC /* NSIndexPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSIndexPathAdditions.m; sourceTree = "<group>"; };
+		CE9EA7541122C96C008CD2BC /* NSTableViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTableViewAdditions.h; sourceTree = "<group>"; };
+		CE9EA7551122C96C008CD2BC /* NSTableViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSTableViewAdditions.m; sourceTree = "<group>"; };
+		CE9EA76F1122CA0B008CD2BC /* DirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryOutline.h; path = ../base/DirectoryOutline.h; sourceTree = SOURCE_ROOT; };
+		CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryOutline.m; path = ../base/DirectoryOutline.m; sourceTree = SOURCE_ROOT; };
+		CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
+		CEBAE4230FDA97E000B7887D /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
+		CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
 		CECA899A09DB132E00A3D774 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanel.h; sourceTree = "<group>"; };
 		CECA899B09DB132E00A3D774 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DetailsPanel.m; sourceTree = "<group>"; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
-		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = images/folder32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = images/details32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = images/preferences32.png; sourceTree = SOURCE_ROOT; };
-		CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dgpe_logo_32.png; path = images/dgpe_logo_32.png; sourceTree = SOURCE_ROOT; };
+		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
+		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = ../../images/details32.png; sourceTree = SOURCE_ROOT; };
+		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
+		CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dgpe_logo_32.png; path = ../../images/dgpe_logo_32.png; sourceTree = SOURCE_ROOT; };
 		CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -158,8 +178,6 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				CE0C46A80FA0647E000BE99B /* PictureBlocks.h */,
-				CE0C46A90FA0647E000BE99B /* PictureBlocks.m */,
 				CE381C9509914ACE003581CE /* AppDelegate.h */,
 				CE381C9409914ACE003581CE /* AppDelegate.m */,
 				CE848A1809DD85810004CB44 /* Consts.h */,
@@ -254,21 +272,34 @@
 				CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */,
 				CE031750109B340A00517EE6 /* Preferences.xib */,
 			);
-			name = xib;
-			path = dgbase/xib;
+			path = xib;
 			sourceTree = "<group>";
 		};
+		CE7AC9141119911200D02F6C /* xib */ = {
+			isa = PBXGroup;
+			children = (
+				CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */,
+				CE7AC9161119911200D02F6C /* progress.xib */,
+				CE7AC9171119911200D02F6C /* registration.xib */,
+			);
+			name = xib;
+			path = ../../cocoalib/xib;
+			sourceTree = SOURCE_ROOT;
+		};
 		CE80DB1A0FC192AB0086DCA6 /* cocoalib */ = {
 			isa = PBXGroup;
 			children = (
+				CE9EA7421122C96C008CD2BC /* controllers */,
+				CE9EA74B1122C96C008CD2BC /* proxies */,
+				CE9EA74F1122C96C008CD2BC /* views */,
+				CE7AC9141119911200D02F6C /* xib */,
 				CEBAE4220FDA97E000B7887D /* brsinglelineformatter */,
-				CE80DB700FC194760086DCA6 /* ErrorReportWindow.xib */,
-				CE80DB720FC194760086DCA6 /* progress.nib */,
-				CE80DB740FC194760086DCA6 /* registration.nib */,
 				CE80DB480FC193770086DCA6 /* NSImageAdditions.h */,
 				CE80DB490FC193770086DCA6 /* NSImageAdditions.m */,
 				CE80DB450FC193650086DCA6 /* NSNotificationAdditions.h */,
 				CE80DB460FC193650086DCA6 /* NSNotificationAdditions.m */,
+				CE9EA7491122C96C008CD2BC /* NSEventAdditions.h */,
+				CE9EA74A1122C96C008CD2BC /* NSEventAdditions.m */,
 				CE80DB1B0FC192D60086DCA6 /* Dialogs.h */,
 				CE80DB1C0FC192D60086DCA6 /* Dialogs.m */,
 				CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */,
@@ -278,12 +309,11 @@
 				CE80DB210FC192D60086DCA6 /* ProgressController.h */,
 				CE80DB220FC192D60086DCA6 /* ProgressController.m */,
 				CE80DB230FC192D60086DCA6 /* PyApp.h */,
+				CE9EA74E1122C96C008CD2BC /* PyRegistrable.h */,
 				CE80DB240FC192D60086DCA6 /* RecentDirectories.h */,
 				CE80DB250FC192D60086DCA6 /* RecentDirectories.m */,
 				CE80DB260FC192D60086DCA6 /* RegistrationInterface.h */,
 				CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */,
-				CE80DB280FC192D60086DCA6 /* Table.h */,
-				CE80DB290FC192D60086DCA6 /* Table.m */,
 				CE80DB2A0FC192D60086DCA6 /* Utils.h */,
 				CE80DB2B0FC192D60086DCA6 /* Utils.m */,
 				CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */,
@@ -295,6 +325,7 @@
 		CE80DB810FC194BD0086DCA6 /* dgbase */ = {
 			isa = PBXGroup;
 			children = (
+				CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */,
 				CE80DB820FC1951C0086DCA6 /* AppDelegate.h */,
 				CE80DB830FC1951C0086DCA6 /* AppDelegate.m */,
 				CE80DB840FC1951C0086DCA6 /* Consts.h */,
@@ -302,23 +333,62 @@
 				CE6044EB0FE6796200B71262 /* DetailsPanel.m */,
 				CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */,
 				CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */,
+				CE9EA76F1122CA0B008CD2BC /* DirectoryOutline.h */,
+				CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */,
 				CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */,
+				CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */,
 				CE80DB880FC1951C0086DCA6 /* ResultWindow.h */,
 				CE80DB890FC1951C0086DCA6 /* ResultWindow.m */,
 			);
 			name = dgbase;
 			sourceTree = "<group>";
 		};
+		CE9EA7421122C96C008CD2BC /* controllers */ = {
+			isa = PBXGroup;
+			children = (
+				CE9EA7431122C96C008CD2BC /* HSGUIController.h */,
+				CE9EA7441122C96C008CD2BC /* HSGUIController.m */,
+				CE9EA7451122C96C008CD2BC /* HSOutline.h */,
+				CE9EA7461122C96C008CD2BC /* HSOutline.m */,
+				CE9EA7471122C96C008CD2BC /* HSWindowController.h */,
+				CE9EA7481122C96C008CD2BC /* HSWindowController.m */,
+			);
+			name = controllers;
+			path = ../../cocoalib/controllers;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE9EA74B1122C96C008CD2BC /* proxies */ = {
+			isa = PBXGroup;
+			children = (
+				CE9EA74C1122C96C008CD2BC /* PyGUI.h */,
+				CE9EA74D1122C96C008CD2BC /* PyOutline.h */,
+			);
+			name = proxies;
+			path = ../../cocoalib/proxies;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE9EA74F1122C96C008CD2BC /* views */ = {
+			isa = PBXGroup;
+			children = (
+				CE9EA7501122C96C008CD2BC /* HSOutlineView.h */,
+				CE9EA7511122C96C008CD2BC /* HSOutlineView.m */,
+				CE9EA7521122C96C008CD2BC /* NSIndexPathAdditions.h */,
+				CE9EA7531122C96C008CD2BC /* NSIndexPathAdditions.m */,
+				CE9EA7541122C96C008CD2BC /* NSTableViewAdditions.h */,
+				CE9EA7551122C96C008CD2BC /* NSTableViewAdditions.m */,
+			);
+			name = views;
+			path = ../../cocoalib/views;
+			sourceTree = SOURCE_ROOT;
+		};
 		CEBAE4220FDA97E000B7887D /* brsinglelineformatter */ = {
 			isa = PBXGroup;
 			children = (
 				CEBAE4230FDA97E000B7887D /* BRSingleLineFormatter.h */,
 				CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */,
-				CEBAE4250FDA97E000B7887D /* NSCharacterSet_Extensions.h */,
-				CEBAE4260FDA97E000B7887D /* NSCharacterSet_Extensions.m */,
 			);
 			name = brsinglelineformatter;
-			path = cocoalib/brsinglelineformatter;
+			path = ../../cocoalib/brsinglelineformatter;
 			sourceTree = SOURCE_ROOT;
 		};
 		CEFC294309C89E0000D9F998 /* images */ = {
@@ -383,14 +453,14 @@
 				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
 				CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
 				CEFCDE2D0AB0418600C33A93 /* dgpe_logo_32.png in Resources */,
-				CE80DB760FC194760086DCA6 /* ErrorReportWindow.xib in Resources */,
-				CE80DB770FC194760086DCA6 /* progress.nib in Resources */,
-				CE80DB780FC194760086DCA6 /* registration.nib in Resources */,
 				CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */,
 				CE77C89E10946C6D0078B0DB /* DirectoryPanel.xib in Resources */,
 				CE77C8A810946CE20078B0DB /* DetailsPanel.xib in Resources */,
 				CE031751109B340A00517EE6 /* Preferences.xib in Resources */,
 				CE031754109B345200517EE6 /* MainMenu.xib in Resources */,
+				CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */,
+				CE7AC9191119911200D02F6C /* progress.xib in Resources */,
+				CE7AC91A1119911200D02F6C /* registration.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -406,14 +476,12 @@
 				CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */,
 				CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */,
 				CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */,
-				CE0C46AA0FA0647E000BE99B /* PictureBlocks.m in Sources */,
 				CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */,
 				CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */,
 				CE80DB300FC192D60086DCA6 /* Outline.m in Sources */,
 				CE80DB310FC192D60086DCA6 /* ProgressController.m in Sources */,
 				CE80DB320FC192D60086DCA6 /* RecentDirectories.m in Sources */,
 				CE80DB330FC192D60086DCA6 /* RegistrationInterface.m in Sources */,
-				CE80DB340FC192D60086DCA6 /* Table.m in Sources */,
 				CE80DB350FC192D60086DCA6 /* Utils.m in Sources */,
 				CE80DB360FC192D60086DCA6 /* ValueTransformers.m in Sources */,
 				CE80DB470FC193650086DCA6 /* NSNotificationAdditions.m in Sources */,
@@ -422,73 +490,69 @@
 				CE80DB8B0FC1951C0086DCA6 /* DirectoryPanel.m in Sources */,
 				CE80DB8C0FC1951C0086DCA6 /* ResultWindow.m in Sources */,
 				CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */,
-				CEBAE4280FDA97E000B7887D /* NSCharacterSet_Extensions.m in Sources */,
 				CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */,
+				CE9EA7561122C96C008CD2BC /* HSGUIController.m in Sources */,
+				CE9EA7571122C96C008CD2BC /* HSOutline.m in Sources */,
+				CE9EA7581122C96C008CD2BC /* HSWindowController.m in Sources */,
+				CE9EA7591122C96C008CD2BC /* NSEventAdditions.m in Sources */,
+				CE9EA75A1122C96C008CD2BC /* HSOutlineView.m in Sources */,
+				CE9EA75B1122C96C008CD2BC /* NSIndexPathAdditions.m in Sources */,
+				CE9EA75C1122C96C008CD2BC /* NSTableViewAdditions.m in Sources */,
+				CE9EA7721122CA0B008CD2BC /* DirectoryOutline.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXVariantGroup section */
-		CE80DB700FC194760086DCA6 /* ErrorReportWindow.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CE80DB710FC194760086DCA6 /* English */,
-			);
-			name = ErrorReportWindow.xib;
-			sourceTree = SOURCE_ROOT;
-		};
-		CE80DB720FC194760086DCA6 /* progress.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CE80DB730FC194760086DCA6 /* English */,
-			);
-			name = progress.nib;
-			sourceTree = SOURCE_ROOT;
-		};
-		CE80DB740FC194760086DCA6 /* registration.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CE80DB750FC194760086DCA6 /* English */,
-			);
-			name = registration.nib;
-			sourceTree = SOURCE_ROOT;
-		};
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
-		C01FCF4C08A954540054247B /* Release */ = {
+		C01FCF4C08A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(FRAMEWORK_SEARCH_PATHS)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				PRODUCT_NAME = "dupeGuru PE";
 				WRAPPER_EXTENSION = app;
 			};
-			name = Release;
+			name = release;
 		};
-		C01FCF5008A954540054247B /* Release */ = {
+		C01FCF5008A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+				ARCHS = (
+					i386,
+					x86_64,
+					ppc,
+				);
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
 			};
-			name = Release;
+			name = release;
+		};
+		CEE00FF0111AF37400BC1A77 /* dev */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+			};
+			name = dev;
+		};
+		CEE00FF1111AF37400BC1A77 /* dev */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Applications";
+				PRODUCT_NAME = "dupeGuru PE";
+				WRAPPER_EXTENSION = app;
+			};
+			name = dev;
 		};
 /* End XCBuildConfiguration section */
 
@@ -496,18 +560,20 @@
 		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF4C08A954540054247B /* Release */,
+				C01FCF4C08A954540054247B /* release */,
+				CEE00FF1111AF37400BC1A77 /* dev */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = release;
 		};
 		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF5008A954540054247B /* Release */,
+				C01FCF5008A954540054247B /* release */,
+				CEE00FF0111AF37400BC1A77 /* dev */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = release;
 		};
 /* End XCConfigurationList section */
 	};

cocoa/pe/main.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,10 +7,12 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
+#import "Utils.h"
 
 int main(int argc, char *argv[])
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    [Utils setPluginName:@"dg_cocoa"];
     NSString *pluginPath = [[NSBundle mainBundle]
                                 pathForResource:@"dg_cocoa"
                                          ofType:@"plugin"];

cocoa/pe/xib/DetailsPanel.xib

@@ -2,17 +2,17 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10B504</string>
+		<string key="IBDocument.SystemVersion">10C540</string>
 		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.2</string>
-		<string key="IBDocument.HIToolboxVersion">437.00</string>
+		<string key="IBDocument.AppKitVersion">1038.25</string>
+		<string key="IBDocument.HIToolboxVersion">458.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">740</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="18"/>
+			<integer value="7"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -30,7 +30,7 @@
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="433298071">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSCustomObject" id="449950342">
-				<string key="NSClassName">DetailsPanel</string>
+				<string key="NSClassName">DetailsPanelPE</string>
 			</object>
 			<object class="NSCustomObject" id="175405098">
 				<string key="NSClassName">FirstResponder</string>
@@ -487,6 +487,14 @@
 					</object>
 					<int key="connectionID">31</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="1061505056"/>
+						<reference key="destination" ref="449950342"/>
+					</object>
+					<int key="connectionID">43</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -768,7 +776,6 @@
 					<string>6.ImportedFromIB2</string>
 					<string>7.IBPluginDependency</string>
 					<string>7.ImportedFromIB2</string>
-					<string>8.CustomClassName</string>
 					<string>8.IBPluginDependency</string>
 					<string>8.ImportedFromIB2</string>
 					<string>9.IBPluginDependency</string>
@@ -825,7 +832,6 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>TableView</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -848,14 +854,26 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">42</int>
+			<int key="maxID">43</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
 					<string key="className">DetailsPanel</string>
-					<string key="superclassName">DetailsPanelBase</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">detailsTable</string>
+						<string key="NS.object.0">NSTableView</string>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../base/DetailsPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">DetailsPanelPE</string>
+					<string key="superclassName">DetailsPanel</string>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
@@ -879,8 +897,8 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">DetailsPanel</string>
-					<string key="superclassName">DetailsPanelBase</string>
+					<string key="className">DetailsPanelPE</string>
+					<string key="superclassName">DetailsPanel</string>
 					<object class="NSMutableDictionary" key="outlets">
 						<string key="NS.key.0">detailsTable</string>
 						<string key="NS.object.0">NSTableView</string>
@@ -890,18 +908,6 @@
 						<string key="minorKey"/>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">DetailsPanelBase</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">detailsTable</string>
-						<string key="NS.object.0">TableView</string>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">dgbase/DetailsPanel.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FirstResponder</string>
 					<string key="superclassName">NSObject</string>
@@ -910,34 +916,6 @@
 						<string key="minorKey"/>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PyApp</string>
-					<string key="superclassName">PyRegistrable</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/PyApp.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TableView</string>
-					<string key="superclassName">NSTableView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">py</string>
-						<string key="NS.object.0">PyApp</string>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">cocoalib/Table.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TableView</string>
-					<string key="superclassName">NSTableView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
 			</object>
 			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
 				<bool key="EncodedWithXMLCoder">YES</bool>

cocoa/pe/xib/Preferences.xib

@@ -133,7 +133,7 @@
 							<object class="NSTextFieldCell" key="NSCell" id="397705219">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">71303168</int>
-								<string key="NSContents">Less results</string>
+								<string key="NSContents">Fewer results</string>
 								<reference key="NSSupport" ref="649492068"/>
 								<reference key="NSControlView" ref="171701149"/>
 								<reference key="NSBackgroundColor" ref="71910056"/>

cocoa/se/AppDelegate.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,17 +7,12 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/AppDelegate.h"
-#import "DirectoryPanel.h"
+#import "../base/AppDelegate.h"
 #import "PyDupeGuru.h"
 
-@interface AppDelegate : AppDelegateBase
-{
-    DirectoryPanel *_directoryPanel;
-}
+@interface AppDelegate : AppDelegateBase {}
 - (IBAction)openWebsite:(id)sender;
 - (IBAction)toggleDirectories:(id)sender;
 
-- (DirectoryPanel *)directoryPanel;
 - (PyDupeGuru *)py;
 @end

cocoa/se/AppDelegate.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,11 +7,12 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import "AppDelegate.h"
-#import "cocoalib/ProgressController.h"
-#import "cocoalib/RegistrationInterface.h"
-#import "cocoalib/Utils.h"
-#import "cocoalib/ValueTransformers.h"
+#import "../../cocoalib/ProgressController.h"
+#import "../../cocoalib/RegistrationInterface.h"
+#import "../../cocoalib/Utils.h"
+#import "../../cocoalib/ValueTransformers.h"
 #import "DetailsPanel.h"
+#import "DirectoryPanel.h"
 #import "Consts.h"
 
 @implementation AppDelegate
@@ -43,7 +44,6 @@ http://www.hardcoded.net/licenses/hs_license
     VTIsIntIn *vt = [[[VTIsIntIn alloc] initWithValues:[NSIndexSet indexSetWithIndex:1] reverse:YES] autorelease];
     [NSValueTransformer setValueTransformer:vt forName:@"vtScanTypeIsNotContent"];
     _directoryPanel = nil;
-    _appName = APPNAME;
     return self;
 }
 
@@ -57,52 +57,5 @@ http://www.hardcoded.net/licenses/hs_license
     [[self directoryPanel] toggleVisible:sender];
 }
 
-- (DirectoryPanel *)directoryPanel
-{
-    if (!_directoryPanel)
-        _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self];
-    return _directoryPanel;
-}
-
-- (DetailsPanelBase *)detailsPanel
-{
-    if (!_detailsPanel)
-        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
-    return _detailsPanel;
-}
-
 - (PyDupeGuru *)py { return (PyDupeGuru *)py; }
-
-//Delegate
-- (void)applicationWillBecomeActive:(NSNotification *)aNotification
-{
-    if (![[result window] isVisible])
-        [result showWindow:NSApp];
-}
-
-- (void)applicationWillTerminate:(NSNotification *)aNotification
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [ud setObject: [result getColumnsOrder] forKey:@"columnsOrder"];
-    [ud setObject: [result getColumnsWidth] forKey:@"columnsWidth"];
-    [py saveResults];
-    int sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
-    if (sc >= 10)
-    {
-        sc = -1;
-        [py purgeIgnoreList];
-    }
-    sc++;
-    [ud setInteger:sc forKey:@"sessionCountSinceLastIgnorePurge"];
-    [py saveIgnoreList];
-    // NSApplication does not release nib instances objects, we must do it manually
-    // Well, it isn't needed because the memory is freed anyway (we are quitting the application
-    // But I need to release RecentDirectories so it saves the user defaults
-    [recentDirectories release];
-}
-
-- (void)recentDirecoryClicked:(NSString *)directory
-{
-    [[self directoryPanel] addDirectory:directory];
-}
 @end

cocoa/se/Info.plist

@@ -23,13 +23,13 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>2.9.0</string>
+	<string>2.9.2</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© Hardcoded Software, 2009</string>
+	<string>© Hardcoded Software, 2010</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/se/PyDupeGuru.h

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "dgbase/PyDupeGuru.h"
+#import "../base/PyDupeGuru.h"
 
 @interface PyDupeGuru : PyDupeGuruBase
 //Scanning options

cocoa/se/ResultWindow.h

@@ -0,0 +1,20 @@
+/* 
+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 "../../cocoalib/Outline.h"
+#import "../base/ResultWindow.h"
+#import "DirectoryPanel.h"
+
+@interface ResultWindow : ResultWindowBase
+{   
+    NSString *_lastAction;
+}
+- (IBAction)resetColumnsToDefault:(id)sender;
+- (IBAction)startDuplicateScan:(id)sender;
+@end

cocoa/se/ResultWindow.m

@@ -0,0 +1,90 @@
+/* 
+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 "ResultWindow.h"
+#import "../../cocoalib/Dialogs.h"
+#import "../../cocoalib/ProgressController.h"
+#import "../../cocoalib/Utils.h"
+#import "AppDelegate.h"
+#import "Consts.h"
+
+@implementation ResultWindow
+/* Override */
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,4)] retain];
+    [_deltaColumns removeIndex:3];
+}
+
+/* Actions */
+- (IBAction)resetColumnsToDefault:(id)sender
+{
+    NSMutableArray *columnsOrder = [NSMutableArray array];
+    [columnsOrder addObject:@"0"];
+    [columnsOrder addObject:@"1"];
+    [columnsOrder addObject:@"2"];
+    [columnsOrder addObject:@"6"];
+    NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
+    [columnsWidth setObject:i2n(195) forKey:@"0"];
+    [columnsWidth setObject:i2n(120) forKey:@"1"];
+    [columnsWidth setObject:i2n(63) forKey:@"2"];
+    [columnsWidth setObject:i2n(60) forKey:@"6"];
+    [self restoreColumnsPosition:columnsOrder widths:columnsWidth];
+}
+
+- (IBAction)startDuplicateScan:(id)sender
+{
+    if ([matches numberOfRows] > 0)
+    {
+        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
+            return;
+    }
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    PyDupeGuru *_py = (PyDupeGuru *)py;
+    [_py setScanType:[ud objectForKey:@"scanType"]];
+    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
+    [_py setWordWeighting:[ud objectForKey:@"wordWeighting"]];
+    [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
+    [_py setMatchSimilarWords:[ud objectForKey:@"matchSimilarWords"]];
+    int smallFileThreshold = [ud integerForKey:@"smallFileThreshold"]; // In KB
+    int sizeThreshold = [ud boolForKey:@"ignoreSmallFiles"] ? smallFileThreshold * 1024 : 0; // The py side wants bytes
+    [_py setSizeThreshold:sizeThreshold];
+    int r = n2i([py doScan]);
+    [matches reloadData];
+    [self refreshStats];
+    if (r != 0)
+        [[ProgressController mainProgressController] hide];
+    if (r == 1)
+        [Dialogs showMessage:@"You cannot make a duplicate scan with only reference directories."];
+    if (r == 3)
+    {
+        [Dialogs showMessage:@"The selected directories contain no scannable file."];
+        [app toggleDirectories:nil];
+    }
+
+}
+
+/* Public */
+- (void)initResultColumns
+{
+    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
+    _resultColumns = [[NSMutableArray alloc] init];
+    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
+    [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
+    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (KB)" width:63 refCol:refCol];
+    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
+    [_resultColumns addObject:sizeCol];
+    [_resultColumns addObject:[self getColumnForIdentifier:3 title:@"Kind" width:40 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:4 title:@"Creation" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Modification" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Match %" width:60 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Words Used" width:120 refCol:refCol]];
+    [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Dupe Count" width:80 refCol:refCol]];
+}
+@end

cocoa/se/dg_cocoa.py

@@ -0,0 +1,48 @@
+# 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
+
+from hsutil.cocoa import signature
+
+from core import scanner
+from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
+from core_se.app_cocoa import DupeGuru
+
+# Fix py2app imports with chokes on relative imports
+from core_se import fs, data
+
+class PyDupeGuru(PyDupeGuruBase):
+    def init(self):
+        self = super(PyDupeGuru,self).init()
+        self.py = DupeGuru()
+        return self
+    
+    #---Properties
+    def setMinMatchPercentage_(self,percentage):
+        self.py.scanner.min_match_percentage = int(percentage)
+    
+    def setScanType_(self,scan_type):
+        try:
+            self.py.scanner.scan_type = [
+                scanner.SCAN_TYPE_FILENAME,
+                scanner.SCAN_TYPE_CONTENT
+            ][scan_type]
+        except IndexError:
+            pass
+    
+    def setWordWeighting_(self,words_are_weighted):
+        self.py.scanner.word_weighting = words_are_weighted
+    
+    def setMatchSimilarWords_(self,match_similar_words):
+        self.py.scanner.match_similar_words = match_similar_words
+    
+    @signature('v@:i')
+    def setSizeThreshold_(self, size_threshold):
+        self.py.scanner.size_threshold = size_threshold
+    
+    #---Registration
+    def appName(self):
+        return "dupeGuru"
+    

cocoa/se/dupeguru.xcodeproj/project.pbxproj

@@ -10,20 +10,26 @@
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		CE073F6309CAE1A3005C1D2F /* dupeguru_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_help */; };
+		CE19BC6311199231007CCEB0 /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE19BC6011199231007CCEB0 /* ErrorReportWindow.xib */; };
+		CE19BC6411199231007CCEB0 /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE19BC6111199231007CCEB0 /* progress.xib */; };
+		CE19BC6511199231007CCEB0 /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE19BC6211199231007CCEB0 /* registration.xib */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
 		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
 		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
 		CE3A46FA109B212E002ABFD5 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3A46F9109B212E002ABFD5 /* MainMenu.xib */; };
 		CE45579B0AE3BC2B005A9546 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; };
 		CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; };
-		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
 		CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */; };
-		CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; };
+		CE76FDC4111EE37C006618EA /* HSOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDBF111EE37C006618EA /* HSOutlineView.m */; };
+		CE76FDC5111EE37C006618EA /* NSIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDC1111EE37C006618EA /* NSIndexPathAdditions.m */; };
+		CE76FDC6111EE37C006618EA /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDC3111EE37C006618EA /* NSTableViewAdditions.m */; };
+		CE76FDCF111EE38E006618EA /* HSGUIController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDC9111EE38E006618EA /* HSGUIController.m */; };
+		CE76FDD4111EE3A7006618EA /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */; };
+		CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDDE111EE42F006618EA /* HSOutline.m */; };
+		CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDF6111EE561006618EA /* NSEventAdditions.m */; };
 		CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEAC6810109B0B7E00B43C85 /* Preferences.xib */; };
-		CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; };
-		CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; };
+		CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */; };
 		CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */; };
-		CEDD92DB0FDD01640031C7B7 /* NSCharacterSet_Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D90FDD01640031C7B7 /* NSCharacterSet_Extensions.m */; };
 		CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE7EA120FE675C80004E467 /* DetailsPanel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
 		CEEFC0F810945D9F001F3A39 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */; };
@@ -37,12 +43,8 @@
 		CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F910FC9517500CD5728 /* ProgressController.m */; };
 		CEFC7FA20FC9517500CD5728 /* RecentDirectories.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F950FC9517500CD5728 /* RecentDirectories.m */; };
 		CEFC7FA30FC9517500CD5728 /* RegistrationInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */; };
-		CEFC7FA40FC9517500CD5728 /* Table.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F990FC9517500CD5728 /* Table.m */; };
 		CEFC7FA50FC9517500CD5728 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F9B0FC9517500CD5728 /* Utils.m */; };
 		CEFC7FA60FC9517500CD5728 /* ValueTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F9D0FC9517500CD5728 /* ValueTransformers.m */; };
-		CEFC7FAD0FC9518A00CD5728 /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEFC7FA70FC9518A00CD5728 /* ErrorReportWindow.xib */; };
-		CEFC7FAE0FC9518A00CD5728 /* progress.nib in Resources */ = {isa = PBXBuildFile; fileRef = CEFC7FA90FC9518A00CD5728 /* progress.nib */; };
-		CEFC7FAF0FC9518A00CD5728 /* registration.nib in Resources */ = {isa = PBXBuildFile; fileRef = CEFC7FAB0FC9518A00CD5728 /* registration.nib */; };
 		CEFC7FB90FC951A700CD5728 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7FB20FC951A700CD5728 /* AppDelegate.m */; };
 		CEFC7FBA0FC951A700CD5728 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7FB50FC951A700CD5728 /* DirectoryPanel.m */; };
 		CEFC7FBB0FC951A700CD5728 /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7FB80FC951A700CD5728 /* ResultWindow.m */; };
@@ -56,8 +58,6 @@
 			dstSubfolderSpec = 10;
 			files = (
 				CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */,
-				CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */,
-				CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -71,64 +71,75 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		8D1107320486CEB800E47090 /* dupeGuru.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dupeGuru.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_help; path = help/dupeguru_help; sourceTree = "<group>"; };
+		CE073F5409CAE1A3005C1D2F /* dupeguru_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_help; path = ../../help_se/dupeguru_help; sourceTree = "<group>"; };
+		CE19BC6011199231007CCEB0 /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; };
+		CE19BC6111199231007CCEB0 /* progress.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = progress.xib; sourceTree = "<group>"; };
+		CE19BC6211199231007CCEB0 /* registration.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = registration.xib; sourceTree = "<group>"; };
 		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; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dg_cocoa.plugin; path = py/dist/dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
-		CE3A46F9109B212E002ABFD5 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = dgbase/xib/MainMenu.xib; sourceTree = "<group>"; };
+		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
+		CE3A46F9109B212E002ABFD5 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../base/xib/MainMenu.xib; sourceTree = "<group>"; };
 		CE45579A0AE3BC2B005A9546 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
-		CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
-		CE68EE6609ABC48000971085 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = dgbase/dsa_pub.pem; sourceTree = "<group>"; };
-		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
+		CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; };
+		CE6E7407111C997500C350E3 /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
+		CE76FDBE111EE37C006618EA /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
+		CE76FDBF111EE37C006618EA /* HSOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutlineView.m; sourceTree = "<group>"; };
+		CE76FDC0111EE37C006618EA /* NSIndexPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSIndexPathAdditions.h; sourceTree = "<group>"; };
+		CE76FDC1111EE37C006618EA /* NSIndexPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSIndexPathAdditions.m; sourceTree = "<group>"; };
+		CE76FDC2111EE37C006618EA /* NSTableViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTableViewAdditions.h; sourceTree = "<group>"; };
+		CE76FDC3111EE37C006618EA /* NSTableViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSTableViewAdditions.m; sourceTree = "<group>"; };
+		CE76FDC8111EE38E006618EA /* HSGUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSGUIController.h; sourceTree = "<group>"; };
+		CE76FDC9111EE38E006618EA /* HSGUIController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSGUIController.m; sourceTree = "<group>"; };
+		CE76FDCD111EE38E006618EA /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = "<group>"; };
+		CE76FDCE111EE38E006618EA /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = "<group>"; };
+		CE76FDD1111EE3A7006618EA /* DirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryOutline.h; path = ../base/DirectoryOutline.h; sourceTree = SOURCE_ROOT; };
+		CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryOutline.m; path = ../base/DirectoryOutline.m; sourceTree = SOURCE_ROOT; };
+		CE76FDD3111EE3A7006618EA /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
+		CE76FDDD111EE42F006618EA /* HSOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutline.h; sourceTree = "<group>"; };
+		CE76FDDE111EE42F006618EA /* HSOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutline.m; sourceTree = "<group>"; };
+		CE76FDF5111EE561006618EA /* NSEventAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSEventAdditions.h; path = ../../cocoalib/NSEventAdditions.h; sourceTree = SOURCE_ROOT; };
+		CE76FDF6111EE561006618EA /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
 		CEAC6810109B0B7E00B43C85 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = xib/Preferences.xib; sourceTree = "<group>"; };
-		CECA899A09DB132E00A3D774 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanel.h; sourceTree = "<group>"; };
-		CECA899B09DB132E00A3D774 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DetailsPanel.m; sourceTree = "<group>"; };
-		CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
-		CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
-		CEDD92D80FDD01640031C7B7 /* NSCharacterSet_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSCharacterSet_Extensions.h; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.h; sourceTree = SOURCE_ROOT; };
-		CEDD92D90FDD01640031C7B7 /* NSCharacterSet_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSCharacterSet_Extensions.m; path = cocoalib/brsinglelineformatter/NSCharacterSet_Extensions.m; sourceTree = SOURCE_ROOT; };
-		CEE7EA110FE675C80004E467 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = dgbase/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
-		CEE7EA120FE675C80004E467 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = dgbase/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
+		CEBE4D72111F0EE1009AAC6D /* HSWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSWindowController.h; sourceTree = "<group>"; };
+		CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSWindowController.m; sourceTree = "<group>"; };
+		CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
+		CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
+		CEE7EA110FE675C80004E467 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
+		CEE7EA120FE675C80004E467 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
-		CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = dgbase/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
-		CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailsPanel.xib; path = dgbase/xib/DetailsPanel.xib; sourceTree = "<group>"; };
-		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = images/folder32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = images/details32.png; sourceTree = SOURCE_ROOT; };
-		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = images/preferences32.png; sourceTree = SOURCE_ROOT; };
-		CEFC7F8A0FC9517500CD5728 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F8B0FC9517500CD5728 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F8C0FC9517500CD5728 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow.m; path = cocoalib/HSErrorReportWindow.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F8E0FC9517500CD5728 /* Outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Outline.h; path = cocoalib/Outline.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F8F0FC9517500CD5728 /* Outline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Outline.m; path = cocoalib/Outline.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F900FC9517500CD5728 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F910FC9517500CD5728 /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F920FC9517500CD5728 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F930FC9517500CD5728 /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F940FC9517500CD5728 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F950FC9517500CD5728 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F960FC9517500CD5728 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F980FC9517500CD5728 /* Table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Table.h; path = cocoalib/Table.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F990FC9517500CD5728 /* Table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Table.m; path = cocoalib/Table.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F9A0FC9517500CD5728 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F9B0FC9517500CD5728 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F9D0FC9517500CD5728 /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
-		CEFC7FA80FC9518A00CD5728 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = cocoalib/English.lproj/ErrorReportWindow.xib; sourceTree = "<group>"; };
-		CEFC7FAA0FC9518A00CD5728 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/progress.nib; sourceTree = "<group>"; };
-		CEFC7FAC0FC9518A00CD5728 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = cocoalib/English.lproj/registration.nib; sourceTree = "<group>"; };
-		CEFC7FB10FC951A700CD5728 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = dgbase/AppDelegate.h; sourceTree = SOURCE_ROOT; };
-		CEFC7FB20FC951A700CD5728 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = dgbase/AppDelegate.m; sourceTree = SOURCE_ROOT; };
-		CEFC7FB30FC951A700CD5728 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = dgbase/Consts.h; sourceTree = SOURCE_ROOT; };
-		CEFC7FB40FC951A700CD5728 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = dgbase/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
-		CEFC7FB50FC951A700CD5728 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = dgbase/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
-		CEFC7FB60FC951A700CD5728 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = dgbase/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
-		CEFC7FB70FC951A700CD5728 /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = dgbase/ResultWindow.h; sourceTree = SOURCE_ROOT; };
-		CEFC7FB80FC951A700CD5728 /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = dgbase/ResultWindow.m; sourceTree = SOURCE_ROOT; };
+		CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
+		CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailsPanel.xib; path = ../base/xib/DetailsPanel.xib; sourceTree = "<group>"; };
+		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
+		CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = ../../images/details32.png; sourceTree = SOURCE_ROOT; };
+		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
+		CEFC7F8A0FC9517500CD5728 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F8B0FC9517500CD5728 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F8C0FC9517500CD5728 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow.m; path = ../../cocoalib/HSErrorReportWindow.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F8E0FC9517500CD5728 /* Outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Outline.h; path = ../../cocoalib/Outline.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F8F0FC9517500CD5728 /* Outline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Outline.m; path = ../../cocoalib/Outline.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F900FC9517500CD5728 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F910FC9517500CD5728 /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F920FC9517500CD5728 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F930FC9517500CD5728 /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F940FC9517500CD5728 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F950FC9517500CD5728 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F960FC9517500CD5728 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F9A0FC9517500CD5728 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F9B0FC9517500CD5728 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
+		CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
+		CEFC7F9D0FC9517500CD5728 /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ValueTransformers.m; path = ../../cocoalib/ValueTransformers.m; sourceTree = SOURCE_ROOT; };
+		CEFC7FB10FC951A700CD5728 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../base/AppDelegate.h; sourceTree = SOURCE_ROOT; };
+		CEFC7FB20FC951A700CD5728 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ../base/AppDelegate.m; sourceTree = SOURCE_ROOT; };
+		CEFC7FB30FC951A700CD5728 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Consts.h; path = ../base/Consts.h; sourceTree = SOURCE_ROOT; };
+		CEFC7FB40FC951A700CD5728 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel.h; path = ../base/DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
+		CEFC7FB50FC951A700CD5728 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel.m; path = ../base/DirectoryPanel.m; sourceTree = SOURCE_ROOT; };
+		CEFC7FB60FC951A700CD5728 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDupeGuru.h; path = ../base/PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
+		CEFC7FB70FC951A700CD5728 /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultWindow.h; path = ../base/ResultWindow.h; sourceTree = SOURCE_ROOT; };
+		CEFC7FB80FC951A700CD5728 /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultWindow.m; path = ../base/ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -150,11 +161,6 @@
 			children = (
 				CE381C9509914ACE003581CE /* AppDelegate.h */,
 				CE381C9409914ACE003581CE /* AppDelegate.m */,
-				CE848A1809DD85810004CB44 /* Consts.h */,
-				CECA899A09DB132E00A3D774 /* DetailsPanel.h */,
-				CECA899B09DB132E00A3D774 /* DetailsPanel.m */,
-				CE68EE6509ABC48000971085 /* DirectoryPanel.h */,
-				CE68EE6609ABC48000971085 /* DirectoryPanel.m */,
 				CEFF18A009A4D387005E6321 /* PyDupeGuru.h */,
 				CE381C9B09914ADF003581CE /* ResultWindow.h */,
 				CE381C9A09914ADF003581CE /* ResultWindow.m */,
@@ -226,16 +232,63 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		CE19BC5F11199231007CCEB0 /* xib */ = {
+			isa = PBXGroup;
+			children = (
+				CE19BC6011199231007CCEB0 /* ErrorReportWindow.xib */,
+				CE19BC6111199231007CCEB0 /* progress.xib */,
+				CE19BC6211199231007CCEB0 /* registration.xib */,
+			);
+			name = xib;
+			path = ../../cocoalib/xib;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE76FDBD111EE37C006618EA /* views */ = {
+			isa = PBXGroup;
+			children = (
+				CE76FDBE111EE37C006618EA /* HSOutlineView.h */,
+				CE76FDBF111EE37C006618EA /* HSOutlineView.m */,
+				CE76FDC0111EE37C006618EA /* NSIndexPathAdditions.h */,
+				CE76FDC1111EE37C006618EA /* NSIndexPathAdditions.m */,
+				CE76FDC2111EE37C006618EA /* NSTableViewAdditions.h */,
+				CE76FDC3111EE37C006618EA /* NSTableViewAdditions.m */,
+			);
+			name = views;
+			path = ../../cocoalib/views;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE76FDC7111EE38E006618EA /* controllers */ = {
+			isa = PBXGroup;
+			children = (
+				CEBE4D72111F0EE1009AAC6D /* HSWindowController.h */,
+				CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */,
+				CE76FDDD111EE42F006618EA /* HSOutline.h */,
+				CE76FDDE111EE42F006618EA /* HSOutline.m */,
+				CE76FDC8111EE38E006618EA /* HSGUIController.h */,
+				CE76FDC9111EE38E006618EA /* HSGUIController.m */,
+			);
+			name = controllers;
+			path = ../../cocoalib/controllers;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE76FDCC111EE38E006618EA /* proxies */ = {
+			isa = PBXGroup;
+			children = (
+				CE76FDCD111EE38E006618EA /* PyGUI.h */,
+				CE76FDCE111EE38E006618EA /* PyOutline.h */,
+			);
+			name = proxies;
+			path = ../../cocoalib/proxies;
+			sourceTree = SOURCE_ROOT;
+		};
 		CEDD92D50FDD01640031C7B7 /* brsinglelineformatter */ = {
 			isa = PBXGroup;
 			children = (
 				CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */,
 				CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */,
-				CEDD92D80FDD01640031C7B7 /* NSCharacterSet_Extensions.h */,
-				CEDD92D90FDD01640031C7B7 /* NSCharacterSet_Extensions.m */,
 			);
 			name = brsinglelineformatter;
-			path = cocoalib/brsinglelineformatter;
+			path = ../../cocoalib/brsinglelineformatter;
 			sourceTree = SOURCE_ROOT;
 		};
 		CEEFC0CA10943849001F3A39 /* xib */ = {
@@ -262,10 +315,13 @@
 		CEFC7F890FC9513600CD5728 /* cocoalib */ = {
 			isa = PBXGroup;
 			children = (
+				CE76FDF5111EE561006618EA /* NSEventAdditions.h */,
+				CE76FDF6111EE561006618EA /* NSEventAdditions.m */,
+				CE76FDC7111EE38E006618EA /* controllers */,
+				CE76FDCC111EE38E006618EA /* proxies */,
+				CE76FDBD111EE37C006618EA /* views */,
+				CE19BC5F11199231007CCEB0 /* xib */,
 				CEDD92D50FDD01640031C7B7 /* brsinglelineformatter */,
-				CEFC7FA70FC9518A00CD5728 /* ErrorReportWindow.xib */,
-				CEFC7FA90FC9518A00CD5728 /* progress.nib */,
-				CEFC7FAB0FC9518A00CD5728 /* registration.nib */,
 				CEFC7F8A0FC9517500CD5728 /* Dialogs.h */,
 				CEFC7F8B0FC9517500CD5728 /* Dialogs.m */,
 				CEFC7F8C0FC9517500CD5728 /* HSErrorReportWindow.h */,
@@ -280,8 +336,6 @@
 				CEFC7F950FC9517500CD5728 /* RecentDirectories.m */,
 				CEFC7F960FC9517500CD5728 /* RegistrationInterface.h */,
 				CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */,
-				CEFC7F980FC9517500CD5728 /* Table.h */,
-				CEFC7F990FC9517500CD5728 /* Table.m */,
 				CEFC7F9A0FC9517500CD5728 /* Utils.h */,
 				CEFC7F9B0FC9517500CD5728 /* Utils.m */,
 				CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */,
@@ -293,6 +347,9 @@
 		CEFC7FB00FC9518F00CD5728 /* dgbase */ = {
 			isa = PBXGroup;
 			children = (
+				CE76FDD1111EE3A7006618EA /* DirectoryOutline.h */,
+				CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */,
+				CE76FDD3111EE3A7006618EA /* PyDirectoryOutline.h */,
 				CEFC7FB10FC951A700CD5728 /* AppDelegate.h */,
 				CEFC7FB20FC951A700CD5728 /* AppDelegate.m */,
 				CEFC7FB30FC951A700CD5728 /* Consts.h */,
@@ -301,6 +358,7 @@
 				CEFC7FB40FC951A700CD5728 /* DirectoryPanel.h */,
 				CEFC7FB50FC951A700CD5728 /* DirectoryPanel.m */,
 				CEFC7FB60FC951A700CD5728 /* PyDupeGuru.h */,
+				CE6E7407111C997500C350E3 /* PyDetailsPanel.h */,
 				CEFC7FB70FC951A700CD5728 /* ResultWindow.h */,
 				CEFC7FB80FC951A700CD5728 /* ResultWindow.m */,
 			);
@@ -360,14 +418,14 @@
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
 				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
 				CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
-				CEFC7FAD0FC9518A00CD5728 /* ErrorReportWindow.xib in Resources */,
-				CEFC7FAE0FC9518A00CD5728 /* progress.nib in Resources */,
-				CEFC7FAF0FC9518A00CD5728 /* registration.nib in Resources */,
 				CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */,
 				CEEFC0F810945D9F001F3A39 /* DirectoryPanel.xib in Resources */,
 				CEEFC0FB10945E37001F3A39 /* DetailsPanel.xib in Resources */,
 				CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */,
 				CE3A46FA109B212E002ABFD5 /* MainMenu.xib in Resources */,
+				CE19BC6311199231007CCEB0 /* ErrorReportWindow.xib in Resources */,
+				CE19BC6411199231007CCEB0 /* progress.xib in Resources */,
+				CE19BC6511199231007CCEB0 /* registration.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -381,90 +439,81 @@
 				8D11072D0486CEB800E47090 /* main.m in Sources */,
 				CE381C9609914ACE003581CE /* AppDelegate.m in Sources */,
 				CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */,
-				CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */,
-				CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */,
 				CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */,
 				CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */,
 				CEFC7FA00FC9517500CD5728 /* Outline.m in Sources */,
 				CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */,
 				CEFC7FA20FC9517500CD5728 /* RecentDirectories.m in Sources */,
 				CEFC7FA30FC9517500CD5728 /* RegistrationInterface.m in Sources */,
-				CEFC7FA40FC9517500CD5728 /* Table.m in Sources */,
 				CEFC7FA50FC9517500CD5728 /* Utils.m in Sources */,
 				CEFC7FA60FC9517500CD5728 /* ValueTransformers.m in Sources */,
 				CEFC7FB90FC951A700CD5728 /* AppDelegate.m in Sources */,
 				CEFC7FBA0FC951A700CD5728 /* DirectoryPanel.m in Sources */,
 				CEFC7FBB0FC951A700CD5728 /* ResultWindow.m in Sources */,
 				CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */,
-				CEDD92DB0FDD01640031C7B7 /* NSCharacterSet_Extensions.m in Sources */,
 				CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */,
+				CE76FDC4111EE37C006618EA /* HSOutlineView.m in Sources */,
+				CE76FDC5111EE37C006618EA /* NSIndexPathAdditions.m in Sources */,
+				CE76FDC6111EE37C006618EA /* NSTableViewAdditions.m in Sources */,
+				CE76FDCF111EE38E006618EA /* HSGUIController.m in Sources */,
+				CE76FDD4111EE3A7006618EA /* DirectoryOutline.m in Sources */,
+				CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */,
+				CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */,
+				CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXVariantGroup section */
-		CEFC7FA70FC9518A00CD5728 /* ErrorReportWindow.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CEFC7FA80FC9518A00CD5728 /* English */,
-			);
-			name = ErrorReportWindow.xib;
-			sourceTree = SOURCE_ROOT;
-		};
-		CEFC7FA90FC9518A00CD5728 /* progress.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CEFC7FAA0FC9518A00CD5728 /* English */,
-			);
-			name = progress.nib;
-			sourceTree = SOURCE_ROOT;
-		};
-		CEFC7FAB0FC9518A00CD5728 /* registration.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CEFC7FAC0FC9518A00CD5728 /* English */,
-			);
-			name = registration.nib;
-			sourceTree = SOURCE_ROOT;
-		};
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
-		C01FCF4C08A954540054247B /* Release */ = {
+		C01FCF4C08A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(FRAMEWORK_SEARCH_PATHS)",
-					"$(SRCROOT)/../../../cocoalib/build/Release",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
-				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../base/cocoa/build/Release\"";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				PRODUCT_NAME = dupeGuru;
 				WRAPPER_EXTENSION = app;
 			};
-			name = Release;
+			name = release;
 		};
-		C01FCF5008A954540054247B /* Release */ = {
+		C01FCF5008A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+				ARCHS = (
+					i386,
+					x86_64,
+					ppc,
+				);
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
 			};
-			name = Release;
+			name = release;
+		};
+		CE85E84F111AF63D00187B0D /* dev */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+			};
+			name = dev;
+		};
+		CE85E850111AF63D00187B0D /* dev */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Applications";
+				PRODUCT_NAME = dupeGuru;
+				WRAPPER_EXTENSION = app;
+			};
+			name = dev;
 		};
 /* End XCBuildConfiguration section */
 
@@ -472,18 +521,20 @@
 		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF4C08A954540054247B /* Release */,
+				C01FCF4C08A954540054247B /* release */,
+				CE85E850111AF63D00187B0D /* dev */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = release;
 		};
 		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C01FCF5008A954540054247B /* Release */,
+				C01FCF5008A954540054247B /* release */,
+				CE85E84F111AF63D00187B0D /* dev */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
+			defaultConfigurationName = release;
 		};
 /* End XCConfigurationList section */
 	};

cocoa/se/main.m

@@ -1,5 +1,5 @@
 /* 
-Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+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 
@@ -7,10 +7,12 @@ http://www.hardcoded.net/licenses/hs_license
 */
 
 #import <Cocoa/Cocoa.h>
+#import "Utils.h"
 
 int main(int argc, char *argv[])
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    [Utils setPluginName:@"dg_cocoa"];
     NSString *pluginPath = [[NSBundle mainBundle]
                                 pathForResource:@"dg_cocoa"
                                          ofType:@"plugin"];

cocoa/se/xib/Preferences.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10B504</string>
+		<int key="IBDocument.SystemTarget">1050</int>
+		<string key="IBDocument.SystemVersion">10C540</string>
 		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.2</string>
-		<string key="IBDocument.HIToolboxVersion">437.00</string>
+		<string key="IBDocument.AppKitVersion">1038.25</string>
+		<string key="IBDocument.HIToolboxVersion">458.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">740</string>
@@ -133,7 +133,7 @@
 							<object class="NSTextFieldCell" key="NSCell" id="569479200">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">71303168</int>
-								<string key="NSContents">Less results</string>
+								<string key="NSContents">Fewer results</string>
 								<reference key="NSSupport" ref="1004672526"/>
 								<reference key="NSControlView" ref="1008577648"/>
 								<reference key="NSBackgroundColor" ref="623994344"/>
@@ -860,22 +860,6 @@
 					</object>
 					<int key="connectionID">111</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.smallFileThreshold</string>
-						<reference key="source" ref="880304924"/>
-						<reference key="destination" ref="75941798"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="880304924"/>
-							<reference key="NSDestination" ref="75941798"/>
-							<string key="NSLabel">value: values.smallFileThreshold</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.smallFileThreshold</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">112</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: values.removeEmptyFolders</string>
@@ -968,6 +952,26 @@
 					</object>
 					<int key="connectionID">118</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.smallFileThreshold</string>
+						<reference key="source" ref="880304924"/>
+						<reference key="destination" ref="75941798"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="880304924"/>
+							<reference key="NSDestination" ref="75941798"/>
+							<string key="NSLabel">value: values.smallFileThreshold</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.smallFileThreshold</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSContinuouslyUpdatesValue</string>
+								<boolean value="YES" key="NS.object.0"/>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">121</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1383,8 +1387,6 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="NSArray" key="dict.sortedKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
 					<string>-3.IBPluginDependency</string>
 					<string>100.IBPluginDependency</string>
 					<string>51.IBPluginDependency</string>
@@ -1478,8 +1480,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>{{88, 519}, {352, 326}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1582,16 +1582,541 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">118</int>
+			<int key="maxID">121</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSActionCell</string>
+					<string key="superclassName">NSCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="1022524601">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="626487420">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="124765702">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSButton</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSButtonCell</string>
+					<string key="superclassName">NSActionCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSCell</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSControl</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="873726995">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSFormatter</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenu</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="220588102">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenuItem</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="476097583">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenuItemCell</string>
+					<string key="superclassName">NSButtonCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSNumberFormatter</string>
+					<string key="superclassName">NSFormatter</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSNumberFormatter.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="1022524601"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="626487420"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="124765702"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="873726995"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="220588102"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="489659452">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Sparkle.framework/Headers/SUUpdater.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSPopUpButton</string>
+					<string key="superclassName">NSButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSPopUpButtonCell</string>
+					<string key="superclassName">NSMenuItemCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSResponder</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSSlider</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSSlider.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSSliderCell</string>
+					<string key="superclassName">NSActionCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSSliderCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTextField</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTextFieldCell</string>
+					<string key="superclassName">NSActionCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSUserDefaultsController</string>
+					<string key="superclassName">NSController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<reference key="sourceIdentifier" ref="476097583"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<string key="superclassName">NSResponder</string>
+					<reference key="sourceIdentifier" ref="489659452"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindowController</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">showWindow:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
+					</object>
+				</object>
+			</object>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1050" key="NS.object.0"/>
+		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../dupeguru.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 	</data>
 </archive>

configure.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2009-12-30
+# 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 sys
+from optparse import OptionParser
+
+import yaml
+
+def main(edition, ui, dev):
+    if edition not in ('se', 'me', 'pe'):
+        edition = 'se'
+    if ui not in ('cocoa', 'qt'):
+        ui = 'cocoa' if sys.platform == 'darwin' else 'qt'
+    build_type = 'Dev' if dev else 'Release'
+    print "Configuring dupeGuru {0} for UI {1} ({2})".format(edition.upper(), ui, build_type)
+    conf = {
+        'edition': edition,
+        'ui': ui,
+        'dev': dev,
+    }
+    yaml.dump(conf, open('conf.yaml', 'w'))
+
+if __name__ == '__main__':
+    usage = "usage: %prog [options]"
+    parser = OptionParser(usage=usage)
+    parser.add_option('--edition', dest='edition',
+        help="dupeGuru edition to build (se, me or pe). Default is se.")
+    parser.add_option('--ui', dest='ui',
+        help="Type of UI to build. 'qt' or 'cocoa'. Default is determined by your system.")
+    parser.add_option('--dev', action='store_true', dest='dev', default=False,
+        help="If this flag is set, will configure for dev builds.")
+    (options, args) = parser.parse_args()
+    main(options.edition, options.ui, options.dev)

core/app.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 # Created By: Virgil Dupras
 # Created On: 2006/11/11
-# $Id$
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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 
@@ -18,6 +17,7 @@ from hsutil import io, files
 from hsutil.path import Path
 from hsutil.reg import RegistrableApplication, RegistrationRequired
 from hsutil.misc import flatten, first
+from hsutil.notify import Broadcaster
 from hsutil.str import escape
 
 from . import directories, results, scanner, export, fs
@@ -34,9 +34,12 @@ class NoScannableFileError(Exception):
 class AllFilesAreRefError(Exception):
     pass
 
-class DupeGuru(RegistrableApplication):
+class DupeGuru(RegistrableApplication, Broadcaster):
+    DEMO_LIMIT_DESC = "In the demo version, only 10 duplicates per session can be sent to the recycle bin, moved or copied."
+    
     def __init__(self, data_module, appdata, appid):
         RegistrableApplication.__init__(self, appid)
+        Broadcaster.__init__(self)
         self.appdata = appdata
         if not op.exists(self.appdata):
             os.makedirs(self.appdata)
@@ -50,6 +53,7 @@ class DupeGuru(RegistrableApplication):
             'escape_filter_regexp': True,
             'clean_empty_dirs': False,
         }
+        self.selected_dupes = []
     
     def _demo_check(self):
         if self.registered:
@@ -80,6 +84,7 @@ class DupeGuru(RegistrableApplication):
     
     def _do_load(self, j):
         self.directories.load_from_file(op.join(self.appdata, 'last_directories.xml'))
+        self.notify('directories_changed')
         j = j.start_subjob([1, 9])
         self.results.load_from_xml(op.join(self.appdata, 'last_results.xml'), self._get_file, j)
         files = flatten(g[:] for g in self.results.groups)
@@ -99,10 +104,29 @@ class DupeGuru(RegistrableApplication):
         path = Path(str_path)
         return fs.get_file(path, self.directories.fileclasses)    
     
+    def _job_completed(self, jobid):
+        # Must be called by subclasses when they detect that an async job is completed.
+        if jobid in (JOB_SCAN, JOB_LOAD, JOB_MOVE, JOB_DELETE):
+            self.notify('results_changed')
+    
+    @staticmethod
+    def _open_path(path):
+        raise NotImplementedError()
+    
     @staticmethod
     def _recycle_dupe(dupe):
         raise NotImplementedError()
     
+    @staticmethod
+    def _reveal_path(path):
+        raise NotImplementedError()
+    
+    def _select_dupes(self, dupes):
+        if dupes == self.selected_dupes:
+            return
+        self.selected_dupes = dupes
+        self.notify('dupes_selected')
+    
     def _start_job(self, jobid, func):
         # func(j)
         raise NotImplementedError()
@@ -110,17 +134,21 @@ class DupeGuru(RegistrableApplication):
     def add_directory(self, d):
         try:
             self.directories.add_path(Path(d))
+            self.notify('directories_changed')
             return 0
         except directories.AlreadyThereError:
             return 1
         except directories.InvalidPathError:
             return 2
     
-    def add_to_ignore_list(self, dupe):
+    def add_selected_to_ignore_list(self):
+        dupes = self.without_ref(self.selected_dupes)
+        for dupe in dupes:
             g = self.results.get_group_of_duplicate(dupe)
             for other in g:
                 if other is not dupe:
                     self.scanner.ignore_list.Ignore(unicode(other.path), unicode(dupe.path))
+        self.remove_duplicates(dupes)
     
     def apply_filter(self, filter):
         self.results.apply_filter(None)
@@ -128,6 +156,7 @@ class DupeGuru(RegistrableApplication):
             filter = escape(filter, '()[]\\.|+?^')
             filter = escape(filter, '*', '.')
         self.results.apply_filter(filter)
+        self.notify('results_changed')
     
     def clean_empty_dirs(self, path):
         if self.options['clean_empty_dirs']:
@@ -202,24 +231,82 @@ class DupeGuru(RegistrableApplication):
         p = op.join(self.appdata, 'ignore_list.xml')
         self.scanner.ignore_list.load_from_xml(p)
     
-    def make_reference(self, duplicates):
+    def make_selected_reference(self):
+        dupes = self.without_ref(self.selected_dupes)
         changed_groups = set()
-        for dupe in duplicates:
+        for dupe in dupes:
             g = self.results.get_group_of_duplicate(dupe)
             if g not in changed_groups:
                 self.results.make_ref(dupe)
                 changed_groups.add(g)
+        self.notify('results_switched')
     
-    def save(self):
+    def mark_all(self):
+        self.results.mark_all()
+        self.notify('marking_changed')
+    
+    def mark_none(self):
+        self.results.mark_none()
+        self.notify('marking_changed')
+    
+    def mark_invert(self):
+        self.results.mark_invert()
+        self.notify('marking_changed')
+    
+    def mark_dupe(self, dupe, marked):
+        if marked:
+            self.results.mark(dupe)
+        else:
+            self.results.unmark(dupe)
+        self.notify('marking_changed')
+    
+    def open_selected(self):
+        if self.selected_dupes:
+            self._open_path(self.selected_dupes[0].path)
+    
+    def purge_ignore_list(self):
+        self.scanner.ignore_list.Filter(lambda f,s:op.exists(f) and op.exists(s))
+    
+    def remove_directory(self,index):
         try:
-            self.directories.save_to_file(op.join(self.appdata, 'last_directories.xml'))
-            self.results.save_to_xml(op.join(self.appdata, 'last_results.xml'))
-        except LookupError:
-            # This is that weird issue from #39 that sometimes happens when auto-updating with
-            # Sparkle. Just ignore it.
+            del self.directories[index]
+            self.notify('directories_changed')
+        except IndexError:
             pass
     
+    def remove_duplicates(self, duplicates):
+        self.results.remove_duplicates(self.without_ref(duplicates))
+        self.notify('results_changed')
+    
+    def remove_marked(self):
+        self.results.perform_on_marked(lambda x:True, True)
+        self.notify('results_changed')
+    
+    def remove_selected(self):
+        self.remove_duplicates(self.selected_dupes)
+    
+    def rename_selected(self, newname):
+        try:
+            d = self.selected_dupes[0]
+            d.rename(newname)
+            return True
+        except (IndexError, fs.FSError) as e:
+            logging.warning("dupeGuru Warning: %s" % unicode(e))
+        return False
+    
+    def reveal_selected(self):
+        if self.selected_dupes:
+            self._reveal_path(self.selected_dupes[0].path)
+    
+    def save(self):
+        if not op.exists(self.appdata):
+            os.makedirs(self.appdata)
+        self.directories.save_to_file(op.join(self.appdata, 'last_directories.xml'))
+        self.results.save_to_xml(op.join(self.appdata, 'last_results.xml'))
+    
     def save_ignore_list(self):
+        if not op.exists(self.appdata):
+            os.makedirs(self.appdata)
         p = op.join(self.appdata, 'ignore_list.xml')
         self.scanner.ignore_list.save_to_xml(p)
     
@@ -239,6 +326,14 @@ class DupeGuru(RegistrableApplication):
         self.results.groups = []
         self._start_job(JOB_SCAN, do)
     
+    def toggle_selected_mark_state(self):
+        for dupe in self.selected_dupes:
+            self.results.mark_toggle(dupe)
+        self.notify('marking_changed')
+    
+    def without_ref(self, dupes):
+        return [dupe for dupe in dupes if self.results.get_group_of_duplicate(dupe).ref is not dupe]
+    
     #--- Properties
     @property
     def stat_line(self):

core/app_cocoa.py

@@ -0,0 +1,89 @@
+# Created By: Virgil Dupras
+# Created On: 2006/11/11
+# 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 logging
+import os.path as op
+
+from hsutil import cocoa, job
+from hsutil.cocoa import install_exception_hook
+from hsutil.cocoa.objcmin import (NSNotificationCenter, NSUserDefaults,
+    NSSearchPathForDirectoriesInDomains, NSApplicationSupportDirectory, NSUserDomainMask,
+    NSWorkspace, NSWorkspaceRecycleOperation)
+from hsutil.reg import RegistrationRequired
+
+from . import app, fs
+
+JOBID2TITLE = {
+    app.JOB_SCAN: "Scanning for duplicates",
+    app.JOB_LOAD: "Loading",
+    app.JOB_MOVE: "Moving",
+    app.JOB_COPY: "Copying",
+    app.JOB_DELETE: "Sending to Trash",
+}
+
+def demo_method(method):
+    def wrapper(self, *args, **kwargs):
+        try:
+            return method(self, *args, **kwargs)
+        except RegistrationRequired:
+            NSNotificationCenter.defaultCenter().postNotificationName_object_('RegistrationRequired', self)
+    
+    return wrapper
+
+class DupeGuru(app.DupeGuru):
+    def __init__(self, data_module, appdata_subdir, appid):
+        LOGGING_LEVEL = logging.DEBUG if NSUserDefaults.standardUserDefaults().boolForKey_('debug') else logging.WARNING
+        logging.basicConfig(level=LOGGING_LEVEL, format='%(levelname)s %(message)s')
+        logging.debug('started in debug mode')
+        install_exception_hook()
+        appsupport = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, True)[0]
+        appdata = op.join(appsupport, appdata_subdir)
+        app.DupeGuru.__init__(self, data_module, appdata, appid)
+        self.progress = cocoa.ThreadedJobPerformer()
+    
+    #--- Override
+    @staticmethod
+    def _open_path(path):
+        NSWorkspace.sharedWorkspace().openFile_(unicode(path))
+    
+    @staticmethod
+    def _recycle_dupe(dupe):
+        # local import because first appkit import takes a lot of memory. we want to avoid it.
+        directory = unicode(dupe.path[:-1])
+        filename = dupe.name
+        result, tag = NSWorkspace.sharedWorkspace().performFileOperation_source_destination_files_tag_(
+            NSWorkspaceRecycleOperation, directory, '', [filename], None)
+    
+    @staticmethod
+    def _reveal_path(path):
+        NSWorkspace.sharedWorkspace().selectFile_inFileViewerRootedAtPath_(unicode(path), '')
+    
+    def _start_job(self, jobid, func):
+        try:
+            j = self.progress.create_job()
+            self.progress.run_threaded(func, args=(j, ))
+        except job.JobInProgressError:
+            NSNotificationCenter.defaultCenter().postNotificationName_object_('JobInProgress', self)
+        else:
+            ud = {'desc': JOBID2TITLE[jobid], 'jobid':jobid}
+            NSNotificationCenter.defaultCenter().postNotificationName_object_userInfo_('JobStarted', self, ud)
+    
+    #---Public
+    copy_or_move_marked = demo_method(app.DupeGuru.copy_or_move_marked)
+    delete_marked = demo_method(app.DupeGuru.delete_marked)
+    
+    def start_scanning(self):
+        self._select_dupes([])
+        try:
+            app.DupeGuru.start_scanning(self)
+            return 0
+        except app.NoScannableFileError:
+            return 3
+        except app.AllFilesAreRefError:
+            return 1
+    

core/app_cocoa_inter.py

@@ -0,0 +1,198 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-02-02
+# 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
+
+# Common interface for all editions' dg_cocoa unit.
+
+from hsutil.cocoa.inter import signature, PyOutline, PyGUIObject, PyRegistrable
+
+from .gui.details_panel import DetailsPanel
+from .gui.directory_tree import DirectoryTree
+from .gui.result_tree import ResultTree
+from .gui.stats_label import StatsLabel
+
+# Fix py2app's problems on relative imports
+from core import app, app_cocoa, data, directories, engine, export, ignore, results, fs, scanner
+from hsutil import conflict
+
+class PyDupeGuruBase(PyRegistrable):
+    #---Directories
+    def addDirectory_(self, directory):
+        return self.py.add_directory(directory)
+    
+    def removeDirectory_(self, index):
+        self.py.remove_directory(index)
+    
+    #---Results
+    def clearIgnoreList(self):
+        self.py.scanner.ignore_list.Clear()
+    
+    def doScan(self):
+        return self.py.start_scanning()
+    
+    def exportToXHTMLwithColumns_(self, column_ids):
+        return self.py.export_to_xhtml(column_ids)
+    
+    def loadIgnoreList(self):
+        self.py.load_ignore_list()
+    
+    def loadResults(self):
+        self.py.load()
+    
+    def markAll(self):
+        self.py.mark_all()
+    
+    def markNone(self):
+        self.py.mark_none()
+    
+    def markInvert(self):
+        self.py.mark_invert()
+    
+    def purgeIgnoreList(self):
+        self.py.purge_ignore_list()
+    
+    def toggleSelectedMark(self):
+        self.py.toggle_selected_mark_state()
+    
+    def saveIgnoreList(self):
+        self.py.save_ignore_list()
+    
+    def saveResults(self):
+        self.py.save()
+    
+    #---Actions
+    def addSelectedToIgnoreList(self):
+        self.py.add_selected_to_ignore_list()
+    
+    def deleteMarked(self):
+        self.py.delete_marked()
+    
+    def applyFilter_(self, filter):
+        self.py.apply_filter(filter)
+    
+    def makeSelectedReference(self):
+        self.py.make_selected_reference()
+    
+    def copyOrMove_markedTo_recreatePath_(self, copy, destination, recreate_path):
+        self.py.copy_or_move_marked(copy, destination, recreate_path)
+    
+    def openSelected(self):
+        self.py.open_selected()
+    
+    def removeMarked(self):
+        self.py.remove_marked()
+    
+    def renameSelected_(self,newname):
+        return self.py.rename_selected(newname)
+    
+    def revealSelected(self):
+        self.py.reveal_selected()
+    
+    #---Information
+    def getIgnoreListCount(self):
+        return len(self.py.scanner.ignore_list)
+    
+    def getMarkCount(self):
+        return self.py.results.mark_count
+    
+    def getOperationalErrorCount(self):
+        return self.py.last_op_error_count
+    
+    #---Properties
+    def setMixFileKind_(self, mix_file_kind):
+        self.py.scanner.mix_file_kind = mix_file_kind
+    
+    def setEscapeFilterRegexp_(self, escape_filter_regexp):
+        self.py.options['escape_filter_regexp'] = escape_filter_regexp
+    
+    def setRemoveEmptyFolders_(self, remove_empty_folders):
+        self.py.options['clean_empty_dirs'] = remove_empty_folders
+    
+    #---Worker
+    def getJobProgress(self):
+        return self.py.progress.last_progress
+    
+    def getJobDesc(self):
+        return self.py.progress.last_desc
+    
+    def cancelJob(self):
+        self.py.progress.job_cancelled = True
+    
+    def jobCompleted_(self, jobid):
+        self.py._job_completed(jobid)
+    
+
+class PyDetailsPanel(PyGUIObject):
+    py_class = DetailsPanel
+    @signature('i@:')
+    def numberOfRows(self):
+        return self.py.row_count()
+    
+    @signature('@@:@i')
+    def valueForColumn_row_(self, column, row):
+        return self.py.row(row)[int(column)]
+    
+
+class PyDirectoryOutline(PyOutline):
+    py_class = DirectoryTree
+    
+    def addDirectory_(self, path):
+        self.py.add_directory(path)
+    
+
+class PyResultOutline(PyOutline):
+    py_class = ResultTree
+    
+    @signature('c@:')
+    def powerMarkerMode(self):
+        return self.py.power_marker
+    
+    @signature('v@:c')
+    def setPowerMarkerMode_(self, value):
+        self.py.power_marker = value
+    
+    @signature('c@:')
+    def deltaValuesMode(self):
+        return self.py.delta_values
+    
+    @signature('v@:c')
+    def setDeltaValuesMode_(self, value):
+        self.py.delta_values = value
+    
+    @signature('@@:@i')
+    def valueForPath_column_(self, path, column):
+        return self.py.get_node_value(path, column)
+    
+    @signature('c@:@')
+    def renameSelected_(self, newname):
+        return self.py.rename_selected(newname)
+    
+    @signature('v@:ic')
+    def sortBy_ascending_(self, key, asc):
+        self.py.sort(key, asc)
+    
+    def markSelected(self):
+        self.py.app.toggle_selected_mark_state()
+    
+    def removeSelected(self):
+        self.py.app.remove_selected()
+    
+    def rootChildrenCounts(self):
+        return self.py.root_children_counts()
+    
+    # python --> cocoa
+    def invalidate_markings(self):
+        self.cocoa.invalidateMarkings()
+    
+
+class PyStatsLabel(PyGUIObject):
+    py_class = StatsLabel
+    
+    def display(self):
+        return self.py.display
+    

core/data.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/03/15
-# $Id$
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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 

core/directories.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/27
-# $Id$
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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 

core/engine.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/01/29
-# $Id$
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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 
@@ -217,6 +216,8 @@ def getmatches_by_contents(files, sizeattr='size', partial=False, j=job.nulljob)
     j.start_job(len(possible_matches), '0 matches found')
     for group in possible_matches:
         for first, second in itertools.combinations(group, 2):
+            if first.is_ref and second.is_ref:
+                continue # Don't spend time comparing two ref pics together.
             if first.md5partial == second.md5partial:
                 if partial or first.md5 == second.md5:
                     result.append(Match(first, second, 100))

core/export.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/09/16
-# $Id$
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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 

core/fs.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 # Created By: Virgil Dupras
 # Created On: 2009-10-22
-# $Id$
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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 
@@ -103,8 +102,12 @@ class File(object):
         elif field == 'md5':
             try:
                 fp = io.open(self.path, 'rb')
-                filedata = fp.read()
-                md5 = hashlib.md5(filedata)
+                md5 = hashlib.md5()
+                CHUNK_SIZE = 8192
+                filedata = fp.read(CHUNK_SIZE)
+                while filedata:
+                    md5.update(filedata)
+                    filedata = fp.read(CHUNK_SIZE)
                 self.md5 = md5.digest()
                 fp.close()
             except Exception:
@@ -157,8 +160,16 @@ def get_file(path, fileclasses=[File]):
 
 def get_files(path, fileclasses=[File]):
     assert all(issubclass(fileclass, File) for fileclass in fileclasses)
+    def combine_paths(p1, p2):
         try:
-        paths = [path + name for name in io.listdir(path)]
+            return p1 + p2
+        except Exception:
+            # This is temporary debug logging for #84.
+            logging.warning("Failed to combine %r and %r.", p1, p2)
+            raise
+    
+    try:
+        paths = [combine_paths(path, name) for name in io.listdir(path)]
         result = []
         for path in paths:
             file = get_file(path, fileclasses=fileclasses)

core/gui/base.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-02-06
+# 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
+
+from hsutil.notify import Listener
+
+class GUIObject(Listener):
+    def __init__(self, view, app):
+        Listener.__init__(self, app)
+        self.view = view
+        self.app = app
+    
+    def directories_changed(self):
+        pass
+    
+    def dupes_selected(self):
+        pass
+    
+    def marking_changed(self):
+        pass
+    
+    def results_changed(self):
+        pass
+    
+    def results_switched(self):
+        pass
+    

core/gui/details_panel.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-02-05
+# 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
+
+from .base import GUIObject
+
+class DetailsPanel(GUIObject):
+    def __init__(self, view, app):
+        GUIObject.__init__(self, view, app)
+        self._table = []
+    
+    def connect(self):
+        GUIObject.connect(self)
+        self._refresh()
+        self.view.refresh()
+    
+    #--- Private
+    def _refresh(self):
+        if self.app.selected_dupes:
+            dupe = self.app.selected_dupes[0]
+            group = self.app.results.get_group_of_duplicate(dupe)
+        else:
+            dupe = None
+            group = None
+        l1 = self.app._get_display_info(dupe, group, False)
+        # we don't want the two sides of the table to display the stats for the same file
+        ref = group.ref if group is not None and group.ref is not dupe else None
+        l2 = self.app._get_display_info(ref, group, False)
+        names = [c['display'] for c in self.app.data.COLUMNS]
+        self._table = zip(names, l1, l2)
+    
+    #--- Public
+    def row_count(self):
+        return len(self._table)
+    
+    def row(self, row_index):
+        return self._table[row_index]
+    
+    #--- Event Handlers
+    def dupes_selected(self):
+        self._refresh()
+        self.view.refresh()
+    

core/gui/directory_tree.py

@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-02-06
+# 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
+
+from hsgui.tree import Tree, Node
+
+from ..directories import STATE_NORMAL, STATE_REFERENCE, STATE_EXCLUDED
+from .base import GUIObject
+
+STATE_ORDER = [STATE_NORMAL, STATE_REFERENCE, STATE_EXCLUDED]
+
+# Lazily loads children
+class DirectoryNode(Node):
+    def __init__(self, app, path, name):
+        Node.__init__(self, name)
+        self._app = app
+        self._directory_path = path
+        self._loaded = False
+        self._state = STATE_ORDER.index(self._app.directories.get_state(path))
+    
+    def __len__(self):
+        if not self._loaded:
+            self._load()
+        return Node.__len__(self)
+    
+    def _load(self):
+        self.clear()
+        subpaths = self._app.directories.get_subfolders(self._directory_path)
+        for path in subpaths:
+            self.append(DirectoryNode(self._app, path, path[-1]))
+        self._loaded = True
+    
+    # The state propery is an index to the combobox
+    @property
+    def state(self):
+        return self._state
+    
+    @state.setter
+    def state(self, value):
+        if value == self._state:
+            return
+        self._state = value
+        state = STATE_ORDER[value]
+        self._app.directories.set_state(self._directory_path, state)
+    
+
+class DirectoryTree(GUIObject, Tree):
+    def __init__(self, view, app):
+        GUIObject.__init__(self, view, app)
+        Tree.__init__(self)
+    
+    def connect(self):
+        GUIObject.connect(self)
+        self._refresh()
+        self.view.refresh()
+    
+    def _refresh(self):
+        self.clear()
+        for path in self.app.directories:
+            self.append(DirectoryNode(self.app, path, unicode(path)))
+    
+    def add_directory(self, path):
+        self.app.add_directory(path)
+    
+    #--- Event Handlers
+    def directories_changed(self):
+        self._refresh()
+        self.view.refresh()
+    

core/gui/result_tree.py

@@ -0,0 +1,159 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-02-11
+# 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
+
+from operator import attrgetter
+
+from hsgui.tree import Tree, Node
+
+from .base import GUIObject
+
+class DupeNode(Node):
+    def __init__(self, app, group, dupe):
+        Node.__init__(self, '')
+        self._app = app
+        self._group = group
+        self._dupe = dupe
+        self._data = None
+        self._data_delta = None
+    
+    @property
+    def data(self):
+        if self._data is None:
+            self._data = self._app._get_display_info(self._dupe, self._group, False)
+        return self._data
+    
+    @property
+    def data_delta(self):
+        if self._data_delta is None:
+            self._data_delta = self._app._get_display_info(self._dupe, self._group, True)
+        return self._data_delta
+    
+    @property
+    def markable(self):
+        return self._app.results.is_markable(self._dupe)
+    
+    @property
+    def marked(self):
+        return self._app.results.is_marked(self._dupe)
+    
+    @marked.setter
+    def marked(self, value):
+        self._app.mark_dupe(self._dupe, value)
+    
+
+class ResultTree(GUIObject, Tree):
+    def __init__(self, view, app):
+        GUIObject.__init__(self, view, app)
+        Tree.__init__(self)
+        self._power_marker = False
+        self._delta_values = False
+        self._sort_descriptors = (0, True)
+    
+    #--- Override
+    def connect(self):
+        GUIObject.connect(self)
+        self._refresh()
+        self.view.refresh()
+    
+    def _select_nodes(self, nodes):
+        Tree._select_nodes(self, nodes)
+        self.app._select_dupes(map(attrgetter('_dupe'), nodes))
+    
+    #--- Private
+    def _refresh(self):
+        self.clear()
+        if not self.power_marker:
+            for group in self.app.results.groups:
+                group_node = DupeNode(self.app, group, group.ref)
+                self.append(group_node)
+                for dupe in group.dupes:
+                    group_node.append(DupeNode(self.app, group, dupe))
+        else:
+            for dupe in self.app.results.dupes:
+                group = self.app.results.get_group_of_duplicate(dupe)
+                self.append(DupeNode(self.app, group, dupe))
+        if self.app.selected_dupes:
+            to_find = set(self.app.selected_dupes)
+            nodes = list(self.findall(lambda n: n is not self and n._dupe in to_find))
+            self.selected_nodes = nodes
+    
+    #--- Public
+    def get_node_value(self, path, column):
+        try:
+            node = self.get_node(path)
+        except IndexError:
+            return '---'
+        if self.delta_values:
+            return node.data_delta[column]
+        else:
+            return node.data[column]
+    
+    def rename_selected(self, newname):
+        node = self.selected_node
+        node._data = None
+        node._data_delta = None
+        return self.app.rename_selected(newname)
+    
+    def root_children_counts(self):
+        # This is a speed optimization for cases where there's a lot of results so that there is
+        # not thousands of children_count queries when expandAll is called.
+        return [len(node) for node in self]
+    
+    def sort(self, key, asc):
+        if self.power_marker:
+            self.app.results.sort_dupes(key, asc, self.delta_values)
+        else:
+            self.app.results.sort_groups(key, asc)
+        self._sort_descriptors = (key, asc)
+        self._refresh()
+        self.view.refresh()
+    
+    #--- Properties
+    @property
+    def power_marker(self):
+        return self._power_marker
+    
+    @power_marker.setter
+    def power_marker(self, value):
+        if value == self._power_marker:
+            return
+        self._power_marker = value
+        key, asc = self._sort_descriptors
+        self.sort(key, asc)
+        self._refresh()
+        self.view.refresh()
+    
+    @property
+    def delta_values(self):
+        return self._delta_values
+    
+    @delta_values.setter
+    def delta_values(self, value):
+        if value == self._delta_values:
+            return
+        self._delta_values = value
+        self._refresh()
+        self.view.refresh()
+    
+    #--- Event Handlers
+    def marking_changed(self):
+        self.view.invalidate_markings()
+    
+    def results_changed(self):
+        self._refresh()
+        self.view.refresh()
+    
+    def results_switched(self):
+        # What we want to to here is that instead of restoring selected *dupes* after refresh, we
+        # restore selected *paths*.
+        paths = self.selected_paths
+        self._refresh()
+        self.selected_paths = paths
+        self.view.refresh()
+    

core/gui/stats_label.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2010-02-11
+# 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
+
+from .base import GUIObject
+
+class StatsLabel(GUIObject):
+    def connect(self):
+        GUIObject.connect(self)
+        self.view.refresh()
+    
+    @property
+    def display(self):
+        return self.app.stat_line
+    
+    def results_changed(self):
+        self.view.refresh()
+    marking_changed = results_changed

core/ignore.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/05/02
-# $Id$
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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 

core/results.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/02/23
-# $Id$
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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 

core/scanner.py

@@ -1,7 +1,6 @@
 # Created By: Virgil Dupras
 # Created On: 2006/03/03
-# $Id$
-# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 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