Changed the build system (that commit is *huge*)

--HG-- rename : base/cocoa/AppDelegate.h => cocoa/base/AppDelegate.h rename : base/cocoa/AppDelegate.m => cocoa/base/AppDelegate.m rename : base/cocoa/Consts.h => cocoa/base/Consts.h rename : base/cocoa/DetailsPanel.h => cocoa/base/DetailsPanel.h rename : base/cocoa/DetailsPanel.m => cocoa/base/DetailsPanel.m rename : base/cocoa/DirectoryPanel.h => cocoa/base/DirectoryPanel.h rename : base/cocoa/DirectoryPanel.m => cocoa/base/DirectoryPanel.m rename : base/cocoa/PyDupeGuru.h => cocoa/base/PyDupeGuru.h rename : base/cocoa/ResultWindow.h => cocoa/base/ResultWindow.h rename : base/cocoa/ResultWindow.m => cocoa/base/ResultWindow.m rename : base/cocoa/dsa_pub.pem => cocoa/base/dsa_pub.pem rename : base/cocoa/xib/DetailsPanel.xib => cocoa/base/xib/DetailsPanel.xib rename : base/cocoa/xib/DirectoryPanel.xib => cocoa/base/xib/DirectoryPanel.xib rename : base/cocoa/xib/MainMenu.xib => cocoa/base/xib/MainMenu.xib rename : me/cocoa/AppDelegate.h => cocoa/me/AppDelegate.h rename : me/cocoa/AppDelegate.m => cocoa/me/AppDelegate.m rename : me/cocoa/Consts.h => cocoa/me/Consts.h rename : me/cocoa/DetailsPanel.h => cocoa/me/DetailsPanel.h rename : me/cocoa/DetailsPanel.m => cocoa/me/DetailsPanel.m rename : me/cocoa/DirectoryPanel.h => cocoa/me/DirectoryPanel.h rename : me/cocoa/DirectoryPanel.m => cocoa/me/DirectoryPanel.m rename : me/cocoa/Info.plist => cocoa/me/Info.plist rename : me/cocoa/PyDupeGuru.h => cocoa/me/PyDupeGuru.h rename : me/cocoa/ResultWindow.h => cocoa/me/ResultWindow.h rename : me/cocoa/ResultWindow.m => cocoa/me/ResultWindow.m rename : me/cocoa/dupeguru.icns => cocoa/me/dupeguru.icns rename : me/cocoa/dupeguru.xcodeproj/project.pbxproj => cocoa/me/dupeguru.xcodeproj/project.pbxproj rename : me/cocoa/gen.py => cocoa/me/gen.py rename : me/cocoa/main.m => cocoa/me/main.m rename : me/cocoa/py/dg_cocoa.py => cocoa/me/py/dg_cocoa.py rename : me/cocoa/py/setup.py => cocoa/me/py/setup.py rename : me/cocoa/xib/Preferences.xib => cocoa/me/xib/Preferences.xib rename : pe/cocoa/AppDelegate.h => cocoa/pe/AppDelegate.h rename : pe/cocoa/AppDelegate.m => cocoa/pe/AppDelegate.m rename : pe/cocoa/Consts.h => cocoa/pe/Consts.h rename : pe/cocoa/DetailsPanel.h => cocoa/pe/DetailsPanel.h rename : pe/cocoa/DetailsPanel.m => cocoa/pe/DetailsPanel.m rename : pe/cocoa/DirectoryPanel.h => cocoa/pe/DirectoryPanel.h rename : pe/cocoa/DirectoryPanel.m => cocoa/pe/DirectoryPanel.m rename : pe/cocoa/Info.plist => cocoa/pe/Info.plist rename : pe/cocoa/PictureBlocks.h => cocoa/pe/PictureBlocks.h rename : pe/cocoa/PictureBlocks.m => cocoa/pe/PictureBlocks.m rename : pe/cocoa/PyDupeGuru.h => cocoa/pe/PyDupeGuru.h rename : pe/cocoa/ResultWindow.h => cocoa/pe/ResultWindow.h rename : pe/cocoa/ResultWindow.m => cocoa/pe/ResultWindow.m rename : pe/cocoa/dupeguru.icns => cocoa/pe/dupeguru.icns rename : pe/cocoa/dupeguru.xcodeproj/project.pbxproj => cocoa/pe/dupeguru.xcodeproj/project.pbxproj rename : pe/cocoa/gen.py => cocoa/pe/gen.py rename : pe/cocoa/main.m => cocoa/pe/main.m rename : pe/cocoa/py/dg_cocoa.py => cocoa/pe/py/dg_cocoa.py rename : pe/cocoa/py/setup.py => cocoa/pe/py/setup.py rename : pe/cocoa/xib/DetailsPanel.xib => cocoa/pe/xib/DetailsPanel.xib rename : pe/cocoa/xib/Preferences.xib => cocoa/pe/xib/Preferences.xib rename : se/cocoa/AppDelegate.h => cocoa/se/AppDelegate.h rename : se/cocoa/AppDelegate.m => cocoa/se/AppDelegate.m rename : se/cocoa/Consts.h => cocoa/se/Consts.h rename : se/cocoa/DetailsPanel.h => cocoa/se/DetailsPanel.h rename : se/cocoa/DetailsPanel.m => cocoa/se/DetailsPanel.m rename : se/cocoa/DirectoryPanel.h => cocoa/se/DirectoryPanel.h rename : se/cocoa/DirectoryPanel.m => cocoa/se/DirectoryPanel.m rename : se/cocoa/Info.plist => cocoa/se/Info.plist rename : se/cocoa/PyDupeGuru.h => cocoa/se/PyDupeGuru.h rename : se/cocoa/ResultWindow.h => cocoa/se/ResultWindow.h rename : se/cocoa/ResultWindow.m => cocoa/se/ResultWindow.m rename : se/cocoa/dupeguru.icns => cocoa/se/dupeguru.icns rename : se/cocoa/dupeguru.xcodeproj/project.pbxproj => cocoa/se/dupeguru.xcodeproj/project.pbxproj rename : se/cocoa/gen.py => cocoa/se/gen.py rename : se/cocoa/main.m => cocoa/se/main.m rename : se/cocoa/py/dg_cocoa.py => cocoa/se/py/dg_cocoa.py rename : se/cocoa/py/setup.py => cocoa/se/py/setup.py rename : se/cocoa/xib/Preferences.xib => cocoa/se/xib/Preferences.xib rename : base/core/LICENSE => core/LICENSE rename : base/core/__init__.py => core/__init__.py rename : base/core/app.py => core/app.py rename : base/core/app_cocoa.py => core/app_cocoa.py rename : base/core/data.py => core/data.py rename : base/core/directories.py => core/directories.py rename : base/core/engine.py => core/engine.py rename : base/core/export.py => core/export.py rename : base/core/fs.py => core/fs.py rename : base/core/ignore.py => core/ignore.py rename : base/core/results.py => core/results.py rename : base/core/scanner.py => core/scanner.py rename : base/core/tests/__init__.py => core/tests/__init__.py rename : base/core/tests/app_cocoa_test.py => core/tests/app_cocoa_test.py rename : base/core/tests/app_test.py => core/tests/app_test.py rename : base/core/tests/data.py => core/tests/data.py rename : base/core/tests/directories_test.py => core/tests/directories_test.py rename : base/core/tests/engine_test.py => core/tests/engine_test.py rename : base/core/tests/ignore_test.py => core/tests/ignore_test.py rename : base/core/tests/results_test.py => core/tests/results_test.py rename : base/core/tests/scanner_test.py => core/tests/scanner_test.py rename : me/core/__init__.py => core_me/__init__.py rename : me/core/app_cocoa.py => core_me/app_cocoa.py rename : me/core/data.py => core_me/data.py rename : me/core/fs.py => core_me/fs.py rename : me/core/scanner.py => core_me/scanner.py rename : me/core/tests/__init__.py => core_me/tests/__init__.py rename : me/core/tests/scanner_test.py => core_me/tests/scanner_test.py rename : pe/core/LICENSE => core_pe/LICENSE rename : pe/core/__init__.py => core_pe/__init__.py rename : pe/core/app_cocoa.py => core_pe/app_cocoa.py rename : pe/core/block.py => core_pe/block.py rename : pe/core/cache.py => core_pe/cache.py rename : pe/core/data.py => core_pe/data.py rename : pe/core/gen.py => core_pe/gen.py rename : pe/core/matchbase.py => core_pe/matchbase.py rename : pe/core/modules/block/block.pyx => core_pe/modules/block/block.pyx rename : pe/core/modules/block/setup.py => core_pe/modules/block/setup.py rename : pe/core/modules/cache/cache.pyx => core_pe/modules/cache/cache.pyx rename : pe/core/modules/cache/setup.py => core_pe/modules/cache/setup.py rename : pe/core/scanner.py => core_pe/scanner.py rename : pe/core/tests/__init__.py => core_pe/tests/__init__.py rename : pe/core/tests/block_test.py => core_pe/tests/block_test.py rename : pe/core/tests/cache_test.py => core_pe/tests/cache_test.py rename : se/core/LICENSE => core_se/LICENSE rename : se/core/__init__.py => core_se/__init__.py rename : se/core/app_cocoa.py => core_se/app_cocoa.py rename : se/core/data.py => core_se/data.py rename : se/core/fs.py => core_se/fs.py rename : se/core/tests/__init__.py => core_se/tests/__init__.py rename : se/core/tests/fs_test.py => core_se/tests/fs_test.py rename : me/help/LICENSE => help_me/LICENSE rename : me/help/__init__.py => help_me/__init__.py rename : me/help/changelog.yaml => help_me/changelog.yaml rename : me/help/gen.py => help_me/gen.py rename : me/help/skeleton/hardcoded.css => help_me/skeleton/hardcoded.css rename : me/help/skeleton/images/hs_title.png => help_me/skeleton/images/hs_title.png rename : me/help/templates/base_dg.mako => help_me/templates/base_dg.mako rename : me/help/templates/credits.mako => help_me/templates/credits.mako rename : me/help/templates/directories.mako => help_me/templates/directories.mako rename : me/help/templates/faq.mako => help_me/templates/faq.mako rename : me/help/templates/intro.mako => help_me/templates/intro.mako rename : me/help/templates/power_marker.mako => help_me/templates/power_marker.mako rename : me/help/templates/preferences.mako => help_me/templates/preferences.mako rename : me/help/templates/quick_start.mako => help_me/templates/quick_start.mako rename : me/help/templates/results.mako => help_me/templates/results.mako rename : me/help/templates/versions.mako => help_me/templates/versions.mako rename : pe/help/LICENSE => help_pe/LICENSE rename : pe/help/__init__.py => help_pe/__init__.py rename : pe/help/changelog.yaml => help_pe/changelog.yaml rename : pe/help/gen.py => help_pe/gen.py rename : pe/help/skeleton/hardcoded.css => help_pe/skeleton/hardcoded.css rename : pe/help/skeleton/images/hs_title.png => help_pe/skeleton/images/hs_title.png rename : pe/help/templates/base_dg.mako => help_pe/templates/base_dg.mako rename : pe/help/templates/credits.mako => help_pe/templates/credits.mako rename : pe/help/templates/directories.mako => help_pe/templates/directories.mako rename : pe/help/templates/faq.mako => help_pe/templates/faq.mako rename : pe/help/templates/intro.mako => help_pe/templates/intro.mako rename : pe/help/templates/power_marker.mako => help_pe/templates/power_marker.mako rename : pe/help/templates/preferences.mako => help_pe/templates/preferences.mako rename : pe/help/templates/quick_start.mako => help_pe/templates/quick_start.mako rename : pe/help/templates/results.mako => help_pe/templates/results.mako rename : pe/help/templates/versions.mako => help_pe/templates/versions.mako rename : se/help/LICENSE => help_se/LICENSE rename : se/help/changelog.yaml => help_se/changelog.yaml rename : se/help/gen.py => help_se/gen.py rename : se/help/skeleton/hardcoded.css => help_se/skeleton/hardcoded.css rename : se/help/skeleton/images/hs_title.png => help_se/skeleton/images/hs_title.png rename : se/help/templates/base_dg.mako => help_se/templates/base_dg.mako rename : se/help/templates/credits.mako => help_se/templates/credits.mako rename : se/help/templates/directories.mako => help_se/templates/directories.mako rename : se/help/templates/faq.mako => help_se/templates/faq.mako rename : se/help/templates/intro.mako => help_se/templates/intro.mako rename : se/help/templates/power_marker.mako => help_se/templates/power_marker.mako rename : se/help/templates/preferences.mako => help_se/templates/preferences.mako rename : se/help/templates/quick_start.mako => help_se/templates/quick_start.mako rename : se/help/templates/results.mako => help_se/templates/results.mako rename : se/help/templates/versions.mako => help_se/templates/versions.mako rename : base/qt/WARNING => qt/WARNING rename : base/qt/__init__.py => qt/base/__init__.py rename : base/qt/app.py => qt/base/app.py rename : base/qt/details_table.py => qt/base/details_table.py rename : base/qt/dg.qrc => qt/base/dg.qrc rename : base/qt/directories_dialog.py => qt/base/directories_dialog.py rename : base/qt/directories_dialog.ui => qt/base/directories_dialog.ui rename : base/qt/directories_model.py => qt/base/directories_model.py rename : base/qt/main_window.py => qt/base/main_window.py rename : base/qt/main_window.ui => qt/base/main_window.ui rename : base/qt/platform.py => qt/base/platform.py rename : base/qt/platform_osx.py => qt/base/platform_osx.py rename : base/qt/platform_win.py => qt/base/platform_win.py rename : base/qt/preferences.py => qt/base/preferences.py rename : base/qt/results_model.py => qt/base/results_model.py rename : me/qt/app.py => qt/me/app.py rename : me/qt/build.py => qt/me/build.py rename : me/qt/details_dialog.py => qt/me/details_dialog.py rename : me/qt/details_dialog.ui => qt/me/details_dialog.ui rename : me/qt/dgme.spec => qt/me/dgme.spec rename : me/qt/gen.py => qt/me/gen.py rename : me/qt/installer.aip => qt/me/installer.aip rename : me/qt/preferences.py => qt/me/preferences.py rename : me/qt/preferences_dialog.py => qt/me/preferences_dialog.py rename : me/qt/preferences_dialog.ui => qt/me/preferences_dialog.ui rename : me/qt/profile.py => qt/me/profile.py rename : me/qt/start.py => qt/me/start.py rename : me/qt/verinfo => qt/me/verinfo rename : pe/qt/app.py => qt/pe/app.py rename : pe/qt/block.py => qt/pe/block.py rename : pe/qt/build.py => qt/pe/build.py rename : pe/qt/details_dialog.py => qt/pe/details_dialog.py rename : pe/qt/details_dialog.ui => qt/pe/details_dialog.ui rename : pe/qt/dgpe.spec => qt/pe/dgpe.spec rename : pe/qt/gen.py => qt/pe/gen.py rename : pe/qt/installer.aip => qt/pe/installer.aip rename : pe/qt/main_window.py => qt/pe/main_window.py rename : pe/qt/modules/block/block.pyx => qt/pe/modules/block/block.pyx rename : pe/qt/modules/block/setup.py => qt/pe/modules/block/setup.py rename : pe/qt/preferences.py => qt/pe/preferences.py rename : pe/qt/preferences_dialog.py => qt/pe/preferences_dialog.py rename : pe/qt/preferences_dialog.ui => qt/pe/preferences_dialog.ui rename : pe/qt/profile.py => qt/pe/profile.py rename : pe/qt/start.py => qt/pe/start.py rename : pe/qt/verinfo => qt/pe/verinfo rename : se/qt/app.py => qt/se/app.py rename : se/qt/build.py => qt/se/build.py rename : se/qt/details_dialog.py => qt/se/details_dialog.py rename : se/qt/details_dialog.ui => qt/se/details_dialog.ui rename : se/qt/dgse.spec => qt/se/dgse.spec rename : se/qt/gen.py => qt/se/gen.py rename : se/qt/installer.aip => qt/se/installer.aip rename : se/qt/preferences.py => qt/se/preferences.py rename : se/qt/preferences_dialog.py => qt/se/preferences_dialog.py rename : se/qt/preferences_dialog.ui => qt/se/preferences_dialog.ui rename : se/qt/profile.py => qt/se/profile.py rename : se/qt/start.py => qt/se/start.py rename : se/qt/verinfo => qt/se/verinfo extra : convert_revision : svn%3Ac306627e-7827-47d3-bdf0-9a457c9553a1/trunk%40285
2026-01-22 14:41:39 +00:00 · 2009-12-30 16:34:41 +00:00
parent 5645515d90
commit 838f8ae352
251 changed files with 602 additions and 500 deletions
--- a/cocoa/base/AppDelegate.h
+++ b/cocoa/base/AppDelegate.h
@@ -0,0 +1,30 @@
+/* 
+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>
+#import "RecentDirectories.h"
+#import "PyDupeGuru.h"
+#import "ResultWindow.h"
+#import "DetailsPanel.h"
+
+@interface AppDelegateBase : NSObject
+{
+    IBOutlet PyDupeGuruBase *py;
+    IBOutlet RecentDirectories *recentDirectories;
+    IBOutlet NSMenuItem *unlockMenuItem;
+    IBOutlet ResultWindowBase *result;
+    
+    NSString *_appName;
+    DetailsPanelBase *_detailsPanel;
+}
+- (IBAction)unlockApp:(id)sender;
+
+- (PyDupeGuruBase *)py;
+- (RecentDirectories *)recentDirectories;
+- (DetailsPanelBase *)detailsPanel; // Virtual
+@end
--- a/cocoa/base/AppDelegate.m
+++ b/cocoa/base/AppDelegate.m
@@ -0,0 +1,59 @@
+/* 
+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
--- a/cocoa/base/Consts.h
+++ b/cocoa/base/Consts.h
@@ -0,0 +1,28 @@
+/* 
+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."
--- a/cocoa/base/DetailsPanel.h
+++ b/cocoa/base/DetailsPanel.h
@@ -0,0 +1,25 @@
+/* 
+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>
+#import "PyApp.h"
+#import "Table.h"
+
+
+@interface DetailsPanelBase : NSWindowController
+{
+    IBOutlet TableView *detailsTable;
+}
+- (id)initWithPy:(PyApp *)aPy;
+
+- (void)refresh;
+- (void)toggleVisibility;
+
+/* Notifications */
+- (void)duplicateSelectionChanged:(NSNotification *)aNotification;
+@end
--- a/cocoa/base/DetailsPanel.m
+++ b/cocoa/base/DetailsPanel.m
@@ -0,0 +1,44 @@
+/* 
+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
--- a/cocoa/base/DirectoryPanel.h
+++ b/cocoa/base/DirectoryPanel.h
@@ -0,0 +1,42 @@
+/* 
+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>
+#import "RecentDirectories.h"
+#import "Outline.h"
+#import "PyDupeGuru.h"
+
+@interface DirectoryOutline : OutlineView
+{
+}
+@end
+
+@protocol DirectoryOutlineDelegate
+- (void)outlineView:(NSOutlineView *)outlineView addDirectory:(NSString *)directory;
+@end
+
+@interface DirectoryPanelBase : NSWindowController
+{
+    IBOutlet NSPopUpButton *addButtonPopUp;
+    IBOutlet DirectoryOutline *directories;
+    IBOutlet NSButton *removeButton;
+    
+    PyDupeGuruBase *_py;
+    RecentDirectories *_recentDirectories;
+}
+- (id)initWithParentApp:(id)aParentApp;
+
+- (IBAction)askForDirectory:(id)sender;
+- (IBAction)changeDirectoryState:(id)sender;
+- (IBAction)popupAddDirectoryMenu:(id)sender;
+- (IBAction)removeSelectedDirectory:(id)sender;
+- (IBAction)toggleVisible:(id)sender;
+
+- (void)addDirectory:(NSString *)directory;
+- (void)refreshRemoveButtonText;
+@end
--- a/cocoa/base/DirectoryPanel.m
+++ b/cocoa/base/DirectoryPanel.m
@@ -0,0 +1,231 @@
+/* 
+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
--- a/cocoa/base/PyDupeGuru.h
+++ b/cocoa/base/PyDupeGuru.h
@@ -0,0 +1,66 @@
+/* 
+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>
+#import "PyApp.h"
+
+@interface PyDupeGuruBase : PyApp
+//Actions
+- (NSNumber *)addDirectory:(NSString *)name;
+- (void)removeDirectory:(NSNumber *)index;
+- (void)setDirectory:(NSArray *)indexPath state:(NSNumber *)state;
+- (void)loadResults;
+- (void)saveResults;
+- (void)loadIgnoreList;
+- (void)saveIgnoreList;
+- (void)clearIgnoreList;
+- (void)purgeIgnoreList;
+- (NSString *)exportToXHTMLwithColumns:(NSArray *)aColIds;
+
+- (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;
+
+//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;
+@end
--- a/cocoa/base/ResultWindow.h
+++ b/cocoa/base/ResultWindow.h
@@ -0,0 +1,63 @@
+/* 
+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>
+#import "Outline.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 NSSegmentedControl *pmSwitch;
+	IBOutlet NSTextField *stats;
+	IBOutlet NSMenu *columnsMenu;
+    
+    BOOL _powerMode;
+    BOOL _displayDelta;
+    NSMutableArray *_resultColumns;
+    NSWindowController *preferencesPanel;
+}
+/* Helpers */
+- (void)fillColumnsMenu;
+- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)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)changeDelta:(id)sender;
+- (IBAction)changePowerMarker:(id)sender;
+- (IBAction)copyMarked:(id)sender;
+- (IBAction)deleteMarked:(id)sender;
+- (IBAction)expandAll:(id)sender;
+- (IBAction)exportToXHTML:(id)sender;
+- (IBAction)moveMarked:(id)sender;
+- (IBAction)resetColumnsToDefault:(id)sender;
+- (IBAction)showPreferencesPanel:(id)sender;
+- (IBAction)switchSelected:(id)sender;
+- (IBAction)toggleColumn:(id)sender;
+- (IBAction)toggleDetailsPanel:(id)sender;
+- (IBAction)togglePowerMarker:(id)sender;
+
+/* Notifications */
+- (void)jobCompleted:(NSNotification *)aNotification;
+@end
--- a/cocoa/base/ResultWindow.m
+++ b/cocoa/base/ResultWindow.m
@@ -0,0 +1,464 @@
+/* 
+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 "ResultWindow.h"
+#import "Dialogs.h"
+#import "ProgressController.h"
+#import "Utils.h"
+#import "RegistrationInterface.h"
+#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"];
+    [self initResultColumns];
+    [self fillColumnsMenu];
+    [[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
+{
+    [preferencesPanel release];
+    [super dealloc];
+}
+
+/* Helpers */
+- (void)fillColumnsMenu
+{
+    // The columns menu is supposed to be empty and initResultColumns must have been called
+    for (NSTableColumn *col in _resultColumns)
+    {
+        NSMenuItem *mi = [columnsMenu addItemWithTitle:[[col headerCell] stringValue] action:@selector(toggleColumn:) keyEquivalent:@""];
+        [mi setTag:[[col identifier] integerValue]];
+        [mi setTarget:self];
+        if ([[matches tableColumns] containsObject:col])
+            [mi setState:NSOnState];
+    }
+    [columnsMenu addItem:[NSMenuItem separatorItem]];
+    NSMenuItem *mi = [columnsMenu addItemWithTitle:@"Reset to Default" action:@selector(resetColumnsToDefault:) keyEquivalent:@""];
+    [mi setTarget:self];
+}
+
+- (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn
+{
+    NSNumber *n = [NSNumber numberWithInt:aIdentifier];
+    NSTableColumn *col = [[NSTableColumn alloc] initWithIdentifier:[n stringValue]];
+    [col setWidth:aWidth];
+    [col setEditable:NO];
+    [[col dataCell] setFont:[[aColumn dataCell] font]];
+    [[col headerCell] setStringValue:aTitle];
+    [col setResizingMask:NSTableColumnUserResizingMask];
+    [col setSortDescriptorPrototype:[[NSSortDescriptor alloc] initWithKey:[n stringValue] ascending:YES]];
+    return col;
+}
+
+//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];
+        [result addObject:colId];
+    }
+    return result;
+}
+
+- (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]];
+        [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
+}
+
+- (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)
+            [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)
+                [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)changeDelta:(id)sender
+{
+    _displayDelta = [deltaSwitch selectedSegment] == 1;
+    [py setDisplayDeltaValues:b2n(_displayDelta)];
+    [matches reloadData];
+    [self expandAll:nil];
+}
+
+- (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];
+}
+
+- (IBAction)copyMarked:(id)sender
+{
+    int mark_count = [[py getMarkCount] intValue];
+    if (!mark_count)
+        return;
+    NSOpenPanel *op = [NSOpenPanel openPanel];
+    [op setCanChooseFiles:NO];
+    [op setCanChooseDirectories:YES];
+    [op setCanCreateDirectories:YES];
+    [op setAllowsMultipleSelection:NO];
+    [op setTitle:@"Select a directory to copy marked files to"];
+    if ([op runModalForTypes:nil] == NSOKButton)
+    {
+        NSString *directory = [[op filenames] objectAtIndex:0];
+        NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+        [py copyOrMove:b2n(YES) markedTo:directory recreatePath:[ud objectForKey:@"recreatePathType"]];
+    }
+}
+
+- (IBAction)deleteMarked:(id)sender
+{
+    int 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
+        return;
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [py setRemoveEmptyFolders:[ud objectForKey:@"removeEmptyFolders"]];
+    [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)moveMarked:(id)sender
+{
+    int mark_count = [[py getMarkCount] intValue];
+    if (!mark_count)
+        return;
+    NSOpenPanel *op = [NSOpenPanel openPanel];
+    [op setCanChooseFiles:NO];
+    [op setCanChooseDirectories:YES];
+    [op setCanCreateDirectories:YES];
+    [op setAllowsMultipleSelection:NO];
+    [op setTitle:@"Select a directory to move marked files to"];
+    if ([op runModalForTypes:nil] == NSOKButton)
+    {
+        NSString *directory = [[op filenames] objectAtIndex:0];
+        NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+        [py setRemoveEmptyFolders:[ud objectForKey:@"removeEmptyFolders"]];
+        [py copyOrMove:b2n(NO) markedTo:directory recreatePath:[ud objectForKey:@"recreatePathType"]];
+    }
+}
+
+- (IBAction)resetColumnsToDefault:(id)sender
+{
+    // Virtual
+}
+
+- (IBAction)showPreferencesPanel:(id)sender
+{
+    [preferencesPanel showWindow:sender];
+}
+
+- (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
+{
+    NSMenuItem *mi = sender;
+    NSString *colId = [NSString stringWithFormat:@"%d",[mi tag]];
+    NSTableColumn *col = [matches tableColumnWithIdentifier:colId];
+    if (col == nil)
+    {
+        //Add Column
+        col = [_resultColumns objectAtIndex:[mi tag]];
+        [matches addTableColumn:col];
+        [mi setState:NSOnState];
+    }
+    else
+    {
+        //Remove column
+        [matches removeTableColumn:col];
+        [mi setState:NSOffState];
+    }
+}
+
+- (IBAction)toggleDetailsPanel:(id)sender
+{
+    [[(AppDelegateBase *)app detailsPanel] toggleVisibility];
+}
+
+- (IBAction)togglePowerMarker:(id)sender
+{
+    if ([pmSwitch selectedSegment] == 1)
+        [pmSwitch setSelectedSegment:0];
+    else
+        [pmSwitch setSelectedSegment:1];
+    [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
+{
+    [NSApp hide:NSApp];
+}
+
+- (void)jobCompleted:(NSNotification *)aNotification
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+    int r = n2i([py getOperationalErrorCount]);
+    id lastAction = [[ProgressController mainProgressController] jobId];
+    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])
+    {
+        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)
+        {
+            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]];
+        }
+        else
+            [Dialogs showMessage:@"All marked files were sucessfully sent to Trash."];
+    }
+    // Re-activate toolbar items right after the progress bar stops showing instead of waiting until
+    // a mouse-over is performed
+    [[[self window] toolbar] validateVisibleItems];
+}
+
+- (void)jobInProgress:(NSNotification *)aNotification
+{
+    [Dialogs showMessage:@"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again."];
+}
+
+- (void)jobStarted:(NSNotification *)aNotification
+{
+    NSDictionary *ui = [aNotification userInfo];
+    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]];
+}
+
+- (void)registrationRequired:(NSNotification *)aNotification
+{
+    NSString *msg = @"This is a demo version, which only allows you 10 delete/copy/move actions per session. You cannot continue.";
+    [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];
+}
+
+- (BOOL)validateMenuItem:(NSMenuItem *)item
+{
+    return ![[ProgressController mainProgressController] isShown];
+}
+@end
--- a/cocoa/base/dsa_pub.pem
+++ b/cocoa/base/dsa_pub.pem
@@ -0,0 +1,20 @@
+-----BEGIN PUBLIC KEY-----
+MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQDSurIL+HKbw+jsppG6tp3+WOcA4W71
+nhwR/DD2Se076AtCXJcssAhuCDUm+AVkQ3l34D++aYWtLR575rCrwU4lZXfQe+b9
+plHK02oOuqAY8lO5y02xoHEh7XeGunZ0u8wOVZw8MI999vIJ8rtCdvIF3r26wkjx
+9sieSxVpzJHDV5JHVdK3ObkXp/ts99dOD5B3CWGS8UiroMgS0FmRl7uPuADRRn2G
+srHTBYMwJvq8HFzQmDxcLldGQMAKvRKchtH+nH6ci1unSnpDUyrsCd+7qv1cSTse
+qc4OgXBDQ94MfVEh6Bs0S9stYfJf8cp6iV18J0sqMb9rbP4qC56iBsXfAhUAj6tx
+gwima7VaNI4YiC69jpLod3MCggEAYx+/mbU8P/xGooV9MgA3nI2v2vVNkwZVFcPa
+ROLQHg+R7bAftF3+1M9AnSP2O+PnXL65DwyTOab/Z/zM/vof3LLCGLYCmzPL+xvB
+6PxlqO374kFsKHEaaw66nnFWzPSdks/il0rauAiEbO8Gn/a8F2HFdA/OCCzq83l6
+cOhya7kGXZxdjeIfpfiNjDqZXi+8VRNDcDXx5u/T4vpkliQ+4O8ZXjwE4z2dPHfu
+Bw/N7DUalkzhZygYqcgx3tUxu3x/Pso+inmIBbk/As0uZv2nEll2CkEI6CSJIpfn
+pLKNQb4E4G7h+u+8kfHcwQ59RU1uGh0PU5uM+DOPg6HsC41RwgOCAQUAAoIBABLY
+T8gN8KdxWheESorvgksdG+Fizhkafpac08MCwJFF24v5a8AvZbhcCMLhChrloKcQ
+19qHshRIuWbSma/OqCmQKH752PTOKxRKsmqAfO0Rej2aDJrd0s7YBMY72DqeSYPP
+peLlwv0gkgRW7/EbDvBI18iTbrQLZtdqs9Xajc3dyIG5wrMtAf/Gta2oWChHlBLZ
+S45++Y9ou+LtW7dMc7c+aTxbzeLG36S57kAenRzjfP8zOi3P+Cc+5b9+SZgqfFrz
+/ch/HjB2zYAKq9AZSmgp9qIlOIuXnctJUD9hHivuEXFDr6xi1cxj7Q8WnX4+C58/
+QyGS4lebbLQ35x6fTQ8=
+-----END PUBLIC KEY-----
--- a/cocoa/base/xib/DetailsPanel.xib
+++ b/cocoa/base/xib/DetailsPanel.xib
--- a/cocoa/base/xib/DirectoryPanel.xib
+++ b/cocoa/base/xib/DirectoryPanel.xib
--- a/cocoa/base/xib/MainMenu.xib
+++ b/cocoa/base/xib/MainMenu.xib
--- a/cocoa/me/AppDelegate.h
+++ b/cocoa/me/AppDelegate.h
@@ -0,0 +1,24 @@
+/* 
+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>
+#import "../base/AppDelegate.h"
+#import "ResultWindow.h"
+#import "DirectoryPanel.h"
+#import "PyDupeGuru.h"
+
+@interface AppDelegate : AppDelegateBase
+{   
+    DirectoryPanel *_directoryPanel;
+}
+- (IBAction)openWebsite:(id)sender;
+- (IBAction)toggleDirectories:(id)sender;
+
+- (DirectoryPanel *)directoryPanel;
+- (PyDupeGuru *)py;
+@end
--- a/cocoa/me/AppDelegate.m
+++ b/cocoa/me/AppDelegate.m
@@ -0,0 +1,117 @@
+/* 
+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 "../../cocoalib/ProgressController.h"
+#import "../../cocoalib/RegistrationInterface.h"
+#import "../../cocoalib/Utils.h"
+#import "../../cocoalib/ValueTransformers.h"
+#import "../../cocoalib/Dialogs.h"
+#import "DetailsPanel.h"
+#import "Consts.h"
+
+@implementation AppDelegate
+ (void)initialize
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    NSMutableDictionary *d = [NSMutableDictionary dictionaryWithCapacity:10];
+    [d setObject:i2n(3) forKey:@"scanType"];
+    [d setObject:i2n(80) forKey:@"minMatchPercentage"];
+    [d setObject:i2n(1) forKey:@"recreatePathType"];
+    [d setObject:b2n(NO) forKey:@"wordWeighting"];
+    [d setObject:b2n(NO) forKey:@"matchSimilarWords"];
+    [d setObject:b2n(YES) forKey:@"mixFileKind"];
+    [d setObject:b2n(NO) forKey:@"useRegexpFilter"];
+    [d setObject:b2n(NO) forKey:@"removeEmptyFolders"];
+    [d setObject:b2n(NO) forKey:@"debug"];
+    [d setObject:b2n(NO) forKey:@"scanTagTrack"];
+    [d setObject:b2n(YES) forKey:@"scanTagArtist"];
+    [d setObject:b2n(YES) forKey:@"scanTagAlbum"];
+    [d setObject:b2n(YES) forKey:@"scanTagTitle"];
+    [d setObject:b2n(NO) forKey:@"scanTagGenre"];
+    [d setObject:b2n(NO) forKey:@"scanTagYear"];
+    [d setObject:[NSArray array] forKey:@"recentDirectories"];
+    [d setObject:[NSArray array] forKey:@"columnsOrder"];
+    [d setObject:[NSDictionary dictionary] forKey:@"columnsWidth"];
+    [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:d];
+    [ud registerDefaults:d];
+}
+
+- (id)init
+{
+    self = [super init];
+    NSMutableIndexSet *i = [NSMutableIndexSet indexSetWithIndex:4];
+    [i addIndex:5];
+    VTIsIntIn *vtScanTypeIsNotContent = [[[VTIsIntIn alloc] initWithValues:i reverse:YES] autorelease];
+    [NSValueTransformer setValueTransformer:vtScanTypeIsNotContent forName:@"vtScanTypeIsNotContent"];
+    VTIsIntIn *vtScanTypeIsTag = [[[VTIsIntIn alloc] initWithValues:[NSIndexSet indexSetWithIndex:3] reverse:NO] autorelease];
+    [NSValueTransformer setValueTransformer:vtScanTypeIsTag forName:@"vtScanTypeIsTag"];
+    _directoryPanel = nil;
+    _appName = APPNAME;
+    return self;
+}
+
+- (IBAction)openWebsite:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru_me"]];
+}
+
+- (IBAction)toggleDirectories:(id)sender
+{
+    [[self directoryPanel] toggleVisible:sender];
+}
+
+
+- (DetailsPanelBase *)detailsPanel
+{
+    if (!_detailsPanel)
+        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
+    return _detailsPanel;
+}
+
+- (DirectoryPanel *)directoryPanel
+{
+    if (!_directoryPanel)
+        _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self];
+    return _directoryPanel;
+}
+- (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 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
--- a/cocoa/me/Consts.h
+++ b/cocoa/me/Consts.h
@@ -0,0 +1,13 @@
+/* 
+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 "../base/Consts.h"
+
+#define APPNAME @"dupeGuru ME"
+
+#define jobScanDeadTracks @"jobScanDeadTracks"
--- a/cocoa/me/DetailsPanel.h
+++ b/cocoa/me/DetailsPanel.h
@@ -0,0 +1,14 @@
+/* 
+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>
+#import "../base/DetailsPanel.h"
+
+
+@interface DetailsPanel : DetailsPanelBase
+@end
--- a/cocoa/me/DetailsPanel.m
+++ b/cocoa/me/DetailsPanel.m
@@ -0,0 +1,12 @@
+/* 
+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"
+
+@implementation DetailsPanel
+@end
--- a/cocoa/me/DirectoryPanel.h
+++ b/cocoa/me/DirectoryPanel.h
@@ -0,0 +1,16 @@
+/* 
+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>
+#import "../base/DirectoryPanel.h"
+
+@interface DirectoryPanel : DirectoryPanelBase
+{
+}
+- (IBAction)addiTunes:(id)sender;
+@end
--- a/cocoa/me/DirectoryPanel.m
+++ b/cocoa/me/DirectoryPanel.m
@@ -0,0 +1,31 @@
+/* 
+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"
+
+@implementation DirectoryPanel
+- (IBAction)addiTunes:(id)sender
+{
+    [self addDirectory:[@"~/Music/iTunes/iTunes Music" stringByExpandingTildeInPath]];
+}
+
+- (IBAction)popupAddDirectoryMenu:(id)sender
+{
+    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];
+    mi = [m addItemWithTitle:@"Add iTunes Directory" action:@selector(addiTunes:) keyEquivalent:@""];
+    [mi setTarget:self];
+    [m addItem:[NSMenuItem separatorItem]];
+    [_recentDirectories fillMenu:m];
+    [addButtonPopUp selectItem: nil];
+    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+}
+@end
--- a/cocoa/me/Info.plist
+++ b/cocoa/me/Info.plist
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleHelpBookFolder</key>
+	<string>dupeguru_me_help</string>
+	<key>CFBundleHelpBookName</key>
+	<string>dupeGuru ME Help</string>
+	<key>CFBundleIconFile</key>
+	<string>dupeguru</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.hardcoded_software.dupeguru_me</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>hsft</string>
+	<key>CFBundleVersion</key>
+	<string>5.7.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© Hardcoded Software, 2009</string>
+	<key>SUFeedURL</key>
+	<string>http://www.hardcoded.net/updates/dupeguru_me.appcast</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>dsa_pub.pem</string>
+</dict>
+</plist>
--- a/cocoa/me/PyDupeGuru.h
+++ b/cocoa/me/PyDupeGuru.h
@@ -0,0 +1,23 @@
+/* 
+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>
+#import "../base/PyDupeGuru.h"
+
+@interface PyDupeGuru : PyDupeGuruBase
+//Scanning options
+- (void)setScanType:(NSNumber *)scan_type;
+- (void)setMinWordCount:(NSNumber *)word_count;
+- (void)setMinWordLength:(NSNumber *)word_length;
+- (void)setWordWeighting:(NSNumber *)words_are_weighted;
+- (void)setMatchSimilarWords:(NSNumber *)match_similar_words;
+- (void)enable:(NSNumber *)enable scanForTag:(NSString *)tag;
+- (void)scanDeadTracks;
+- (void)removeDeadTracks;
+- (int)deadTrackCount;
+@end
--- a/cocoa/me/ResultWindow.h
+++ b/cocoa/me/ResultWindow.h
@@ -0,0 +1,38 @@
+/* 
+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>
+#import "../../cocoalib/Outline.h"
+#import "../base/ResultWindow.h"
+#import "DirectoryPanel.h"
+
+@interface ResultWindow : ResultWindowBase
+{
+    IBOutlet NSSearchField *filterField;
+    
+    NSString *_lastAction;
+    NSMutableIndexSet *_deltaColumns;
+}
+- (IBAction)clearIgnoreList:(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)markToggle:(id)sender;
+- (IBAction)openSelected:(id)sender;
+- (IBAction)refresh:(id)sender;
+- (IBAction)removeDeadTracks:(id)sender;
+- (IBAction)removeMarked:(id)sender;
+- (IBAction)removeSelected:(id)sender;
+- (IBAction)renameSelected:(id)sender;
+- (IBAction)revealSelected:(id)sender;
+- (IBAction)startDuplicateScan:(id)sender;
+- (IBAction)toggleDelta:(id)sender;
+@end
--- a/cocoa/me/ResultWindow.m
+++ b/cocoa/me/ResultWindow.m
@@ -0,0 +1,301 @@
+/* 
+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 "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"];
+    _displayDelta = NO;
+    _powerMode = NO;
+    _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)] retain];
+    [_deltaColumns removeIndex:6];
+    [deltaSwitch setSelectedSegment:0];
+    [pmSwitch setSelectedSegment:0];
+    [py setDisplayDeltaValues:b2n(_displayDelta)];
+    [matches setTarget:self];
+    [matches setDoubleAction:@selector(openSelected:)];
+    [self refreshStats];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
+}
+
+/* Actions */
+- (IBAction)clearIgnoreList:(id)sender
+{
+    int 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)filter:(id)sender
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [py setEscapeFilterRegexp:b2n(!n2b([ud objectForKey:@"useRegexpFilter"]))];
+    [py applyFilter:[filterField stringValue]];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)ignoreSelected:(id)sender
+{
+    NSArray *nodeList = [self getSelected:YES];
+    if (![nodeList count])
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",[nodeList count]]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py addSelectedToIgnoreList];
+    [py removeSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)markAll:(id)sender
+{
+    [py markAll];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markInvert:(id)sender
+{
+    [py markInvert];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markNone:(id)sender
+{
+    [py markNone];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py toggleSelectedMark];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markToggle:(id)sender
+{
+    OVNode *node = [matches itemAtRow:[matches clickedRow]];
+    [self performPySelection:[NSArray arrayWithObject:p2a([node indexPath])]];
+    [py toggleSelectedMark];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)openSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py openSelected];
+}
+
+- (IBAction)refresh:(id)sender
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)removeDeadTracks:(id)sender
+{
+    [(PyDupeGuru *)py scanDeadTracks];
+}
+
+- (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];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)removeSelected:(id)sender
+{
+    NSArray *nodeList = [self getSelected:YES];
+    if (![nodeList count])
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",[nodeList count]]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py removeSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)renameSelected:(id)sender
+{
+    int col = [matches columnWithIdentifier:@"0"];
+    int row = [matches selectedRow];
+    [matches editColumn:col row:row withEvent:[NSApp currentEvent] select:YES];
+}
+
+- (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)revealSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py revealSelected];
+}
+
+- (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"]];
+    int r = n2i([py doScan]);
+    [matches reloadData];
+    [self refreshStats];
+    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)toggleDelta:(id)sender
+{
+    if ([deltaSwitch selectedSegment] == 1)
+        [deltaSwitch setSelectedSegment:0];
+    else
+        [deltaSwitch setSelectedSegment:1];
+    [self changeDelta: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 (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]];
+}
+
+/* Delegate */
+- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{ 
+    OVNode *node = item;
+    if ([[tableColumn identifier] isEqual:@"mark"])
+    {
+        [cell setEnabled: [node isMarkable]];
+    }
+    if ([cell isKindOfClass:[NSTextFieldCell class]])
+    {
+        // Determine if the text color will be blue due to directory being reference.
+        NSTextFieldCell *textCell = cell;
+        if ([node isMarkable])
+            [textCell setTextColor:[NSColor blackColor]];
+        else
+            [textCell setTextColor:[NSColor blueColor]];
+        if ((_displayDelta) && (_powerMode || ([node level] > 1)))
+        {
+            int i = [[tableColumn identifier] intValue];
+            if ([_deltaColumns containsIndex:i])
+                [textCell setTextColor:[NSColor orangeColor]];
+        }
+    }
+}
+
+/* Notifications */
+- (void)jobCompleted:(NSNotification *)aNotification
+{
+    [super jobCompleted:aNotification];
+    id lastAction = [[ProgressController mainProgressController] jobId];
+    if ([lastAction isEqualTo:jobScanDeadTracks])
+    {
+        int 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"];
+        }
+    }
+}
+
+- (void)outlineViewSelectionDidChange:(NSNotification *)notification
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py refreshDetailsWithSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:DuplicateSelectionChangedNotification object:self];
+}
+
+- (void)resultsMarkingChanged:(NSNotification *)aNotification
+{
+    [matches invalidateMarkings];
+    [self refreshStats];
+}
+@end
--- a/cocoa/me/dupeguru.icns
+++ b/cocoa/me/dupeguru.icns
--- a/cocoa/me/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/me/dupeguru.xcodeproj/project.pbxproj
@@ -0,0 +1,491 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 44;
+	objects = {
+
+/* Begin PBXAppleScriptBuildPhase section */
+		CE6B288A0AFB7FC900508D93 /* AppleScript */ = {
+			isa = PBXAppleScriptBuildPhase;
+			buildActionMask = 2147483647;
+			contextName = "";
+			files = (
+			);
+			isSharedContext = 0;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXAppleScriptBuildPhase section */
+
+/* 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 */; };
+		CE073F6309CAE1A3005C1D2F /* dupeguru_me_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */; };
+		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 */; };
+		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
+		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
+		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 */; };
+		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 */; };
+		CE6032C00FE6784C007E33FF /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6032BF0FE6784C007E33FF /* DetailsPanel.m */; };
+		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
+		CE6E0E9F1054EB97008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */; };
+		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 */; };
+		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 */; };
+		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		CECC02B709A36E8200CC0A94 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				CE14259F0AFB719300BD5167 /* Sparkle.framework in CopyFiles */,
+				CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */,
+				CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; };
+		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		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_me/dupeguru_me_help; sourceTree = "<group>"; };
+		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; 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; };
+		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 = ../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 = ../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; 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>"; };
+		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; };
+		CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D11072E0486CEB800E47090 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+				CE1425890AFB718500BD5167 /* Sparkle.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		080E96DDFE201D6D7F000001 /* Classes */ = {
+			isa = PBXGroup;
+			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 */,
+			);
+			name = Classes;
+			sourceTree = "<group>";
+		};
+		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				CE1425880AFB718500BD5167 /* Sparkle.framework */,
+				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+			);
+			name = "Linked Frameworks";
+			sourceTree = "<group>";
+		};
+		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+				13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
+				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D1107320486CEB800E47090 /* dupeGuru ME.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* dupeguru */ = {
+			isa = PBXGroup;
+			children = (
+				080E96DDFE201D6D7F000001 /* Classes */,
+				CE515E140FC6C17900EC695D /* dgbase */,
+				CE515DDD0FC6C09400EC695D /* cocoalib */,
+				29B97315FDCFA39411CA2CEA /* Other Sources */,
+				29B97317FDCFA39411CA2CEA /* Resources */,
+				29B97323FDCFA39411CA2CEA /* Frameworks */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = dupeguru;
+			sourceTree = "<group>";
+		};
+		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
+			isa = PBXGroup;
+			children = (
+				29B97316FDCFA39411CA2CEA /* main.m */,
+			);
+			name = "Other Sources";
+			sourceTree = "<group>";
+		};
+		29B97317FDCFA39411CA2CEA /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				CE3FBDD01094637800B72D77 /* xib */,
+				CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */,
+				CE381CF509915304003581CE /* dg_cocoa.plugin */,
+				CEFC294309C89E0000D9F998 /* images */,
+				CEEB135109C837A2004D2330 /* dupeguru.icns */,
+				8D1107310486CEB800E47090 /* Info.plist */,
+				CE6E0E9E1054EB97008D9390 /* dsa_pub.pem */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
+				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		CE3FBDD01094637800B72D77 /* xib */ = {
+			isa = PBXGroup;
+			children = (
+				CE900AD6109B2A9B00754048 /* MainMenu.xib */,
+				CE3FBDD11094637800B72D77 /* DetailsPanel.xib */,
+				CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */,
+				CE900AD1109B238600754048 /* Preferences.xib */,
+			);
+			path = xib;
+			sourceTree = "<group>";
+		};
+		CE49DEF10FDFEB810098617B /* brsinglelineformatter */ = {
+			isa = PBXGroup;
+			children = (
+				CE49DEF20FDFEB810098617B /* BRSingleLineFormatter.h */,
+				CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */,
+			);
+			name = brsinglelineformatter;
+			path = ../../cocoalib/brsinglelineformatter;
+			sourceTree = SOURCE_ROOT;
+		};
+		CE515DDD0FC6C09400EC695D /* cocoalib */ = {
+			isa = PBXGroup;
+			children = (
+				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 */,
+				CE515DE60FC6C12E00EC695D /* ProgressController.h */,
+				CE515DE70FC6C12E00EC695D /* ProgressController.m */,
+				CE515DE80FC6C12E00EC695D /* PyApp.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 */,
+				CE515DF20FC6C12E00EC695D /* ValueTransformers.m */,
+			);
+			name = cocoalib;
+			sourceTree = "<group>";
+		};
+		CE515E140FC6C17900EC695D /* dgbase */ = {
+			isa = PBXGroup;
+			children = (
+				CE515E150FC6C19300EC695D /* AppDelegate.h */,
+				CE515E160FC6C19300EC695D /* AppDelegate.m */,
+				CE515E170FC6C19300EC695D /* Consts.h */,
+				CE6032BE0FE6784C007E33FF /* DetailsPanel.h */,
+				CE6032BF0FE6784C007E33FF /* DetailsPanel.m */,
+				CE515E180FC6C19300EC695D /* DirectoryPanel.h */,
+				CE515E190FC6C19300EC695D /* DirectoryPanel.m */,
+				CE515E1A0FC6C19300EC695D /* PyDupeGuru.h */,
+				CE515E1B0FC6C19300EC695D /* ResultWindow.h */,
+				CE515E1C0FC6C19300EC695D /* ResultWindow.m */,
+			);
+			name = dgbase;
+			sourceTree = "<group>";
+		};
+		CEFC294309C89E0000D9F998 /* images */ = {
+			isa = PBXGroup;
+			children = (
+				CEFC295309C89FF200D9F998 /* details32.png */,
+				CEFC295409C89FF200D9F998 /* preferences32.png */,
+				CEFC294509C89E3D00D9F998 /* folder32.png */,
+			);
+			name = images;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		8D1107260486CEB800E47090 /* dupeguru */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */;
+			buildPhases = (
+				8D1107290486CEB800E47090 /* Resources */,
+				8D11072C0486CEB800E47090 /* Sources */,
+				8D11072E0486CEB800E47090 /* Frameworks */,
+				CECC02B709A36E8200CC0A94 /* CopyFiles */,
+				CE6B288A0AFB7FC900508D93 /* AppleScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = dupeguru;
+			productInstallPath = "$(HOME)/Applications";
+			productName = dupeguru;
+			productReference = 8D1107320486CEB800E47090 /* dupeGuru ME.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
+			compatibilityVersion = "Xcode 3.0";
+			hasScannedForEncodings = 1;
+			mainGroup = 29B97314FDCFA39411CA2CEA /* dupeguru */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8D1107260486CEB800E47090 /* dupeguru */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D1107290486CEB800E47090 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
+				CE073F6309CAE1A3005C1D2F /* dupeguru_me_help in Resources */,
+				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
+				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 */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D11072C0486CEB800E47090 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				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 */,
+				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 */,
+				CE6032C00FE6784C007E33FF /* DetailsPanel.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 */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				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;
+		};
+		C01FCF5008A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+				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;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4C08A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF5008A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}
--- a/cocoa/me/gen.py
+++ b/cocoa/me/gen.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+# 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.path as op
+import os
+import shutil
+from optparse import OptionParser
+
+def main(dev):
+    if not dev:
+        print "Building help index"
+        help_path = op.abspath('../../help_me/dupeguru_me_help')
+        os.system('open /Developer/Applications/Utilities/Help\\ Indexer.app --args {0}'.format(help_path))
+    
+    print "Building dg_cocoa.plugin"
+    if op.exists('py/build'):
+        shutil.rmtree('py/build')
+    if op.exists('py/dist'):
+        shutil.rmtree('py/dist')
+    
+    os.chdir('py')
+    if dev:
+        os.system('python -u setup.py py2app -A')
+    else:
+        os.system('python -u setup.py py2app')
+    os.chdir('..')
+    
+    print "Building the XCode project"
+    os.system('xcodebuild')
+
+if __name__ == '__main__':
+    usage = "usage: %prog [options]"
+    parser = OptionParser(usage=usage)
+    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.dev)
--- a/cocoa/me/main.m
+++ b/cocoa/me/main.m
@@ -0,0 +1,21 @@
+/* 
+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>
+
+int main(int argc, char *argv[])
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSString *pluginPath = [[NSBundle mainBundle]
+                                pathForResource:@"dg_cocoa"
+                                         ofType:@"plugin"];
+    NSBundle *pluginBundle = [NSBundle bundleWithPath:pluginPath];
+    [pluginBundle load];
+    [pool release];
+    return NSApplicationMain(argc,  (const char **) argv);
+}
--- a/cocoa/me/py/dg_cocoa.py
+++ b/cocoa/me/py/dg_cocoa.py
@@ -0,0 +1,239 @@
+# $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 AppKit import *
+
+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 core import app, app_cocoa, data, directories, engine, export, ignore, results, scanner, fs
+from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
+from hsutil import conflict
+
+class PyApp(NSObject):
+    pass #fake class
+
+class PyDupeGuru(PyApp):
+    def init(self):
+        self = super(PyDupeGuru,self).init()
+        self.app = DupeGuruME()
+        return self
+    
+    #---Directories
+    def addDirectory_(self,directory):
+        return self.app.add_directory(directory)
+    
+    def removeDirectory_(self,index):
+        self.app.RemoveDirectory(index)
+    
+    def setDirectory_state_(self,node_path,state):
+        self.app.SetDirectoryState(node_path,state)
+    
+    #---Results
+    def clearIgnoreList(self):
+        self.app.scanner.ignore_list.Clear()
+    
+    def doScan(self):
+        return self.app.start_scanning()
+    
+    def exportToXHTMLwithColumns_(self, column_ids):
+        return self.app.export_to_xhtml(column_ids)
+    
+    def loadIgnoreList(self):
+        self.app.load_ignore_list()
+    
+    def loadResults(self):
+        self.app.load()
+    
+    def markAll(self):
+        self.app.results.mark_all()
+    
+    def markNone(self):
+        self.app.results.mark_none()
+    
+    def markInvert(self):
+        self.app.results.mark_invert()
+    
+    def purgeIgnoreList(self):
+        self.app.PurgeIgnoreList()
+    
+    def toggleSelectedMark(self):
+        self.app.ToggleSelectedMarkState()
+    
+    def saveIgnoreList(self):
+        self.app.save_ignore_list()
+    
+    def saveResults(self):
+        self.app.save()
+    
+    def refreshDetailsWithSelected(self):
+        self.app.RefreshDetailsWithSelected()
+    
+    def selectedResultNodePaths(self):
+        return self.app.selected_result_node_paths()
+    
+    def selectResultNodePaths_(self,node_paths):
+        self.app.SelectResultNodePaths(node_paths)
+    
+    def selectedPowerMarkerNodePaths(self):
+        return self.app.selected_powermarker_node_paths()
+    
+    def selectPowerMarkerNodePaths_(self,node_paths):
+        self.app.SelectPowerMarkerNodePaths(node_paths)
+    
+    #---Actions
+    def addSelectedToIgnoreList(self):
+        self.app.AddSelectedToIgnoreList()
+    
+    def applyFilter_(self, filter):
+        self.app.apply_filter(filter)
+    
+    def deleteMarked(self):
+        self.app.delete_marked()
+    
+    def makeSelectedReference(self):
+        self.app.MakeSelectedReference()
+    
+    def copyOrMove_markedTo_recreatePath_(self,copy,destination,recreate_path):
+        self.app.copy_or_move_marked(copy, destination, recreate_path)
+    
+    def openSelected(self):
+        self.app.OpenSelected()
+    
+    def removeDeadTracks(self):
+        self.app.remove_dead_tracks()
+    
+    def removeMarked(self):
+        self.app.results.perform_on_marked(lambda x:True, True)
+    
+    def removeSelected(self):
+        self.app.RemoveSelected()
+    
+    def renameSelected_(self,newname):
+        return self.app.RenameSelected(newname)
+    
+    def revealSelected(self):
+        self.app.RevealSelected()
+    
+    def scanDeadTracks(self):
+        self.app.scan_dead_tracks()
+    
+    #---Misc
+    def sortDupesBy_ascending_(self,key,asc):
+        self.app.sort_dupes(key,asc)
+    
+    def sortGroupsBy_ascending_(self,key,asc):
+        self.app.sort_groups(key,asc)
+    
+    #---Information
+    @objc.signature('i@:')
+    def deadTrackCount(self):
+        return len(self.app.dead_tracks)
+    
+    def getIgnoreListCount(self):
+        return len(self.app.scanner.ignore_list)
+    
+    def getMarkCount(self):
+        return self.app.results.mark_count
+    
+    def getStatLine(self):
+        return self.app.stat_line
+    
+    def getOperationalErrorCount(self):
+        return self.app.last_op_error_count
+    
+    #---Data
+    @objc.signature('i@:i')
+    def getOutlineViewMaxLevel_(self, tag):
+        return self.app.GetOutlineViewMaxLevel(tag)
+    
+    @objc.signature('@@:i@')
+    def getOutlineView_childCountsForPath_(self, tag, node_path):
+        return self.app.GetOutlineViewChildCounts(tag, node_path)
+    
+    def getOutlineView_valuesForIndexes_(self,tag,node_path):
+        return self.app.GetOutlineViewValues(tag,node_path)
+    
+    def getOutlineView_markedAtIndexes_(self,tag,node_path):
+        return self.app.GetOutlineViewMarked(tag,node_path)
+    
+    def getTableViewCount_(self,tag):
+        return self.app.GetTableViewCount(tag)
+    
+    def getTableViewMarkedIndexes_(self,tag):
+        return self.app.GetTableViewMarkedIndexes(tag)
+    
+    def getTableView_valuesForRow_(self,tag,row):
+        return self.app.GetTableViewValues(tag,row)
+    
+    #---Properties
+    def setMinMatchPercentage_(self, percentage):
+        self.app.scanner.min_match_percentage = int(percentage)
+    
+    def setScanType_(self, scan_type):
+        try:
+            self.app.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.app.scanner.word_weighting = words_are_weighted
+    
+    def setMixFileKind_(self, mix_file_kind):
+        self.app.scanner.mix_file_kind = mix_file_kind
+    
+    def setDisplayDeltaValues_(self, display_delta_values):
+        self.app.display_delta_values = display_delta_values
+    
+    def setMatchSimilarWords_(self, match_similar_words):
+        self.app.scanner.match_similar_words = match_similar_words
+    
+    def setEscapeFilterRegexp_(self, escape_filter_regexp):
+        self.app.options['escape_filter_regexp'] = escape_filter_regexp
+    
+    def setRemoveEmptyFolders_(self, remove_empty_folders):
+        self.app.options['clean_empty_dirs'] = remove_empty_folders
+    
+    def enable_scanForTag_(self, enable, scan_tag):
+        if enable:
+            self.app.scanner.scanned_tags.add(scan_tag)
+        else:
+            self.app.scanner.scanned_tags.discard(scan_tag)
+    
+    #---Worker
+    def getJobProgress(self):
+        return self.app.progress.last_progress
+    
+    def getJobDesc(self):
+        return self.app.progress.last_desc
+    
+    def cancelJob(self):
+        self.app.progress.job_cancelled = True
+    
+    #---Registration
+    @objc.signature('i@:')
+    def isRegistered(self):
+        return self.app.registered
+    
+    @objc.signature('i@:@@')
+    def isCodeValid_withEmail_(self, code, email):
+        return self.app.is_code_valid(code, email)
+    
+    def setRegisteredCode_andEmail_(self, code, email):
+        self.app.set_registration(code, email)
+    
--- a/cocoa/me/py/setup.py
+++ b/cocoa/me/py/setup.py
@@ -0,0 +1,16 @@
+# 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.path as op
+import sys
+sys.path.insert(0, op.abspath('../../..')) # for all cross-toolkit modules
+
+from distutils.core import setup
+import py2app
+
+setup(
+    plugin = ['dg_cocoa.py'],
+)
--- a/cocoa/me/xib/Preferences.xib
+++ b/cocoa/me/xib/Preferences.xib
--- a/cocoa/pe/AppDelegate.h
+++ b/cocoa/pe/AppDelegate.h
@@ -0,0 +1,23 @@
+/* 
+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>
+#import "../base/AppDelegate.h"
+#import "DirectoryPanel.h"
+#import "PyDupeGuru.h"
+
+@interface AppDelegate : AppDelegateBase
+{
+    DirectoryPanel *_directoryPanel;
+}
+- (IBAction)openWebsite:(id)sender;
+- (IBAction)toggleDirectories:(id)sender;
+
+- (DirectoryPanel *)directoryPanel;
+- (PyDupeGuru *)py;
+@end
--- a/cocoa/pe/AppDelegate.m
+++ b/cocoa/pe/AppDelegate.m
@@ -0,0 +1,111 @@
+/* 
+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 "ValueTransformers.h"
+#import "Consts.h"
+#import "DetailsPanel.h"
+
+@implementation AppDelegate
+ (void)initialize
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    NSMutableDictionary *d = [NSMutableDictionary dictionaryWithCapacity:10];
+    [d setObject:[NSNumber numberWithInt:95] forKey:@"minMatchPercentage"];
+    [d setObject:[NSNumber numberWithInt:1] forKey:@"recreatePathType"];
+    [d setObject:[NSNumber numberWithBool:NO] forKey:@"matchScaled"];
+    [d setObject:[NSNumber numberWithBool:YES] forKey:@"mixFileKind"];
+    [d setObject:[NSNumber numberWithBool:NO] forKey:@"useRegexpFilter"];
+    [d setObject:[NSNumber numberWithBool:NO] forKey:@"removeEmptyFolders"];
+    [d setObject:[NSNumber numberWithBool:NO] forKey:@"debug"];
+    [d setObject:[NSArray array] forKey:@"recentDirectories"];
+    [d setObject:[NSArray array] forKey:@"columnsOrder"];
+    [d setObject:[NSDictionary dictionary] forKey:@"columnsWidth"];
+    [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:d];
+    [ud registerDefaults:d];
+}
+
+- (id)init
+{
+    self = [super init];
+    _directoryPanel = nil;
+    _appName = APPNAME;
+    return self;
+}
+
+- (DetailsPanelBase *)detailsPanel
+{
+    if (!_detailsPanel)
+        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
+    return _detailsPanel;
+}
+
+- (IBAction)openWebsite:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru_pe"]];
+}
+
+- (IBAction)toggleDirectories:(id)sender
+{
+    [[self directoryPanel] toggleVisible:sender];
+}
+
+- (DirectoryPanel *)directoryPanel
+{
+    if (!_directoryPanel)
+        _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self];
+    return _directoryPanel;
+}
+- (PyDupeGuru *)py { return (PyDupeGuru *)py; }
+
+//Delegate
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+    NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu];
+    // index 2 is just after "Clear Ingore List"
+    NSMenuItem *mi = [actionsMenu insertItemWithTitle:@"Clear Picture Cache" action:@selector(clearPictureCache:) keyEquivalent:@"P" atIndex:2];
+    [mi setTarget:result];
+    [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
--- a/cocoa/pe/Consts.h
+++ b/cocoa/pe/Consts.h
@@ -0,0 +1,12 @@
+/* 
+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 "../base/Consts.h"
+
+#define APPNAME @"dupeGuru PE"
+#define ImageLoadedNotification @"ImageLoadedNotification"
--- a/cocoa/pe/DetailsPanel.h
+++ b/cocoa/pe/DetailsPanel.h
@@ -0,0 +1,24 @@
+/* 
+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>
+#import "../base/DetailsPanel.h"
+
+@interface DetailsPanel : DetailsPanelBase
+{
+    IBOutlet NSImageView *dupeImage;
+    IBOutlet NSProgressIndicator *dupeProgressIndicator;
+    IBOutlet NSImageView *refImage;
+    IBOutlet NSProgressIndicator *refProgressIndicator;
+    
+    PyApp *py;
+    BOOL _needsRefresh;
+    NSString *_dupePath;
+    NSString *_refPath;
+}
+@end
--- a/cocoa/pe/DetailsPanel.m
+++ b/cocoa/pe/DetailsPanel.m
@@ -0,0 +1,83 @@
+/* 
+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 "Utils.h"
+#import "NSNotificationAdditions.h"
+#import "NSImageAdditions.h"
+#import "PyDupeGuru.h"
+#import "DetailsPanel.h"
+#import "Consts.h"
+
+@implementation DetailsPanel
+- (id)initWithPy:(PyApp *)aPy
+{
+    self = [super initWithPy:aPy];
+    py = aPy;
+    _needsRefresh = YES;
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(imageLoaded:) name:ImageLoadedNotification object:self];
+    return self;
+}
+
+- (void)loadImageAsync:(NSString *)imagePath
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSImage *image = [[NSImage alloc] initByReferencingFile:imagePath];
+    NSImage *thumbnail = [image imageByScalingProportionallyToSize:NSMakeSize(512,512)];
+    [image release];
+    NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    [params setValue:imagePath forKey:@"imagePath"];
+    [params setValue:thumbnail forKey:@"image"];
+    [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:ImageLoadedNotification object:self userInfo:params waitUntilDone:YES];
+    [pool release];
+}
+
+- (void)refresh
+{
+    if (!_needsRefresh)
+        return;
+    [detailsTable reloadData];
+    
+    NSString *refPath = [(PyDupeGuru *)py getSelectedDupeRefPath];
+    if (_refPath != nil)
+        [_refPath autorelease];
+    _refPath = [refPath retain];
+    [NSThread detachNewThreadSelector:@selector(loadImageAsync:) toTarget:self withObject:refPath];
+    NSString *dupePath = [(PyDupeGuru *)py getSelectedDupePath];
+    if (_dupePath != nil)
+        [_dupePath autorelease];
+    _dupePath = [dupePath retain];
+    if (![dupePath isEqual: refPath])
+        [NSThread detachNewThreadSelector:@selector(loadImageAsync:) toTarget:self withObject:dupePath];
+    [refProgressIndicator startAnimation:nil];
+    [dupeProgressIndicator startAnimation:nil];
+    _needsRefresh = NO;
+}
+
+/* Notifications */
+- (void)duplicateSelectionChanged:(NSNotification *)aNotification
+{
+    _needsRefresh = YES;
+	[super duplicateSelectionChanged:aNotification];
+}
+
+- (void)imageLoaded:(NSNotification *)aNotification
+{
+    NSString *imagePath = [[aNotification userInfo] valueForKey:@"imagePath"];
+    NSImage *image = [[aNotification userInfo] valueForKey:@"image"];
+    if ([imagePath isEqual: _refPath])
+    {
+        [refImage setImage:image];
+        [refProgressIndicator stopAnimation:nil];
+    }
+    if ([imagePath isEqual: _dupePath])
+    {
+        [dupeImage setImage:image];
+        [dupeProgressIndicator stopAnimation:nil];
+    }
+}
+@end
--- a/cocoa/pe/DirectoryPanel.h
+++ b/cocoa/pe/DirectoryPanel.h
@@ -0,0 +1,16 @@
+/* 
+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>
+#import "../base/DirectoryPanel.h"
+
+@interface DirectoryPanel : DirectoryPanelBase
+{
+}
+- (IBAction)addiPhoto:(id)sender;
+@end
--- a/cocoa/pe/DirectoryPanel.m
+++ b/cocoa/pe/DirectoryPanel.m
@@ -0,0 +1,52 @@
+/* 
+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 "ProgressController.h"
+
+static NSString* jobAddIPhoto = @"jobAddIPhoto";
+
+@implementation DirectoryPanel
+- (id)initWithParentApp:(id)aParentApp
+{
+    self = [super initWithParentApp:aParentApp];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
+    return self;
+}
+
+- (IBAction)addiPhoto:(id)sender
+{
+    [[ProgressController mainProgressController] setJobDesc:@"Adding iPhoto Library..."];
+    [[ProgressController mainProgressController] setJobId:jobAddIPhoto];
+    [[ProgressController mainProgressController] showSheetForParent:[self window]];
+    [self addDirectory:@"iPhoto Library"];
+}
+
+- (IBAction)popupAddDirectoryMenu:(id)sender
+{
+    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];
+    mi = [m addItemWithTitle:@"Add iPhoto Directory" action:@selector(addiPhoto:) keyEquivalent:@""];
+    [mi setTarget:self];
+    [m addItem:[NSMenuItem separatorItem]];
+    [_recentDirectories fillMenu:m];
+    [addButtonPopUp selectItem:nil];
+    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+}
+
+- (void)jobCompleted:(NSNotification *)aNotification
+{
+    if ([[ProgressController mainProgressController] jobId] == jobAddIPhoto)
+    {
+        [directories reloadData];
+    }
+}
+@end
--- a/cocoa/pe/Info.plist
+++ b/cocoa/pe/Info.plist
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleHelpBookFolder</key>
+	<string>dupeguru_pe_help</string>
+	<key>CFBundleHelpBookName</key>
+	<string>dupeGuru PE Help</string>
+	<key>CFBundleIconFile</key>
+	<string>dupeguru</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.hardcoded_software.dupeguru_pe</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>hsft</string>
+	<key>CFBundleVersion</key>
+	<string>1.8.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© Hardcoded Software, 2009</string>
+	<key>SUFeedURL</key>
+	<string>http://www.hardcoded.net/updates/dupeguru_pe.appcast</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>dsa_pub.pem</string>
+</dict>
+</plist>
--- a/cocoa/pe/PictureBlocks.h
+++ b/cocoa/pe/PictureBlocks.h
@@ -0,0 +1,19 @@
+/* 
+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>
+
+
+@interface PictureBlocks : NSObject {
+}
+ (NSString *)getBlocksFromImagePath:(NSString *)imagePath blockCount:(NSNumber *)blockCount;
+ (NSSize)getImageSize:(NSString *)imagePath;
+@end
+
+
+NSString* GetBlocks(NSString *filePath, int blockCount);
--- a/cocoa/pe/PictureBlocks.m
+++ b/cocoa/pe/PictureBlocks.m
@@ -0,0 +1,146 @@
+/* 
+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 "PictureBlocks.h"
+#import "Utils.h"
+
+@implementation PictureBlocks
+ (NSString *)getBlocksFromImagePath:(NSString *)imagePath blockCount:(NSNumber *)blockCount
+{
+    return GetBlocks(imagePath, n2i(blockCount));
+}
+
+ (NSSize)getImageSize:(NSString *)imagePath
+{
+    CFURLRef fileURL = CFURLCreateWithFileSystemPath(NULL, (CFStringRef)imagePath, kCFURLPOSIXPathStyle, FALSE);
+    CGImageSourceRef source = CGImageSourceCreateWithURL(fileURL, NULL);
+    if (source == NULL)
+        return NSMakeSize(0, 0);
+    CGImageRef image = CGImageSourceCreateImageAtIndex(source, 0, NULL);
+    if (image == NULL)
+        return NSMakeSize(0, 0);
+    size_t width = CGImageGetWidth(image);
+    size_t height = CGImageGetHeight(image);
+    CGImageRelease(image);
+    CFRelease(source);
+    CFRelease(fileURL);
+    return NSMakeSize(width, height);
+}
+@end
+
+ CGContextRef MyCreateBitmapContext (int width, int height) 
+ {
+     CGContextRef    context = NULL;
+     CGColorSpaceRef colorSpace;
+     void *          bitmapData;
+     int             bitmapByteCount;
+     int             bitmapBytesPerRow;
+     
+     bitmapBytesPerRow   = (width * 4);
+     bitmapByteCount     = (bitmapBytesPerRow * height);
+     
+     colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+     
+     // calloc() must be used to allocate bitmapData here because the buffer has to be zeroed.
+     // If it's not zeroes, when images with transparency are drawn in the context, this buffer
+     // will stay with undefined pixels, which means that two pictures with the same pixels will
+     // most likely have different blocks (which is not supposed to happen).
+     bitmapData = calloc(bitmapByteCount, 1);
+     if (bitmapData == NULL) 
+     {
+         fprintf (stderr, "Memory not allocated!");
+         return NULL;
+     }
+     
+     context = CGBitmapContextCreate (bitmapData,width,height,8,bitmapBytesPerRow,colorSpace,kCGImageAlphaNoneSkipLast);
+     if (context== NULL)
+     {
+         free (bitmapData);
+         fprintf (stderr, "Context not created!");
+         return NULL;
+     }
+     CGColorSpaceRelease( colorSpace );
+     return context;
+ }
+ 
+ // returns 0x00RRGGBB
+ int GetBlock(unsigned char *imageData, int imageWidth, int imageHeight, int boxX, int boxY, int boxW, int boxH)
+ {
+     int i,j;
+     int totalR = 0;
+     int totalG = 0;
+     int totalB = 0;
+     for(i = boxY; i < boxY + boxH; i++)
+     {
+         for(j = boxX; j < boxX + boxW; j++)
+         {
+             int offset = (i * imageWidth * 4) + (j * 4);
+             totalR += *(imageData + offset);
+             totalG += *(imageData + offset + 1);
+             totalB += *(imageData + offset + 2);
+         }
+     }
+     int pixelCount = boxH * boxW;
+     int result = 0;
+     result += (totalR / pixelCount) << 16;
+     result += (totalG / pixelCount) << 8;
+     result += (totalB / pixelCount);
+     return result;
+ }
+ 
+ NSString* GetBlocks (NSString* filePath, int blockCount) 
+ {
+     CFURLRef fileURL = CFURLCreateWithFileSystemPath(NULL, (CFStringRef)filePath, kCFURLPOSIXPathStyle, FALSE);
+     CGImageSourceRef source = CGImageSourceCreateWithURL(fileURL, NULL);
+     if (source == NULL)
+         return NULL;
+     CGImageRef image = CGImageSourceCreateImageAtIndex(source, 0, NULL);
+     if (image == NULL)
+         return NULL;
+     size_t width = CGImageGetWidth(image);
+     size_t height = CGImageGetHeight(image);
+     CGContextRef myContext = MyCreateBitmapContext(width, height);
+     CGRect myBoundingBox = CGRectMake (0, 0, width, height);
+     CGContextDrawImage(myContext, myBoundingBox, image);
+     unsigned char *bitmapData = CGBitmapContextGetData(myContext);
+     if (bitmapData == NULL)
+         return NULL;
+     
+     int blockHeight = height / blockCount;
+     if (blockHeight < 1)
+         blockHeight = 1;
+     int blockWidth = width / blockCount;
+     if (blockWidth < 1)
+         blockWidth = 1;
+     //blockCount might have changed
+     int blockXCount = (width / blockWidth);
+     int blockYCount = (height / blockHeight);
+     
+     CFMutableArrayRef blocks = CFArrayCreateMutable(NULL, blockXCount * blockYCount, &kCFTypeArrayCallBacks);
+     int i,j;
+     for(i = 0; i < blockYCount; i++)
+     {
+         for(j = 0; j < blockXCount; j++)
+         {
+             int block = GetBlock(bitmapData, width, height, j * blockWidth, i * blockHeight, blockWidth, blockHeight);
+             CFStringRef strBlock = CFStringCreateWithFormat(NULL, NULL, CFSTR("%06x"), block);
+             CFArrayAppendValue(blocks, strBlock);
+             CFRelease(strBlock);
+         }
+     }
+     
+     CGContextRelease (myContext);
+     if (bitmapData) free(bitmapData); 
+     CGImageRelease(image);
+     CFRelease(source);
+     CFRelease(fileURL);
+     
+     CFStringRef result = CFStringCreateByCombiningStrings(NULL, blocks, CFSTR(""));
+     CFRelease(blocks);
+     return (NSString *)result;
+ }
--- a/cocoa/pe/PyDupeGuru.h
+++ b/cocoa/pe/PyDupeGuru.h
@@ -0,0 +1,17 @@
+/* 
+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>
+#import "../base/PyDupeGuru.h"
+
+@interface PyDupeGuru : PyDupeGuruBase
+- (void)clearPictureCache;
+- (NSString *)getSelectedDupePath;
+- (NSString *)getSelectedDupeRefPath;
+- (void)setMatchScaled:(NSNumber *)match_scaled;
+@end
--- a/cocoa/pe/ResultWindow.h
+++ b/cocoa/pe/ResultWindow.h
@@ -0,0 +1,37 @@
+/* 
+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>
+#import "Outline.h"
+#import "../base/ResultWindow.h"
+
+@interface ResultWindow : ResultWindowBase
+{
+    IBOutlet NSSearchField *filterField;
+    
+    NSMutableIndexSet *_deltaColumns;
+}
+- (IBAction)clearIgnoreList:(id)sender;
+- (IBAction)clearPictureCache:(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)markToggle:(id)sender;
+- (IBAction)openSelected:(id)sender;
+- (IBAction)refresh:(id)sender;
+- (IBAction)removeMarked:(id)sender;
+- (IBAction)removeSelected:(id)sender;
+- (IBAction)renameSelected:(id)sender;
+- (IBAction)revealSelected:(id)sender;
+- (IBAction)startDuplicateScan:(id)sender;
+- (IBAction)toggleDelta:(id)sender;
+- (IBAction)toggleDirectories:(id)sender;
+@end
--- a/cocoa/pe/ResultWindow.m
+++ b/cocoa/pe/ResultWindow.m
@@ -0,0 +1,269 @@
+/* 
+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 "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"];
+    _displayDelta = NO;
+    _powerMode = NO;
+    _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,5)] retain];
+    [_deltaColumns removeIndex:3];
+    [_deltaColumns removeIndex:4];
+    [deltaSwitch setSelectedSegment:0];
+    [pmSwitch setSelectedSegment:0];
+    [py setDisplayDeltaValues:b2n(_displayDelta)];
+    [matches setTarget:self];
+    [matches setDoubleAction:@selector(openSelected:)];
+    [self refreshStats];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
+}
+
+/* Actions */
+- (IBAction)clearIgnoreList:(id)sender
+{
+    int 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)clearPictureCache:(id)sender
+{
+    if ([Dialogs askYesNo:@"Do you really want to remove all your cached picture analysis?"] == NSAlertSecondButtonReturn) // NO
+        return;
+    [(PyDupeGuru *)py clearPictureCache];
+}
+
+- (IBAction)filter:(id)sender
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [py setEscapeFilterRegexp:b2n(!n2b([ud objectForKey:@"useRegexpFilter"]))];
+    [py applyFilter:[filterField stringValue]];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)ignoreSelected:(id)sender
+{
+    NSArray *nodeList = [self getSelected:YES];
+    if (![nodeList count])
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",[nodeList count]]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py addSelectedToIgnoreList];
+    [py removeSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)markAll:(id)sender
+{
+    [py markAll];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markInvert:(id)sender
+{
+    [py markInvert];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markNone:(id)sender
+{
+    [py markNone];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py toggleSelectedMark];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markToggle:(id)sender
+{
+    OVNode *node = [matches itemAtRow:[matches clickedRow]];
+    [self performPySelection:[NSArray arrayWithObject:p2a([node indexPath])]];
+    [py toggleSelectedMark];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)openSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py openSelected];
+}
+
+- (IBAction)refresh:(id)sender
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (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];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)removeSelected:(id)sender
+{
+    NSArray *nodeList = [self getSelected:YES];
+    if (![nodeList count])
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",[nodeList count]]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py removeSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)renameSelected:(id)sender
+{
+    int col = [matches columnWithIdentifier:@"0"];
+    int row = [matches selectedRow];
+    [matches editColumn:col row:row withEvent:[NSApp currentEvent] select:YES];
+}
+
+- (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)revealSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py revealSelected];
+}
+
+- (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)toggleDelta:(id)sender
+{
+    if ([deltaSwitch selectedSegment] == 1)
+        [deltaSwitch setSelectedSegment:0];
+    else
+        [deltaSwitch setSelectedSegment:1];
+    [self changeDelta:sender];
+}
+
+- (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]];
+}
+
+/* Delegate */
+- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{ 
+    OVNode *node = item;
+    if ([[tableColumn identifier] isEqual:@"mark"])
+    {
+        [cell setEnabled: [node isMarkable]];
+    }
+    if ([cell isKindOfClass:[NSTextFieldCell class]])
+    {
+        // Determine if the text color will be blue due to directory being reference.
+        NSTextFieldCell *textCell = cell;
+        if ([node isMarkable])
+            [textCell setTextColor:[NSColor blackColor]];
+        else
+            [textCell setTextColor:[NSColor blueColor]];
+        if ((_displayDelta) && (_powerMode || ([node level] > 1)))
+        {
+            int i = [[tableColumn identifier] intValue];
+            if ([_deltaColumns containsIndex:i])
+                [textCell setTextColor:[NSColor orangeColor]];
+        }
+    }
+}
+
+- (void)outlineViewSelectionDidChange:(NSNotification *)notification
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py refreshDetailsWithSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:DuplicateSelectionChangedNotification object:self];
+}
+
+- (void)resultsMarkingChanged:(NSNotification *)aNotification
+{
+    [matches invalidateMarkings];
+    [self refreshStats];
+}
+
+@end
--- a/cocoa/pe/dupeguru.icns
+++ b/cocoa/pe/dupeguru.icns
--- a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
@@ -0,0 +1,508 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 44;
+	objects = {
+
+/* 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 */; };
+		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 */; };
+		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
+		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
+		CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6044EB0FE6796200B71262 /* DetailsPanel.m */; };
+		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
+		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 */; };
+		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 */; };
+		CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.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 */; };
+		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
+		CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
+		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
+		CEFCDE2D0AB0418600C33A93 /* dgpe_logo_32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		CECC02B709A36E8200CC0A94 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				CE15C8C00ADEB8D40061D4A5 /* Sparkle.framework in CopyFiles */,
+				CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */,
+				CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; };
+		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		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; 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; };
+		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>"; };
+		CE15C8A70ADEB8B50061D4A5 /* 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; };
+		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 = ../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>"; };
+		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 = ../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; };
+		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; };
+		CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D11072E0486CEB800E47090 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+				CE15C8A80ADEB8B50061D4A5 /* Sparkle.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		080E96DDFE201D6D7F000001 /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				CE0C46A80FA0647E000BE99B /* PictureBlocks.h */,
+				CE0C46A90FA0647E000BE99B /* PictureBlocks.m */,
+				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 */,
+			);
+			name = Classes;
+			sourceTree = "<group>";
+		};
+		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */,
+				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+			);
+			name = "Linked Frameworks";
+			sourceTree = "<group>";
+		};
+		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+				13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
+				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D1107320486CEB800E47090 /* dupeGuru PE.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* dupeguru */ = {
+			isa = PBXGroup;
+			children = (
+				080E96DDFE201D6D7F000001 /* Classes */,
+				CE80DB1A0FC192AB0086DCA6 /* cocoalib */,
+				CE80DB810FC194BD0086DCA6 /* dgbase */,
+				29B97315FDCFA39411CA2CEA /* Other Sources */,
+				29B97317FDCFA39411CA2CEA /* Resources */,
+				29B97323FDCFA39411CA2CEA /* Frameworks */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = dupeguru;
+			sourceTree = "<group>";
+		};
+		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
+			isa = PBXGroup;
+			children = (
+				29B97316FDCFA39411CA2CEA /* main.m */,
+			);
+			name = "Other Sources";
+			sourceTree = "<group>";
+		};
+		29B97317FDCFA39411CA2CEA /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				CE77C89A10946C6D0078B0DB /* xib */,
+				CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */,
+				CE381CF509915304003581CE /* dg_cocoa.plugin */,
+				CEFC294309C89E0000D9F998 /* images */,
+				CEEB135109C837A2004D2330 /* dupeguru.icns */,
+				8D1107310486CEB800E47090 /* Info.plist */,
+				CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
+				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		CE77C89A10946C6D0078B0DB /* xib */ = {
+			isa = PBXGroup;
+			children = (
+				CE031753109B345200517EE6 /* MainMenu.xib */,
+				CE77C8A710946CE20078B0DB /* DetailsPanel.xib */,
+				CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */,
+				CE031750109B340A00517EE6 /* Preferences.xib */,
+			);
+			path = xib;
+			sourceTree = "<group>";
+		};
+		CE80DB1A0FC192AB0086DCA6 /* cocoalib */ = {
+			isa = PBXGroup;
+			children = (
+				CEBAE4220FDA97E000B7887D /* brsinglelineformatter */,
+				CE80DB700FC194760086DCA6 /* ErrorReportWindow.xib */,
+				CE80DB720FC194760086DCA6 /* progress.nib */,
+				CE80DB740FC194760086DCA6 /* registration.nib */,
+				CE80DB480FC193770086DCA6 /* NSImageAdditions.h */,
+				CE80DB490FC193770086DCA6 /* NSImageAdditions.m */,
+				CE80DB450FC193650086DCA6 /* NSNotificationAdditions.h */,
+				CE80DB460FC193650086DCA6 /* NSNotificationAdditions.m */,
+				CE80DB1B0FC192D60086DCA6 /* Dialogs.h */,
+				CE80DB1C0FC192D60086DCA6 /* Dialogs.m */,
+				CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */,
+				CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */,
+				CE80DB1F0FC192D60086DCA6 /* Outline.h */,
+				CE80DB200FC192D60086DCA6 /* Outline.m */,
+				CE80DB210FC192D60086DCA6 /* ProgressController.h */,
+				CE80DB220FC192D60086DCA6 /* ProgressController.m */,
+				CE80DB230FC192D60086DCA6 /* PyApp.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 */,
+				CE80DB2D0FC192D60086DCA6 /* ValueTransformers.m */,
+			);
+			name = cocoalib;
+			sourceTree = "<group>";
+		};
+		CE80DB810FC194BD0086DCA6 /* dgbase */ = {
+			isa = PBXGroup;
+			children = (
+				CE80DB820FC1951C0086DCA6 /* AppDelegate.h */,
+				CE80DB830FC1951C0086DCA6 /* AppDelegate.m */,
+				CE80DB840FC1951C0086DCA6 /* Consts.h */,
+				CE6044EA0FE6796200B71262 /* DetailsPanel.h */,
+				CE6044EB0FE6796200B71262 /* DetailsPanel.m */,
+				CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */,
+				CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */,
+				CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */,
+				CE80DB880FC1951C0086DCA6 /* ResultWindow.h */,
+				CE80DB890FC1951C0086DCA6 /* ResultWindow.m */,
+			);
+			name = dgbase;
+			sourceTree = "<group>";
+		};
+		CEBAE4220FDA97E000B7887D /* brsinglelineformatter */ = {
+			isa = PBXGroup;
+			children = (
+				CEBAE4230FDA97E000B7887D /* BRSingleLineFormatter.h */,
+				CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */,
+			);
+			name = brsinglelineformatter;
+			path = ../../cocoalib/brsinglelineformatter;
+			sourceTree = SOURCE_ROOT;
+		};
+		CEFC294309C89E0000D9F998 /* images */ = {
+			isa = PBXGroup;
+			children = (
+				CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */,
+				CEFC295309C89FF200D9F998 /* details32.png */,
+				CEFC295409C89FF200D9F998 /* preferences32.png */,
+				CEFC294509C89E3D00D9F998 /* folder32.png */,
+			);
+			name = images;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		8D1107260486CEB800E47090 /* dupeguru */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */;
+			buildPhases = (
+				8D1107290486CEB800E47090 /* Resources */,
+				8D11072C0486CEB800E47090 /* Sources */,
+				8D11072E0486CEB800E47090 /* Frameworks */,
+				CECC02B709A36E8200CC0A94 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = dupeguru;
+			productInstallPath = "$(HOME)/Applications";
+			productName = dupeguru;
+			productReference = 8D1107320486CEB800E47090 /* dupeGuru PE.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
+			compatibilityVersion = "Xcode 3.0";
+			hasScannedForEncodings = 1;
+			mainGroup = 29B97314FDCFA39411CA2CEA /* dupeguru */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8D1107260486CEB800E47090 /* dupeguru */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D1107290486CEB800E47090 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
+				CE073F6309CAE1A3005C1D2F /* dupeguru_pe_help in Resources */,
+				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
+				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
+				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 */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D11072C0486CEB800E47090 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				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 */,
+				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 */,
+				CE80DB4A0FC193770086DCA6 /* NSImageAdditions.m in Sources */,
+				CE80DB8A0FC1951C0086DCA6 /* AppDelegate.m in Sources */,
+				CE80DB8B0FC1951C0086DCA6 /* DirectoryPanel.m in Sources */,
+				CE80DB8C0FC1951C0086DCA6 /* ResultWindow.m in Sources */,
+				CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */,
+				CE6044EC0FE6796200B71262 /* DetailsPanel.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 */ = {
+			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;
+		};
+		C01FCF5008A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+				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;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4C08A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF5008A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}
--- a/cocoa/pe/gen.py
+++ b/cocoa/pe/gen.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+# 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.path as op
+import os
+import shutil
+from optparse import OptionParser
+
+def main(dev):
+    if not dev:
+        print "Building help index"
+        help_path = op.abspath('../../help_pe/dupeguru_pe_help')
+        os.system('open /Developer/Applications/Utilities/Help\\ Indexer.app --args {0}'.format(help_path))
+    
+    print "Building dg_cocoa.plugin"
+    if op.exists('py/build'):
+        shutil.rmtree('py/build')
+    if op.exists('py/dist'):
+        shutil.rmtree('py/dist')
+    
+    os.chdir('py')
+    if dev:
+        os.system('python -u setup.py py2app -A')
+    else:
+        os.system('python -u setup.py py2app')
+    os.chdir('..')
+    
+    print "Building the XCode project"
+    os.system('xcodebuild')
+
+if __name__ == '__main__':
+    usage = "usage: %prog [options]"
+    parser = OptionParser(usage=usage)
+    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.dev)
--- a/cocoa/pe/main.m
+++ b/cocoa/pe/main.m
@@ -0,0 +1,21 @@
+/* 
+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>
+
+int main(int argc, char *argv[])
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSString *pluginPath = [[NSBundle mainBundle]
+                                pathForResource:@"dg_cocoa"
+                                         ofType:@"plugin"];
+    NSBundle *pluginBundle = [NSBundle bundleWithPath:pluginPath];
+    [pluginBundle load];
+    [pool release];
+    return NSApplicationMain(argc,  (const char **) argv);
+}
--- a/cocoa/pe/py/dg_cocoa.py
+++ b/cocoa/pe/py/dg_cocoa.py
@@ -0,0 +1,212 @@
+# 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 AppKit import *
+
+from core_pe import app_cocoa as app_pe_cocoa
+
+# Fix py2app imports which chokes on relative imports
+from core import app, app_cocoa, data, directories, engine, export, ignore, results, scanner
+from core_pe import block, cache, matchbase, data
+from hsutil import conflict
+
+class PyApp(NSObject):
+    pass #fake class
+
+class PyDupeGuru(PyApp):
+    def init(self):
+        self = super(PyDupeGuru,self).init()
+        self.app = app_pe_cocoa.DupeGuruPE()
+        return self
+    
+    #---Directories
+    def addDirectory_(self,directory):
+        return self.app.add_directory(directory)
+    
+    def removeDirectory_(self,index):
+        self.app.RemoveDirectory(index)
+    
+    def setDirectory_state_(self,node_path,state):
+        self.app.SetDirectoryState(node_path,state)
+    
+    #---Results
+    def clearIgnoreList(self):
+        self.app.scanner.ignore_list.Clear()
+    
+    def clearPictureCache(self):
+        self.app.scanner.cached_blocks.clear()
+    
+    def doScan(self):
+        return self.app.start_scanning()
+    
+    def exportToXHTMLwithColumns_(self, column_ids):
+        return self.app.export_to_xhtml(column_ids)
+    
+    def loadIgnoreList(self):
+        self.app.load_ignore_list()
+    
+    def loadResults(self):
+        self.app.load()
+    
+    def markAll(self):
+        self.app.results.mark_all()
+    
+    def markNone(self):
+        self.app.results.mark_none()
+    
+    def markInvert(self):
+        self.app.results.mark_invert()
+    
+    def purgeIgnoreList(self):
+        self.app.PurgeIgnoreList()
+    
+    def toggleSelectedMark(self):
+        self.app.ToggleSelectedMarkState()
+    
+    def saveIgnoreList(self):
+        self.app.save_ignore_list()
+    
+    def saveResults(self):
+        self.app.save()
+    
+    def refreshDetailsWithSelected(self):
+        self.app.RefreshDetailsWithSelected()
+    
+    def selectedResultNodePaths(self):
+        return self.app.selected_result_node_paths()
+    
+    def selectResultNodePaths_(self,node_paths):
+        self.app.SelectResultNodePaths(node_paths)
+    
+    def selectedPowerMarkerNodePaths(self):
+        return self.app.selected_powermarker_node_paths()
+    
+    def selectPowerMarkerNodePaths_(self,node_paths):
+        self.app.SelectPowerMarkerNodePaths(node_paths)
+    
+    #---Actions
+    def addSelectedToIgnoreList(self):
+        self.app.AddSelectedToIgnoreList()
+    
+    def deleteMarked(self):
+        self.app.delete_marked()
+    
+    def applyFilter_(self, filter):
+        self.app.apply_filter(filter)
+    
+    def makeSelectedReference(self):
+        self.app.MakeSelectedReference()
+    
+    def copyOrMove_markedTo_recreatePath_(self,copy,destination,recreate_path):
+        self.app.copy_or_move_marked(copy, destination, recreate_path)
+    
+    def openSelected(self):
+        self.app.OpenSelected()
+    
+    def removeMarked(self):
+        self.app.results.perform_on_marked(lambda x:True,True)
+    
+    def removeSelected(self):
+        self.app.RemoveSelected()
+    
+    def renameSelected_(self,newname):
+        return self.app.RenameSelected(newname)
+    
+    def revealSelected(self):
+        self.app.RevealSelected()
+    
+    #---Misc
+    def sortDupesBy_ascending_(self,key,asc):
+        self.app.sort_dupes(key,asc)
+    
+    def sortGroupsBy_ascending_(self,key,asc):
+        self.app.sort_groups(key,asc)
+    
+    #---Information
+    def getIgnoreListCount(self):
+        return len(self.app.scanner.ignore_list)
+    
+    def getMarkCount(self):
+        return self.app.results.mark_count
+    
+    def getStatLine(self):
+        return self.app.stat_line
+    
+    def getOperationalErrorCount(self):
+        return self.app.last_op_error_count
+    
+    def getSelectedDupePath(self):
+        return unicode(self.app.selected_dupe_path())
+    
+    def getSelectedDupeRefPath(self):
+        return unicode(self.app.selected_dupe_ref_path())
+    
+    #---Data
+    @objc.signature('i@:i')
+    def getOutlineViewMaxLevel_(self, tag):
+        return self.app.GetOutlineViewMaxLevel(tag)
+    
+    @objc.signature('@@:i@')
+    def getOutlineView_childCountsForPath_(self, tag, node_path):
+        return self.app.GetOutlineViewChildCounts(tag, node_path)
+    
+    def getOutlineView_valuesForIndexes_(self,tag,node_path):
+        return self.app.GetOutlineViewValues(tag,node_path)
+    
+    def getOutlineView_markedAtIndexes_(self,tag,node_path):
+        return self.app.GetOutlineViewMarked(tag,node_path)
+    
+    def getTableViewCount_(self,tag):
+        return self.app.GetTableViewCount(tag)
+    
+    def getTableViewMarkedIndexes_(self,tag):
+        return self.app.GetTableViewMarkedIndexes(tag)
+    
+    def getTableView_valuesForRow_(self,tag,row):
+        return self.app.GetTableViewValues(tag,row)
+    
+    #---Properties
+    def setMatchScaled_(self,match_scaled):
+        self.app.scanner.match_scaled = match_scaled
+    
+    def setMinMatchPercentage_(self,percentage):
+        self.app.scanner.threshold = int(percentage)
+    
+    def setMixFileKind_(self,mix_file_kind):
+        self.app.scanner.mix_file_kind = mix_file_kind
+    
+    def setDisplayDeltaValues_(self,display_delta_values):
+        self.app.display_delta_values= display_delta_values
+    
+    def setEscapeFilterRegexp_(self, escape_filter_regexp):
+        self.app.options['escape_filter_regexp'] = escape_filter_regexp
+    
+    def setRemoveEmptyFolders_(self, remove_empty_folders):
+        self.app.options['clean_empty_dirs'] = remove_empty_folders
+    
+    #---Worker
+    def getJobProgress(self):
+        return self.app.progress.last_progress
+    
+    def getJobDesc(self):
+        return self.app.progress.last_desc
+    
+    def cancelJob(self):
+        self.app.progress.job_cancelled = True
+    
+    #---Registration
+    @objc.signature('i@:')
+    def isRegistered(self):
+        return self.app.registered
+    
+    @objc.signature('i@:@@')
+    def isCodeValid_withEmail_(self, code, email):
+        return self.app.is_code_valid(code, email)
+    
+    def setRegisteredCode_andEmail_(self, code, email):
+        self.app.set_registration(code, email)
+    
--- a/cocoa/pe/py/setup.py
+++ b/cocoa/pe/py/setup.py
@@ -0,0 +1,12 @@
+# 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 distutils.core import setup
+import py2app
+
+setup(
+    plugin = ['dg_cocoa.py'],
+)
--- a/cocoa/pe/xib/DetailsPanel.xib
+++ b/cocoa/pe/xib/DetailsPanel.xib
--- a/cocoa/pe/xib/Preferences.xib
+++ b/cocoa/pe/xib/Preferences.xib
--- a/cocoa/se/AppDelegate.h
+++ b/cocoa/se/AppDelegate.h
@@ -0,0 +1,23 @@
+/* 
+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>
+#import "../base/AppDelegate.h"
+#import "DirectoryPanel.h"
+#import "PyDupeGuru.h"
+
+@interface AppDelegate : AppDelegateBase
+{
+    DirectoryPanel *_directoryPanel;
+}
+- (IBAction)openWebsite:(id)sender;
+- (IBAction)toggleDirectories:(id)sender;
+
+- (DirectoryPanel *)directoryPanel;
+- (PyDupeGuru *)py;
+@end
--- a/cocoa/se/AppDelegate.m
+++ b/cocoa/se/AppDelegate.m
@@ -0,0 +1,108 @@
+/* 
+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 "../../cocoalib/ProgressController.h"
+#import "../../cocoalib/RegistrationInterface.h"
+#import "../../cocoalib/Utils.h"
+#import "../../cocoalib/ValueTransformers.h"
+#import "DetailsPanel.h"
+#import "Consts.h"
+
+@implementation AppDelegate
+ (void)initialize
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    NSMutableDictionary *d = [NSMutableDictionary dictionary];
+    [d setObject:i2n(1) forKey:@"scanType"];
+    [d setObject:i2n(80) forKey:@"minMatchPercentage"];
+    [d setObject:i2n(30) forKey:@"smallFileThreshold"];
+    [d setObject:i2n(1) forKey:@"recreatePathType"];
+    [d setObject:b2n(YES) forKey:@"wordWeighting"];
+    [d setObject:b2n(NO) forKey:@"matchSimilarWords"];
+    [d setObject:b2n(YES) forKey:@"mixFileKind"];
+    [d setObject:b2n(NO) forKey:@"useRegexpFilter"];
+    [d setObject:b2n(NO) forKey:@"removeEmptyFolders"];
+    [d setObject:b2n(YES) forKey:@"ignoreSmallFiles"];
+    [d setObject:b2n(NO) forKey:@"debug"];
+    [d setObject:[NSArray array] forKey:@"recentDirectories"];
+    [d setObject:[NSArray array] forKey:@"columnsOrder"];
+    [d setObject:[NSDictionary dictionary] forKey:@"columnsWidth"];
+    [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:d];
+    [ud registerDefaults:d];
+}
+
+- (id)init
+{
+    self = [super init];
+    VTIsIntIn *vt = [[[VTIsIntIn alloc] initWithValues:[NSIndexSet indexSetWithIndex:1] reverse:YES] autorelease];
+    [NSValueTransformer setValueTransformer:vt forName:@"vtScanTypeIsNotContent"];
+    _directoryPanel = nil;
+    _appName = APPNAME;
+    return self;
+}
+
+- (IBAction)openWebsite:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru"]];
+}
+
+- (IBAction)toggleDirectories:(id)sender
+{
+    [[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
--- a/cocoa/se/Consts.h
+++ b/cocoa/se/Consts.h
@@ -0,0 +1,11 @@
+/* 
+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 "../base/Consts.h"
+
+#define APPNAME @"dupeGuru"
--- a/cocoa/se/DetailsPanel.h
+++ b/cocoa/se/DetailsPanel.h
@@ -0,0 +1,13 @@
+/* 
+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>
+#import "../base/DetailsPanel.h"
+
+@interface DetailsPanel : DetailsPanelBase
+@end
--- a/cocoa/se/DetailsPanel.m
+++ b/cocoa/se/DetailsPanel.m
@@ -0,0 +1,12 @@
+/* 
+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"
+
+@implementation DetailsPanel
+@end
--- a/cocoa/se/DirectoryPanel.h
+++ b/cocoa/se/DirectoryPanel.h
@@ -0,0 +1,15 @@
+/* 
+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>
+#import "../base/DirectoryPanel.h"
+
+@interface DirectoryPanel : DirectoryPanelBase
+{
+}
+@end
--- a/cocoa/se/DirectoryPanel.m
+++ b/cocoa/se/DirectoryPanel.m
@@ -0,0 +1,12 @@
+/* 
+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"
+
+@implementation DirectoryPanel
+@end
--- a/cocoa/se/Info.plist
+++ b/cocoa/se/Info.plist
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleHelpBookFolder</key>
+	<string>dupeguru_help</string>
+	<key>CFBundleHelpBookName</key>
+	<string>dupeGuru Help</string>
+	<key>CFBundleIconFile</key>
+	<string>dupeguru</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.hardcoded_software.dupeguru</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>hsft</string>
+	<key>CFBundleVersion</key>
+	<string>2.9.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© Hardcoded Software, 2009</string>
+	<key>SUFeedURL</key>
+	<string>http://www.hardcoded.net/updates/dupeguru.appcast</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>dsa_pub.pem</string>
+</dict>
+</plist>
--- a/cocoa/se/PyDupeGuru.h
+++ b/cocoa/se/PyDupeGuru.h
@@ -0,0 +1,17 @@
+/* 
+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>
+#import "../base/PyDupeGuru.h"
+
+@interface PyDupeGuru : PyDupeGuruBase
+//Scanning options
+- (void)setScanType:(NSNumber *)scan_type;
+- (void)setWordWeighting:(NSNumber *)words_are_weighted;
+- (void)setMatchSimilarWords:(NSNumber *)match_similar_words;
+@end
--- a/cocoa/se/ResultWindow.h
+++ b/cocoa/se/ResultWindow.h
@@ -0,0 +1,38 @@
+/* 
+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>
+#import "../../cocoalib/Outline.h"
+#import "../base/ResultWindow.h"
+#import "DirectoryPanel.h"
+
+@interface ResultWindow : ResultWindowBase
+{
+    IBOutlet NSSearchField *filterField;
+    
+    NSString *_lastAction;
+    NSMutableIndexSet *_deltaColumns;
+}
+- (IBAction)clearIgnoreList:(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)markToggle:(id)sender;
+- (IBAction)openSelected:(id)sender;
+- (IBAction)refresh:(id)sender;
+- (IBAction)removeMarked:(id)sender;
+- (IBAction)removeSelected:(id)sender;
+- (IBAction)renameSelected:(id)sender;
+- (IBAction)resetColumnsToDefault:(id)sender;
+- (IBAction)revealSelected:(id)sender;
+- (IBAction)startDuplicateScan:(id)sender;
+- (IBAction)toggleDelta:(id)sender;
+@end
--- a/cocoa/se/ResultWindow.m
+++ b/cocoa/se/ResultWindow.m
@@ -0,0 +1,258 @@
+/* 
+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 "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];
+    _displayDelta = NO;
+    _powerMode = NO;
+    _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,4)] retain];
+    [_deltaColumns removeIndex:3];
+    [deltaSwitch setSelectedSegment:0];
+    [pmSwitch setSelectedSegment:0];
+    [py setDisplayDeltaValues:b2n(_displayDelta)];
+    [matches setTarget:self];
+    [matches setDoubleAction:@selector(openSelected:)];
+    [self refreshStats];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
+}
+
+/* Actions */
+- (IBAction)clearIgnoreList:(id)sender
+{
+    int 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)filter:(id)sender
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [py setEscapeFilterRegexp:b2n(!n2b([ud objectForKey:@"useRegexpFilter"]))];
+    [py applyFilter:[filterField stringValue]];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)ignoreSelected:(id)sender
+{
+    NSArray *nodeList = [self getSelected:YES];
+    if (![nodeList count])
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",[nodeList count]]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py addSelectedToIgnoreList];
+    [py removeSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)markAll:(id)sender
+{
+    [py markAll];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markInvert:(id)sender
+{
+    [py markInvert];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markNone:(id)sender
+{
+    [py markNone];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py toggleSelectedMark];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markToggle:(id)sender
+{
+    OVNode *node = [matches itemAtRow:[matches clickedRow]];
+    [self performPySelection:[NSArray arrayWithObject:p2a([node indexPath])]];
+    [py toggleSelectedMark];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)openSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py openSelected];
+}
+
+- (IBAction)refresh:(id)sender
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (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];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)removeSelected:(id)sender
+{
+    NSArray *nodeList = [self getSelected:YES];
+    if (![nodeList count])
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",[nodeList count]]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py removeSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)renameSelected:(id)sender
+{
+    int col = [matches columnWithIdentifier:@"0"];
+    int row = [matches selectedRow];
+    [matches editColumn:col row:row withEvent:[NSApp currentEvent] select:YES];
+}
+
+- (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)revealSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py revealSelected];
+}
+
+- (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];
+    }
+
+}
+
+- (IBAction)toggleDelta:(id)sender
+{
+    if ([deltaSwitch selectedSegment] == 1)
+        [deltaSwitch setSelectedSegment:0];
+    else
+        [deltaSwitch setSelectedSegment:1];
+    [self changeDelta: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:@"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]];
+}
+
+/* Delegate */
+- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{ 
+    OVNode *node = item;
+    if ([[tableColumn identifier] isEqual:@"mark"])
+    {
+        [cell setEnabled: [node isMarkable]];
+    }
+    if ([cell isKindOfClass:[NSTextFieldCell class]])
+    {
+        // Determine if the text color will be blue due to directory being reference.
+        NSTextFieldCell *textCell = cell;
+        if ([node isMarkable])
+            [textCell setTextColor:[NSColor blackColor]];
+        else
+            [textCell setTextColor:[NSColor blueColor]];
+        if ((_displayDelta) && (_powerMode || ([node level] > 1)))
+        {
+            int i = [[tableColumn identifier] intValue];
+            if ([_deltaColumns containsIndex:i])
+                [textCell setTextColor:[NSColor orangeColor]];
+        }
+    }
+}
+
+/* Notifications */
+- (void)outlineViewSelectionDidChange:(NSNotification *)notification
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py refreshDetailsWithSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:DuplicateSelectionChangedNotification object:self];
+}
+
+- (void)resultsMarkingChanged:(NSNotification *)aNotification
+{
+    [matches invalidateMarkings];
+    [self refreshStats];
+}
+@end
--- a/cocoa/se/dupeguru.icns
+++ b/cocoa/se/dupeguru.icns
--- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj
@@ -0,0 +1,480 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 44;
+	objects = {
+
+/* 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 */; };
+		CE073F6309CAE1A3005C1D2F /* dupeguru_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_help */; };
+		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 */; };
+		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 */; };
+		CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.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 */; };
+		CEEFC0FB10945E37001F3A39 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */; };
+		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
+		CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
+		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
+		CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8B0FC9517500CD5728 /* Dialogs.m */; };
+		CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */; };
+		CEFC7FA00FC9517500CD5728 /* Outline.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8F0FC9517500CD5728 /* Outline.m */; };
+		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 */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		CECC02B709A36E8200CC0A94 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */,
+				CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */,
+				CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		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_se/dupeguru_help; 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 = ../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 = ../base/dsa_pub.pem; sourceTree = "<group>"; };
+		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; };
+		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; };
+		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 = ../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; };
+		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 = ../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 */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D11072E0486CEB800E47090 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+				CE45579B0AE3BC2B005A9546 /* Sparkle.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		080E96DDFE201D6D7F000001 /* DGSE */ = {
+			isa = PBXGroup;
+			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 */,
+				29B97316FDCFA39411CA2CEA /* main.m */,
+			);
+			name = DGSE;
+			sourceTree = "<group>";
+		};
+		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				CE45579A0AE3BC2B005A9546 /* Sparkle.framework */,
+				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+			);
+			name = "Linked Frameworks";
+			sourceTree = "<group>";
+		};
+		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+				13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
+				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D1107320486CEB800E47090 /* dupeGuru.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* dupeguru */ = {
+			isa = PBXGroup;
+			children = (
+				080E96DDFE201D6D7F000001 /* DGSE */,
+				CEFC7FB00FC9518F00CD5728 /* dgbase */,
+				CEFC7F890FC9513600CD5728 /* cocoalib */,
+				29B97317FDCFA39411CA2CEA /* Resources */,
+				29B97323FDCFA39411CA2CEA /* Frameworks */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = dupeguru;
+			sourceTree = "<group>";
+		};
+		29B97317FDCFA39411CA2CEA /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				CE073F5409CAE1A3005C1D2F /* dupeguru_help */,
+				CE381CF509915304003581CE /* dg_cocoa.plugin */,
+				CEFC294309C89E0000D9F998 /* images */,
+				CEEFC0CA10943849001F3A39 /* xib */,
+				CEEB135109C837A2004D2330 /* dupeguru.icns */,
+				8D1107310486CEB800E47090 /* Info.plist */,
+				CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
+				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		CEDD92D50FDD01640031C7B7 /* brsinglelineformatter */ = {
+			isa = PBXGroup;
+			children = (
+				CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */,
+				CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */,
+			);
+			name = brsinglelineformatter;
+			path = ../../cocoalib/brsinglelineformatter;
+			sourceTree = SOURCE_ROOT;
+		};
+		CEEFC0CA10943849001F3A39 /* xib */ = {
+			isa = PBXGroup;
+			children = (
+				CE3A46F9109B212E002ABFD5 /* MainMenu.xib */,
+				CEAC6810109B0B7E00B43C85 /* Preferences.xib */,
+				CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */,
+				CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */,
+			);
+			name = xib;
+			sourceTree = "<group>";
+		};
+		CEFC294309C89E0000D9F998 /* images */ = {
+			isa = PBXGroup;
+			children = (
+				CEFC295309C89FF200D9F998 /* details32.png */,
+				CEFC295409C89FF200D9F998 /* preferences32.png */,
+				CEFC294509C89E3D00D9F998 /* folder32.png */,
+			);
+			name = images;
+			sourceTree = "<group>";
+		};
+		CEFC7F890FC9513600CD5728 /* cocoalib */ = {
+			isa = PBXGroup;
+			children = (
+				CEDD92D50FDD01640031C7B7 /* brsinglelineformatter */,
+				CEFC7FA70FC9518A00CD5728 /* ErrorReportWindow.xib */,
+				CEFC7FA90FC9518A00CD5728 /* progress.nib */,
+				CEFC7FAB0FC9518A00CD5728 /* registration.nib */,
+				CEFC7F8A0FC9517500CD5728 /* Dialogs.h */,
+				CEFC7F8B0FC9517500CD5728 /* Dialogs.m */,
+				CEFC7F8C0FC9517500CD5728 /* HSErrorReportWindow.h */,
+				CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */,
+				CEFC7F8E0FC9517500CD5728 /* Outline.h */,
+				CEFC7F8F0FC9517500CD5728 /* Outline.m */,
+				CEFC7F900FC9517500CD5728 /* ProgressController.h */,
+				CEFC7F910FC9517500CD5728 /* ProgressController.m */,
+				CEFC7F920FC9517500CD5728 /* PyApp.h */,
+				CEFC7F930FC9517500CD5728 /* PyRegistrable.h */,
+				CEFC7F940FC9517500CD5728 /* RecentDirectories.h */,
+				CEFC7F950FC9517500CD5728 /* RecentDirectories.m */,
+				CEFC7F960FC9517500CD5728 /* RegistrationInterface.h */,
+				CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */,
+				CEFC7F980FC9517500CD5728 /* Table.h */,
+				CEFC7F990FC9517500CD5728 /* Table.m */,
+				CEFC7F9A0FC9517500CD5728 /* Utils.h */,
+				CEFC7F9B0FC9517500CD5728 /* Utils.m */,
+				CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */,
+				CEFC7F9D0FC9517500CD5728 /* ValueTransformers.m */,
+			);
+			name = cocoalib;
+			sourceTree = "<group>";
+		};
+		CEFC7FB00FC9518F00CD5728 /* dgbase */ = {
+			isa = PBXGroup;
+			children = (
+				CEFC7FB10FC951A700CD5728 /* AppDelegate.h */,
+				CEFC7FB20FC951A700CD5728 /* AppDelegate.m */,
+				CEFC7FB30FC951A700CD5728 /* Consts.h */,
+				CEE7EA110FE675C80004E467 /* DetailsPanel.h */,
+				CEE7EA120FE675C80004E467 /* DetailsPanel.m */,
+				CEFC7FB40FC951A700CD5728 /* DirectoryPanel.h */,
+				CEFC7FB50FC951A700CD5728 /* DirectoryPanel.m */,
+				CEFC7FB60FC951A700CD5728 /* PyDupeGuru.h */,
+				CEFC7FB70FC951A700CD5728 /* ResultWindow.h */,
+				CEFC7FB80FC951A700CD5728 /* ResultWindow.m */,
+			);
+			name = dgbase;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		8D1107260486CEB800E47090 /* dupeguru */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */;
+			buildPhases = (
+				8D1107290486CEB800E47090 /* Resources */,
+				8D11072C0486CEB800E47090 /* Sources */,
+				8D11072E0486CEB800E47090 /* Frameworks */,
+				CECC02B709A36E8200CC0A94 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = dupeguru;
+			productInstallPath = "$(HOME)/Applications";
+			productName = dupeguru;
+			productReference = 8D1107320486CEB800E47090 /* dupeGuru.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				BuildIndependentTargetsInParallel = NO;
+			};
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
+			compatibilityVersion = "Xcode 3.0";
+			hasScannedForEncodings = 1;
+			mainGroup = 29B97314FDCFA39411CA2CEA /* dupeguru */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8D1107260486CEB800E47090 /* dupeguru */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D1107290486CEB800E47090 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
+				CE073F6309CAE1A3005C1D2F /* dupeguru_help in Resources */,
+				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
+				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 */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D11072C0486CEB800E47090 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				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 */,
+				CEE7EA130FE675C80004E467 /* DetailsPanel.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 */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				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;
+		};
+		C01FCF5008A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+				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;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dupeguru" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4C08A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF5008A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}
--- a/cocoa/se/gen.py
+++ b/cocoa/se/gen.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+# 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.path as op
+import os
+import shutil
+from optparse import OptionParser
+
+def main(dev):
+    if not dev:
+        print "Building help index"
+        help_path = op.abspath('../../help_se/dupeguru_help')
+        os.system('open /Developer/Applications/Utilities/Help\\ Indexer.app --args {0}'.format(help_path))
+    
+    print "Building dg_cocoa.plugin"
+    if op.exists('py/build'):
+        shutil.rmtree('py/build')
+    if op.exists('py/dist'):
+        shutil.rmtree('py/dist')
+    
+    os.chdir('py')
+    if dev:
+        os.system('python -u setup.py py2app -A')
+    else:
+        os.system('python -u setup.py py2app')
+    os.chdir('..')
+    
+    print "Building the XCode project"
+    os.system('xcodebuild')
+
+if __name__ == '__main__':
+    usage = "usage: %prog [options]"
+    parser = OptionParser(usage=usage)
+    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.dev)
--- a/cocoa/se/main.m
+++ b/cocoa/se/main.m
@@ -0,0 +1,21 @@
+/* 
+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>
+
+int main(int argc, char *argv[])
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSString *pluginPath = [[NSBundle mainBundle]
+                                pathForResource:@"dg_cocoa"
+                                         ofType:@"plugin"];
+    NSBundle *pluginBundle = [NSBundle bundleWithPath:pluginPath];
+    [pluginBundle load];
+    [pool release];
+    return NSApplicationMain(argc,  (const char **) argv);
+}
--- a/cocoa/se/py/dg_cocoa.py
+++ b/cocoa/se/py/dg_cocoa.py
@@ -0,0 +1,221 @@
+# $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 AppKit import *
+
+from core_se.app_cocoa import DupeGuru
+from core import scanner
+
+# Fix py2app imports with chokes on relative imports
+from core_se import fs, data
+from core import app, app_cocoa, data, directories, engine, export, ignore, results, fs
+from hsutil import conflict
+
+class PyApp(NSObject):
+    pass #fake class
+
+class PyDupeGuru(PyApp):
+    def init(self):
+        self = super(PyDupeGuru,self).init()
+        self.app = DupeGuru()
+        return self
+    
+    #---Directories
+    def addDirectory_(self,directory):
+        return self.app.add_directory(directory)
+    
+    def removeDirectory_(self,index):
+        self.app.RemoveDirectory(index)
+    
+    def setDirectory_state_(self,node_path,state):
+        self.app.SetDirectoryState(node_path,state)
+    
+    #---Results
+    def clearIgnoreList(self):
+        self.app.scanner.ignore_list.Clear()
+    
+    def doScan(self):
+        return self.app.start_scanning()
+    
+    def exportToXHTMLwithColumns_(self, column_ids):
+        return self.app.export_to_xhtml(column_ids)
+    
+    def loadIgnoreList(self):
+        self.app.load_ignore_list()
+    
+    def loadResults(self):
+        self.app.load()
+    
+    def markAll(self):
+        self.app.results.mark_all()
+    
+    def markNone(self):
+        self.app.results.mark_none()
+    
+    def markInvert(self):
+        self.app.results.mark_invert()
+    
+    def purgeIgnoreList(self):
+        self.app.PurgeIgnoreList()
+    
+    def toggleSelectedMark(self):
+        self.app.ToggleSelectedMarkState()
+    
+    def saveIgnoreList(self):
+        self.app.save_ignore_list()
+    
+    def saveResults(self):
+        self.app.save()
+    
+    def refreshDetailsWithSelected(self):
+        self.app.RefreshDetailsWithSelected()
+    
+    def selectedResultNodePaths(self):
+        return self.app.selected_result_node_paths()
+    
+    def selectResultNodePaths_(self,node_paths):
+        self.app.SelectResultNodePaths(node_paths)
+    
+    def selectedPowerMarkerNodePaths(self):
+        return self.app.selected_powermarker_node_paths()
+    
+    def selectPowerMarkerNodePaths_(self,node_paths):
+        self.app.SelectPowerMarkerNodePaths(node_paths)
+    
+    #---Actions
+    def addSelectedToIgnoreList(self):
+        self.app.AddSelectedToIgnoreList()
+    
+    def deleteMarked(self):
+        self.app.delete_marked()
+    
+    def applyFilter_(self, filter):
+        self.app.apply_filter(filter)
+    
+    def makeSelectedReference(self):
+        self.app.MakeSelectedReference()
+    
+    def copyOrMove_markedTo_recreatePath_(self,copy,destination,recreate_path):
+        self.app.copy_or_move_marked(copy, destination, recreate_path)
+    
+    def openSelected(self):
+        self.app.OpenSelected()
+    
+    def removeMarked(self):
+        self.app.results.perform_on_marked(lambda x:True, True)
+    
+    def removeSelected(self):
+        self.app.RemoveSelected()
+    
+    def renameSelected_(self,newname):
+        return self.app.RenameSelected(newname)
+    
+    def revealSelected(self):
+        self.app.RevealSelected()
+    
+    #---Misc
+    def sortDupesBy_ascending_(self,key,asc):
+        self.app.sort_dupes(key,asc)
+    
+    def sortGroupsBy_ascending_(self,key,asc):
+        self.app.sort_groups(key,asc)
+    
+    #---Information
+    def getIgnoreListCount(self):
+        return len(self.app.scanner.ignore_list)
+    
+    def getMarkCount(self):
+        return self.app.results.mark_count
+    
+    def getStatLine(self):
+        return self.app.stat_line
+    
+    def getOperationalErrorCount(self):
+        return self.app.last_op_error_count
+    
+    #---Data
+    @objc.signature('i@:i')
+    def getOutlineViewMaxLevel_(self, tag):
+        return self.app.GetOutlineViewMaxLevel(tag)
+    
+    @objc.signature('@@:i@')
+    def getOutlineView_childCountsForPath_(self, tag, node_path):
+        return self.app.GetOutlineViewChildCounts(tag, node_path)
+    
+    def getOutlineView_valuesForIndexes_(self,tag,node_path):
+        return self.app.GetOutlineViewValues(tag,node_path)
+    
+    def getOutlineView_markedAtIndexes_(self,tag,node_path):
+        return self.app.GetOutlineViewMarked(tag,node_path)
+    
+    def getTableViewCount_(self,tag):
+        return self.app.GetTableViewCount(tag)
+    
+    def getTableViewMarkedIndexes_(self,tag):
+        return self.app.GetTableViewMarkedIndexes(tag)
+    
+    def getTableView_valuesForRow_(self,tag,row):
+        return self.app.GetTableViewValues(tag,row)
+    
+    #---Properties
+    def setMinMatchPercentage_(self,percentage):
+        self.app.scanner.min_match_percentage = int(percentage)
+    
+    def setScanType_(self,scan_type):
+        try:
+            self.app.scanner.scan_type = [
+                scanner.SCAN_TYPE_FILENAME,
+                scanner.SCAN_TYPE_CONTENT
+            ][scan_type]
+        except IndexError:
+            pass
+    
+    def setWordWeighting_(self,words_are_weighted):
+        self.app.scanner.word_weighting = words_are_weighted
+    
+    def setMixFileKind_(self,mix_file_kind):
+        self.app.scanner.mix_file_kind = mix_file_kind
+    
+    def setDisplayDeltaValues_(self,display_delta_values):
+        self.app.display_delta_values= display_delta_values
+    
+    def setMatchSimilarWords_(self,match_similar_words):
+        self.app.scanner.match_similar_words = match_similar_words
+    
+    def setEscapeFilterRegexp_(self, escape_filter_regexp):
+        self.app.options['escape_filter_regexp'] = escape_filter_regexp
+    
+    def setRemoveEmptyFolders_(self, remove_empty_folders):
+        self.app.options['clean_empty_dirs'] = remove_empty_folders
+    
+    @objc.signature('v@:i')
+    def setSizeThreshold_(self, size_threshold):
+        self.app.scanner.size_threshold = size_threshold
+    
+    #---Worker
+    def getJobProgress(self):
+        return self.app.progress.last_progress
+    
+    def getJobDesc(self):
+        return self.app.progress.last_desc
+    
+    def cancelJob(self):
+        self.app.progress.job_cancelled = True
+    
+    #---Registration
+    @objc.signature('i@:')
+    def isRegistered(self):
+        return self.app.registered
+    
+    @objc.signature('i@:@@')
+    def isCodeValid_withEmail_(self, code, email):
+        return self.app.is_code_valid(code, email)
+    
+    def setRegisteredCode_andEmail_(self, code, email):
+        self.app.set_registration(code, email)
+    
--- a/cocoa/se/py/setup.py
+++ b/cocoa/se/py/setup.py
@@ -0,0 +1,18 @@
+# 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 distutils.core import setup
+import py2app
+
+from hsutil.build import move_testdata_out, put_testdata_back
+
+move_log = move_testdata_out()
+try:
+    setup(
+        plugin = ['dg_cocoa.py'],
+    )
+finally:
+    put_testdata_back(move_log)
--- a/cocoa/se/xib/Preferences.xib
+++ b/cocoa/se/xib/Preferences.xib