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