pe v1.11.3

[#125 state:fixed] Wrapped error message around a crash when the iPhoto app can't be found.
Added tag me5.10.4 for changeset 44f6ff67066c
2026-01-25 16:11:39 +00:00 · 2010-12-31 14:43:00 +01:00 · 2010-12-31 12:10:44 +01:00 · 2010-12-30 16:11:17 +01:00 · 2010-12-30 14:55:13 +01:00 · 2010-12-30 13:07:04 +01:00
177 changed files with 1470 additions and 3784 deletions
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 syntax: glob

 .DS_Store
+run.py
 *.pyc
 *.so
 *.mode1v3
@@ -9,17 +10,13 @@ syntax: glob
 *.pyd
 conf.yaml
 build
+dist
+install
+installer_tmp-cache
 cocoa/*/Info.plist
 cocoa/*/build
 cocoa/*/dg_cocoa.plugin
 qt/base/*_rc.py
-qt/base/*_ui.py
-qt/*/*_ui.py
-qt/*/build
-qt/*/dist
-qt/*/install
-qt/*/logdict*.log
-qt/*/warn*.txt
 help_se/dupeguru_help
 help_me/dupeguru_me_help
 help_pe/dupeguru_pe_help
--- a/.hgtags
+++ b/.hgtags
@@ -29,3 +29,12 @@ b56fe4dd8c95bca270b078a09e86848df77e2b2d me5.9.0
 618a7365457d56fdc6920c70843a244762e2ea00 pe1.10.0
 95b3a4b564c6222b414f2b40182dde2bd6d0e8a4 me5.9.1
 9735a5218d2b5b3b1e1dfe17f2f874177cf8f61c se2.11.1
+dbfee3ee2fa5cbb9e7ab36570659c17cd5b8561f se2.12.0
+d3fe0d0dcda1e0bf1100d02f117503d3bf6baacf me5.10.0
+b07ac1398703dd358912c1f3d20bd995633db9fe pe1.11.0
+96b6aee668398d663b04eafc8d5dae05e18500ee before-fairware
+22239f94589baf2a9fad2123045b8a718dbd68f5 se2.12.2
+f9cae82a0752191276b24ffb2cc4e4a8afb5d754 me5.10.2
+154c8cb6f018d446d88fa099490c900906e86386 pe1.11.2
+ca93352ce35184853ad9fcb881935a43a8b1e249 me5.10.3
+44f6ff67066c083f79daa18a9d2f1ab909e0a62e me5.10.4
--- a/1
+++ b/1
@@ -6,6 +6,5 @@ Redistribution and use in source and binary forms, with or without modification,
    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
    * Neither the name of Hardcoded Software Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-    * If the source code has been published less than two years ago, any redistribution, in whole or in part, must retain full licensing functionality, without any attempt to change, obscure or in other ways circumvent its intent.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/12
+++ b/12
@@ -13,7 +13,6 @@ There are also other sub-folder that comes from external repositories (automatic
 with svn:externals):

 - hscommon: A collection of helpers used across HS applications.
- hsdocgen: An ad-hoc document generation used across HS project (used for help files)
 - cocoalib: A collection of helpers used across Cocoa UI codebases of HS applications.
 - qtlib: A collection of helpers used across Qt UI codebases of HS applications.

@@ -26,12 +25,13 @@ General dependencies
 -----

 - Python 3.1 (http://www.python.org)
- Send2Trash3k (http://hg.hardcoded.net/send2trash3k)
- hsutil3k (http://hg.hardcoded.net/hsutil3k)
- hsaudiotag3k (for ME) (http://hg.hardcoded.net/hsaudiotag3k)
+- Send2Trash3k (http://hg.hardcoded.net/send2trash)
+- hsutil3k (http://hg.hardcoded.net/hsutil)
+- hsaudiotag3k 1.1.0 (for ME) (http://hg.hardcoded.net/hsaudiotag)
+- jobprogress (http://hg.hardcoded.net/jobprogress)
 - Markdown, to generate help files. (http://pypi.python.org/pypi/Markdown)
 - PyYaml, for help files and the build system. (http://pyyaml.org/)
- py.test, to run unit tests. (http://codespeak.net/py/dist/test/)
+- pytest 2.0.0, to run unit tests. (http://pytest.org/)

 OS X prerequisites
 -----
@@ -39,7 +39,7 @@ OS X prerequisites
 - XCode 3.1 (http://developer.apple.com/TOOLS/xcode/)
 - Sparkle (http://sparkle.andymatuschak.org/)
 - PyObjC 2.3. (http://pyobjc.sourceforge.net/)
- py2app 0.5.4 (http://svn.pythonmac.org/py2app/py2app/trunk/doc/index.html)
+- py2app 0.5.4 (http://bitbucket.org/ronaldoussoren/py2app)

 Windows prerequisites
 ---
--- a/build.py
+++ b/build.py
@@ -3,9 +3,9 @@
 # Created On: 2009-12-30
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import sys
 import os
@@ -63,14 +63,25 @@ def build_cocoa(edition, dev, help_destpath):
        args.append('-configuration release')
    args = ' '.join(args)
    os.system('xcodebuild {0}'.format(args))
-    os.chdir('..')
+    os.chdir('../..')
+    print("Creating the run.py file")
+    subfolder = 'dev' if dev else 'release'
+    app_path = {
+        'se': 'cocoa/se/build/{0}/dupeGuru.app',
+        'me': 'cocoa/me/build/{0}/dupeGuru\\ ME.app',
+        'pe': 'cocoa/pe/build/{0}/dupeGuru\\ PE.app',
+    }[edition].format(subfolder)
+    tmpl = open('run_template_cocoa.py', 'rt').read()
+    run_contents = tmpl.replace('{{app_path}}', app_path)
+    open('run.py', 'wt').write(run_contents)

 def build_qt(edition, dev):
    print("Building Qt stuff")
-    build_all_qt_ui(op.join('qtlib', 'ui'))
-    build_all_qt_ui(op.join('qt', 'base'))
-    build_all_qt_ui(op.join('qt', edition))
    print_and_do("pyrcc4 -py3 {0} > {1}".format(op.join('qt', 'base', 'dg.qrc'), op.join('qt', 'base', 'dg_rc.py')))
+    print("Creating the run.py file")
+    tmpl = open('run_template_qt.py', 'rt').read()
+    run_contents = tmpl.replace('{{edition}}', edition)
+    open('run.py', 'wt').write(run_contents)

 def build_pe_modules(ui):
    def move(src, dst):
--- a/cocoa/base/AppDelegate.h
+++ b/cocoa/base/AppDelegate.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
@@ -12,23 +12,24 @@ http://www.hardcoded.net/licenses/hs_license
 #import "ResultWindow.h"
 #import "DetailsPanel.h"
 #import "DirectoryPanel.h"
+#import "HSAboutBox.h"

@interface AppDelegateBase : NSObject
 {
    IBOutlet PyDupeGuruBase *py;
    IBOutlet RecentDirectories *recentDirectories;
-    IBOutlet NSMenuItem *unlockMenuItem;
    IBOutlet ResultWindowBase *result;
    
    DirectoryPanel *_directoryPanel;
    DetailsPanel *_detailsPanel;
+    HSAboutBox *_aboutBox;
    BOOL _savedResults;
 }
- (IBAction)unlockApp:(id)sender;
-
 - (PyDupeGuruBase *)py;
 - (RecentDirectories *)recentDirectories;
 - (DirectoryPanel *)directoryPanel;
 - (DetailsPanel *)detailsPanel;
 - (void)saveResults;
+
+- (IBAction)showAboutBox:(id)sender;
@end
--- a/cocoa/base/AppDelegate.m
+++ b/cocoa/base/AppDelegate.m
@@ -1,32 +1,19 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "AppDelegate.h"
 #import "ProgressController.h"
-#import "RegistrationInterface.h"
+#import "HSFairwareReminder.h"
 #import "Utils.h"
 #import "Consts.h"
 #import <Sparkle/SUUpdater.h>

@implementation AppDelegateBase
- (IBAction)unlockApp:(id)sender
-{
-    if ([[self py] isRegistered])
-        return;
-    RegistrationInterface *ri = [[RegistrationInterface alloc] initWithApp:[self py]];
-    if ([ri enterCode] == NSOKButton)
-    {
-        NSString *menuTitle = [NSString stringWithFormat:@"Thanks for buying %@!",[py appName]];
-        [unlockMenuItem setTitle:menuTitle];
-    }
-    [ri release];
-}
-
 - (PyDupeGuruBase *)py { return py; }
 - (RecentDirectories *)recentDirectories { return recentDirectories; }
 - (DirectoryPanel *)directoryPanel
@@ -53,6 +40,14 @@ http://www.hardcoded.net/licenses/hs_license
    _savedResults = YES;
 }

+- (IBAction)showAboutBox:(id)sender
+{
+    if (_aboutBox == nil) {
+        _aboutBox = [[HSAboutBox alloc] initWithApp:py];
+    }
+    [[_aboutBox window] makeKeyAndOrderFront:sender];
+}
+
 /* Delegate */
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
@@ -65,9 +60,7 @@ http://www.hardcoded.net/licenses/hs_license
        [result restoreColumnsPosition:columnsOrder widths:columnsWidth];
    else
        [result resetColumnsToDefault:nil];
-    //Reg stuff
-    if ([RegistrationInterface showNagWithApp:[self py]])
-        [unlockMenuItem setTitle:[NSString stringWithFormat:@"Thanks for buying %@!",[py appName]]];
+    [HSFairwareReminder showNagWithApp:[self py]];
    //Restore results
    [py loadIgnoreList];
    [py loadResults];
--- a/cocoa/base/Consts.h
+++ b/cocoa/base/Consts.h
@@ -1,14 +1,13 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>

-#define RegistrationRequired @"RegistrationRequired"
 #define JobStarted @"JobStarted"
 #define JobInProgress @"JobInProgress"

--- a/cocoa/base/DetailsPanel.h
+++ b/cocoa/base/DetailsPanel.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/DetailsPanel.m
+++ b/cocoa/base/DetailsPanel.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "DetailsPanel.h"
--- a/cocoa/base/DirectoryOutline.h
+++ b/cocoa/base/DirectoryOutline.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/DirectoryOutline.m
+++ b/cocoa/base/DirectoryOutline.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "DirectoryOutline.h"
--- a/cocoa/base/DirectoryPanel.h
+++ b/cocoa/base/DirectoryPanel.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/DirectoryPanel.m
+++ b/cocoa/base/DirectoryPanel.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "DirectoryPanel.h"
--- a/cocoa/base/ProblemDialog.h
+++ b/cocoa/base/ProblemDialog.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/ProblemDialog.m
+++ b/cocoa/base/ProblemDialog.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "ProblemDialog.h"
--- a/cocoa/base/PyDetailsPanel.h
+++ b/cocoa/base/PyDetailsPanel.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/PyDirectoryOutline.h
+++ b/cocoa/base/PyDirectoryOutline.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/PyDupeGuru.h
+++ b/cocoa/base/PyDupeGuru.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/PyProblemDialog.h
+++ b/cocoa/base/PyProblemDialog.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/PyResultTable.h
+++ b/cocoa/base/PyResultTable.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/PyStatsLabel.h
+++ b/cocoa/base/PyStatsLabel.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/ResultTable.h
+++ b/cocoa/base/ResultTable.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/ResultTable.m
+++ b/cocoa/base/ResultTable.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "ResultTable.h"
@@ -129,9 +129,6 @@ http://www.hardcoded.net/licenses/hs_license
        NSTextFieldCell *textCell = cell;
        if (isMarkable) {
            [textCell setTextColor:[NSColor blackColor]];
-        }
-        else {
-            [textCell setTextColor:[NSColor blueColor]];
            if ([self deltaValuesMode]) {
                NSInteger i = [[column identifier] integerValue];
                if ([_deltaColumns containsIndex:i]) {
@@ -139,6 +136,9 @@ http://www.hardcoded.net/licenses/hs_license
                }
            }
        }
+        else {
+            [textCell setTextColor:[NSColor blueColor]];
+        }
    }
 }

--- a/cocoa/base/ResultWindow.h
+++ b/cocoa/base/ResultWindow.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/ResultWindow.m
+++ b/cocoa/base/ResultWindow.m
@@ -1,16 +1,15 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "ResultWindow.h"
 #import "Dialogs.h"
 #import "ProgressController.h"
 #import "Utils.h"
-#import "RegistrationInterface.h"
 #import "AppDelegate.h"
 #import "Consts.h"

@@ -31,7 +30,6 @@ http://www.hardcoded.net/licenses/hs_license
    [matches setTarget:self];
    [matches setDoubleAction:@selector(openClicked:)];
    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationRequired:) name:RegistrationRequired object:nil];
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobStarted:) name:JobStarted object:nil];
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobInProgress:) name:JobInProgress object:nil];
@@ -464,12 +462,6 @@ http://www.hardcoded.net/licenses/hs_license
    [[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];
-}
-
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
 {
    return ![[ProgressController mainProgressController] isShown];
--- a/cocoa/base/StatsLabel.h
+++ b/cocoa/base/StatsLabel.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/base/StatsLabel.m
+++ b/cocoa/base/StatsLabel.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "StatsLabel.h"
--- a/cocoa/base/xib/MainMenu.xib
+++ b/cocoa/base/xib/MainMenu.xib
@@ -2,31 +2,26 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.SystemVersion">10H574</string>
+		<string key="IBDocument.InterfaceBuilderVersion">823</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">788</string>
+			<string key="NS.object.0">823</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1147"/>
-			<integer value="598"/>
+			<integer value="21"/>
+			<integer value="57"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="248533267">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -83,10 +78,9 @@
 								<string key="NSToolbarItemPaletteLabel">Power Marker</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSegmentedControl" key="NSToolbarItemView" id="35398541">
-									<reference key="NSNextResponder"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{7, 14}, {67, 25}}</string>
-									<reference key="NSSuperview"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSegmentedCell" key="NSCell" id="431579725">
 										<int key="NSCellFlags">67239424</int>
@@ -178,10 +172,9 @@
 								<string key="NSToolbarItemPaletteLabel">Filter</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSearchField" key="NSToolbarItemView" id="1013657232">
-									<reference key="NSNextResponder"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">258</int>
 									<string key="NSFrame">{{0, 14}, {81, 22}}</string>
-									<reference key="NSSuperview"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSearchFieldCell" key="NSCell" id="484816507">
 										<int key="NSCellFlags">343014976</int>
@@ -323,10 +316,9 @@
 								<string key="NSToolbarItemPaletteLabel">Action</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSPopUpButton" key="NSToolbarItemView" id="165812138">
-									<reference key="NSNextResponder"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{1, 14}, {40, 25}}</string>
-									<reference key="NSSuperview"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSPopUpButtonCell" key="NSCell" id="436420677">
 										<int key="NSCellFlags">-2076049856</int>
@@ -512,7 +504,6 @@
 												</object>
 											</object>
 										</object>
-										<int key="NSSelectedIndex">2</int>
 										<bool key="NSPullDown">YES</bool>
 										<int key="NSPreferredEdge">3</int>
 										<bool key="NSUsesItemFromMenu">YES</bool>
@@ -539,10 +530,9 @@
 								<string key="NSToolbarItemPaletteLabel">Delta Values</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSegmentedControl" key="NSToolbarItemView" id="311230297">
-									<reference key="NSNextResponder"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{4, 14}, {67, 25}}</string>
-									<reference key="NSSuperview"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSegmentedCell" key="NSCell" id="211272396">
 										<int key="NSCellFlags">67239424</int>
@@ -685,7 +675,9 @@
 						<reference ref="729141644"/>
 						<reference ref="764949265"/>
 					</object>
-					<reference key="NSToolbarIBSelectableItems" ref="0"/>
+					<object class="NSArray" key="NSToolbarIBSelectableItems" id="0">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+					</object>
 				</object>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{340, 340}</string>
@@ -948,15 +940,6 @@
 									<reference key="NSOnImage" ref="852972005"/>
 									<reference key="NSMixedImage" ref="218295580"/>
 								</object>
-								<object class="NSMenuItem" id="29406775">
-									<reference key="NSMenu" ref="7402560"/>
-									<string key="NSTitle">Unlock dupeGuru</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="852972005"/>
-									<reference key="NSMixedImage" ref="218295580"/>
-								</object>
 								<object class="NSMenuItem" id="688262014">
 									<reference key="NSMenu" ref="7402560"/>
 									<string key="NSTitle">Check for update...</string>
@@ -1658,14 +1641,6 @@
 					</object>
 					<int key="connectionID">139</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="77446904"/>
-						<reference key="destination" ref="436112936"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">hideOtherApplications:</string>
@@ -1938,22 +1913,6 @@
 					</object>
 					<int key="connectionID">748</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unlockApp:</string>
-						<reference key="source" ref="91622651"/>
-						<reference key="destination" ref="29406775"/>
-					</object>
-					<int key="connectionID">755</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">unlockMenuItem</string>
-						<reference key="source" ref="91622651"/>
-						<reference key="destination" ref="29406775"/>
-					</object>
-					<int key="connectionID">756</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">app</string>
@@ -2306,6 +2265,14 @@
 					</object>
 					<int key="connectionID">1231</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showAboutBox:</string>
+						<reference key="source" ref="91622651"/>
+						<reference key="destination" ref="436112936"/>
+					</object>
+					<int key="connectionID">1232</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2469,7 +2436,6 @@
 							<reference ref="873971427"/>
 							<reference ref="941940359"/>
 							<reference ref="234345427"/>
-							<reference ref="29406775"/>
 							<reference ref="688262014"/>
 						</object>
 						<reference key="parent" ref="162097048"/>
@@ -2519,11 +2485,6 @@
 						<reference key="object" ref="234345427"/>
 						<reference key="parent" ref="7402560"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">754</int>
-						<reference key="object" ref="29406775"/>
-						<reference key="parent" ref="7402560"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">950</int>
 						<reference key="object" ref="688262014"/>
@@ -3404,8 +3365,6 @@
 					<string>739.ImportedFromIB2</string>
 					<string>740.IBPluginDependency</string>
 					<string>740.ImportedFromIB2</string>
-					<string>754.IBPluginDependency</string>
-					<string>754.ImportedFromIB2</string>
 					<string>872.IBPluginDependency</string>
 					<string>872.ImportedFromIB2</string>
 					<string>880.IBPluginDependency</string>
@@ -3492,7 +3451,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{294, 462}, {617, 227}}</string>
+					<string>{{294, 689}, {617, 0}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3572,7 +3531,7 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>{{152, 575}, {221, 193}}</string>
+					<string>{{152, 595}, {221, 173}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3676,8 +3635,6 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -3721,7 +3678,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1231</int>
+			<int key="maxID">1232</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3828,13 +3785,13 @@
 					<string key="className">AppDelegateBase</string>
 					<string key="superclassName">NSObject</string>
 					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">unlockApp:</string>
+						<string key="NS.key.0">showAboutBox:</string>
 						<string key="NS.object.0">id</string>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">unlockApp:</string>
+						<string key="NS.key.0">showAboutBox:</string>
 						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">unlockApp:</string>
+							<string key="name">showAboutBox:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 					</object>
@@ -3845,14 +3802,12 @@
 							<string>py</string>
 							<string>recentDirectories</string>
 							<string>result</string>
-							<string>unlockMenuItem</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>PyDupeGuruBase</string>
 							<string>RecentDirectories</string>
 							<string>ResultWindowBase</string>
-							<string>NSMenuItem</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -3862,7 +3817,6 @@
 							<string>py</string>
 							<string>recentDirectories</string>
 							<string>result</string>
-							<string>unlockMenuItem</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3878,10 +3832,6 @@
 								<string key="name">result</string>
 								<string key="candidateClassName">ResultWindowBase</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">unlockMenuItem</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -3937,7 +3887,7 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">PyApp</string>
-					<string key="superclassName">PyRegistrable</string>
+					<string key="superclassName">PyFairware</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">../PyApp.h</string>
@@ -3945,7 +3895,7 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">PyApp</string>
-					<string key="superclassName">PyRegistrable</string>
+					<string key="superclassName">PyFairware</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBUserSource</string>
 						<string key="minorKey"/>
@@ -3976,11 +3926,11 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">PyRegistrable</string>
+					<string key="className">PyFairware</string>
 					<string key="superclassName">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../PyRegistrable.h</string>
+						<string key="minorKey">../PyFairware.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
--- a/cocoa/me/AppDelegate.h
+++ b/cocoa/me/AppDelegate.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/me/AppDelegate.m
+++ b/cocoa/me/AppDelegate.m
@@ -1,14 +1,13 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "AppDelegate.h"
 #import "../../cocoalib/ProgressController.h"
-#import "../../cocoalib/RegistrationInterface.h"
 #import "../../cocoalib/Utils.h"
 #import "../../cocoalib/ValueTransformers.h"
 #import "../../cocoalib/Dialogs.h"
--- a/cocoa/me/Consts.h
+++ b/cocoa/me/Consts.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "../base/Consts.h"
--- a/cocoa/me/DirectoryPanel.h
+++ b/cocoa/me/DirectoryPanel.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/me/DirectoryPanel.m
+++ b/cocoa/me/DirectoryPanel.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "DirectoryPanel.h"
--- a/cocoa/me/Info.plist
+++ b/cocoa/me/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>5.9.1</string>
+	<string>5.10.4</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
--- a/cocoa/me/PyDupeGuru.h
+++ b/cocoa/me/PyDupeGuru.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/me/ResultWindow.h
+++ b/cocoa/me/ResultWindow.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/me/ResultWindow.m
+++ b/cocoa/me/ResultWindow.m
@@ -1,15 +1,14 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_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"
@@ -38,12 +37,14 @@ http://www.hardcoded.net/licenses/hs_license
    [columnsOrder addObject:@"2"];
    [columnsOrder addObject:@"3"];
    [columnsOrder addObject:@"4"];
+    [columnsOrder addObject:@"6"];
    [columnsOrder addObject:@"15"];
    NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
-    [columnsWidth setObject:i2n(214) forKey:@"0"];
+    [columnsWidth setObject:i2n(235) forKey:@"0"];
    [columnsWidth setObject:i2n(63) forKey:@"2"];
    [columnsWidth setObject:i2n(50) forKey:@"3"];
    [columnsWidth setObject:i2n(50) forKey:@"4"];
+    [columnsWidth setObject:i2n(40) forKey:@"6"];
    [columnsWidth setObject:i2n(57) forKey:@"15"];
    [self restoreColumnsPosition:columnsOrder widths:columnsWidth];
 }
--- a/cocoa/me/dg_cocoa.py
+++ b/cocoa/me/dg_cocoa.py
@@ -1,8 +1,8 @@
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from hscommon.cocoa import signature

--- a/cocoa/me/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/me/dupeguru.xcodeproj/project.pbxproj
@@ -43,11 +43,12 @@
 		CE49DEF60FDFEB810098617B /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */; };
 		CE4B59C81119919700C06C9E /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */; };
 		CE4B59C91119919700C06C9E /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B59C61119919700C06C9E /* progress.xib */; };
+		CE4F934612CCA9470067A3AE /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE4F934512CCA9470067A3AE /* about.xib */; };
+		CE4F934912CCA96C0067A3AE /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4F934812CCA96C0067A3AE /* HSAboutBox.m */; };
 		CE515DF30FC6C12E00EC695D /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE10FC6C12E00EC695D /* Dialogs.m */; };
 		CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.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 */; };
 		CE515DFA0FC6C12E00EC695D /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DF00FC6C12E00EC695D /* Utils.m */; };
 		CE515DFB0FC6C12E00EC695D /* ValueTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515DF20FC6C12E00EC695D /* ValueTransformers.m */; };
 		CE515E1D0FC6C19300EC695D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE515E160FC6C19300EC695D /* AppDelegate.m */; };
@@ -57,11 +58,12 @@
 		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 */; };
+		CE74A12412537F06008A8DF0 /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE74A12212537F06008A8DF0 /* HSFairwareReminder.m */; };
+		CE74A12712537F2E008A8DF0 /* FairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE74A12512537F2E008A8DF0 /* FairwareReminder.xib */; };
 		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 */; };
 		CEB14D29124DFC2800FA7481 /* ResultTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CEB14D28124DFC2800FA7481 /* ResultTable.m */; };
-		CECC563B12144A9000ABF262 /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CECC563912144A9000ABF262 /* registration.xib */; };
 		CEDF07A3112493B200EE5BC0 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDF07A2112493B200EE5BC0 /* StatsLabel.m */; };
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
@@ -101,7 +103,6 @@
 		CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
 		CE003CBC11242D00004B0AA7 /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = "<group>"; };
 		CE003CBD11242D00004B0AA7 /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = "<group>"; };
-		CE003CBE11242D00004B0AA7 /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
 		CE003CC011242D00004B0AA7 /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
 		CE003CC111242D00004B0AA7 /* HSOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutlineView.m; sourceTree = "<group>"; };
 		CE003CC211242D00004B0AA7 /* NSIndexPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSIndexPathAdditions.h; sourceTree = "<group>"; };
@@ -131,6 +132,9 @@
 		CE49DEF30FDFEB810098617B /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
 		CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; };
 		CE4B59C61119919700C06C9E /* progress.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = progress.xib; sourceTree = "<group>"; };
+		CE4F934512CCA9470067A3AE /* about.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = about.xib; path = ../../cocoalib/xib/about.xib; sourceTree = SOURCE_ROOT; };
+		CE4F934712CCA96C0067A3AE /* HSAboutBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSAboutBox.h; path = ../../cocoalib/HSAboutBox.h; sourceTree = SOURCE_ROOT; };
+		CE4F934812CCA96C0067A3AE /* HSAboutBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSAboutBox.m; path = ../../cocoalib/HSAboutBox.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; };
@@ -140,8 +144,6 @@
 		CE515DE80FC6C12E00EC695D /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
 		CE515DE90FC6C12E00EC695D /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
 		CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CE515DEB0FC6C12E00EC695D /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
 		CE515DEF0FC6C12E00EC695D /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
 		CE515DF00FC6C12E00EC695D /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
 		CE515DF10FC6C12E00EC695D /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
@@ -161,13 +163,16 @@
 		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>"; };
+		CE74A12112537F06008A8DF0 /* HSFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareReminder.h; path = ../../cocoalib/HSFairwareReminder.h; sourceTree = SOURCE_ROOT; };
+		CE74A12212537F06008A8DF0 /* HSFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSFairwareReminder.m; path = ../../cocoalib/HSFairwareReminder.m; sourceTree = SOURCE_ROOT; };
+		CE74A12312537F06008A8DF0 /* PyFairware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyFairware.h; path = ../../cocoalib/PyFairware.h; sourceTree = SOURCE_ROOT; };
+		CE74A12612537F2E008A8DF0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
 		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>"; };
 		CEB14D26124DFC2800FA7481 /* PyResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTable.h; path = ../base/PyResultTable.h; sourceTree = SOURCE_ROOT; };
 		CEB14D27124DFC2800FA7481 /* ResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultTable.h; path = ../base/ResultTable.h; sourceTree = SOURCE_ROOT; };
 		CEB14D28124DFC2800FA7481 /* ResultTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultTable.m; path = ../base/ResultTable.m; sourceTree = SOURCE_ROOT; };
-		CECC563A12144A9000ABF262 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/registration.xib; sourceTree = SOURCE_ROOT; };
 		CED0A591111C9FD10020AD7D /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CEDF07A0112493B200EE5BC0 /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CEDF07A1112493B200EE5BC0 /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
@@ -347,7 +352,8 @@
 		CE4B59C41119919700C06C9E /* xib */ = {
 			isa = PBXGroup;
 			children = (
-				CECC563912144A9000ABF262 /* registration.xib */,
+				CE4F934512CCA9470067A3AE /* about.xib */,
+				CE74A12512537F2E008A8DF0 /* FairwareReminder.xib */,
 				CE4B59C51119919700C06C9E /* ErrorReportWindow.xib */,
 				CE4B59C61119919700C06C9E /* progress.xib */,
 			);
@@ -367,16 +373,18 @@
 				CE515DE10FC6C12E00EC695D /* Dialogs.m */,
 				CE515DE20FC6C12E00EC695D /* HSErrorReportWindow.h */,
 				CE515DE30FC6C12E00EC695D /* HSErrorReportWindow.m */,
+				CE74A12112537F06008A8DF0 /* HSFairwareReminder.h */,
+				CE74A12212537F06008A8DF0 /* HSFairwareReminder.m */,
+				CE74A12312537F06008A8DF0 /* PyFairware.h */,
+				CE4F934712CCA96C0067A3AE /* HSAboutBox.h */,
+				CE4F934812CCA96C0067A3AE /* HSAboutBox.m */,
 				CE003CB911242D00004B0AA7 /* NSEventAdditions.h */,
 				CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */,
 				CE515DE60FC6C12E00EC695D /* ProgressController.h */,
 				CE515DE70FC6C12E00EC695D /* ProgressController.m */,
 				CE515DE80FC6C12E00EC695D /* PyApp.h */,
-				CE003CBE11242D00004B0AA7 /* PyRegistrable.h */,
 				CE515DE90FC6C12E00EC695D /* RecentDirectories.h */,
 				CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */,
-				CE515DEB0FC6C12E00EC695D /* RegistrationInterface.h */,
-				CE515DEC0FC6C12E00EC695D /* RegistrationInterface.m */,
 				CE515DEF0FC6C12E00EC695D /* Utils.h */,
 				CE515DF00FC6C12E00EC695D /* Utils.m */,
 				CE515DF10FC6C12E00EC695D /* ValueTransformers.h */,
@@ -455,6 +463,7 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -491,7 +500,8 @@
 				CE4B59C81119919700C06C9E /* ErrorReportWindow.xib in Resources */,
 				CE4B59C91119919700C06C9E /* progress.xib in Resources */,
 				CE0A0C061175A24800DCA3C6 /* ProblemDialog.xib in Resources */,
-				CECC563B12144A9000ABF262 /* registration.xib in Resources */,
+				CE74A12712537F2E008A8DF0 /* FairwareReminder.xib in Resources */,
+				CE4F934612CCA9470067A3AE /* about.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -510,7 +520,6 @@
 				CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */,
 				CE515DF60FC6C12E00EC695D /* ProgressController.m in Sources */,
 				CE515DF70FC6C12E00EC695D /* RecentDirectories.m in Sources */,
-				CE515DF80FC6C12E00EC695D /* RegistrationInterface.m in Sources */,
 				CE515DFA0FC6C12E00EC695D /* Utils.m in Sources */,
 				CE515DFB0FC6C12E00EC695D /* ValueTransformers.m in Sources */,
 				CE515E1D0FC6C19300EC695D /* AppDelegate.m in Sources */,
@@ -531,18 +540,20 @@
 				CE0A0C041175A1DE00DCA3C6 /* ProblemDialog.m in Sources */,
 				CEB14D29124DFC2800FA7481 /* ResultTable.m in Sources */,
 				CE578303124DFC660004769C /* HSTableView.m in Sources */,
+				CE74A12412537F06008A8DF0 /* HSFairwareReminder.m in Sources */,
+				CE4F934912CCA96C0067A3AE /* HSAboutBox.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */

 /* Begin PBXVariantGroup section */
-		CECC563912144A9000ABF262 /* registration.xib */ = {
+		CE74A12512537F2E008A8DF0 /* FairwareReminder.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				CECC563A12144A9000ABF262 /* en */,
+				CE74A12612537F2E008A8DF0 /* en */,
 			);
-			name = registration.xib;
+			name = FairwareReminder.xib;
 			path = ../../cocoalib/xib;
 			sourceTree = SOURCE_ROOT;
 		};
--- a/cocoa/me/main.m
+++ b/cocoa/me/main.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/pe/AppDelegate.h
+++ b/cocoa/pe/AppDelegate.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/pe/AppDelegate.m
+++ b/cocoa/pe/AppDelegate.m
@@ -1,14 +1,13 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "AppDelegate.h"
 #import "ProgressController.h"
-#import "RegistrationInterface.h"
 #import "Utils.h"
 #import "ValueTransformers.h"
 #import "Consts.h"
--- a/cocoa/pe/Consts.h
+++ b/cocoa/pe/Consts.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "../base/Consts.h"
--- a/cocoa/pe/DetailsPanel.h
+++ b/cocoa/pe/DetailsPanel.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/pe/DetailsPanel.m
+++ b/cocoa/pe/DetailsPanel.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "Utils.h"
--- a/cocoa/pe/DirectoryPanel.h
+++ b/cocoa/pe/DirectoryPanel.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/pe/DirectoryPanel.m
+++ b/cocoa/pe/DirectoryPanel.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "DirectoryPanel.h"
--- a/cocoa/pe/Info.plist
+++ b/cocoa/pe/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>1.10.0</string>
+	<string>1.11.3</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
--- a/cocoa/pe/PyDupeGuru.h
+++ b/cocoa/pe/PyDupeGuru.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/pe/ResultWindow.h
+++ b/cocoa/pe/ResultWindow.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/pe/ResultWindow.m
+++ b/cocoa/pe/ResultWindow.m
@@ -1,15 +1,14 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "ResultWindow.h"
 #import "Dialogs.h"
 #import "ProgressController.h"
-#import "RegistrationInterface.h"
 #import "Utils.h"
 #import "AppDelegate.h"
 #import "Consts.h"
@@ -42,8 +41,8 @@ http://www.hardcoded.net/licenses/hs_license
    [columnsOrder addObject:@"4"];
    [columnsOrder addObject:@"6"];
    NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
-    [columnsWidth setObject:i2n(121) forKey:@"0"];
-    [columnsWidth setObject:i2n(120) forKey:@"1"];
+    [columnsWidth setObject:i2n(162) forKey:@"0"];
+    [columnsWidth setObject:i2n(142) forKey:@"1"];
    [columnsWidth setObject:i2n(63) forKey:@"2"];
    [columnsWidth setObject:i2n(73) forKey:@"4"];
    [columnsWidth setObject:i2n(58) forKey:@"6"];
@@ -64,13 +63,16 @@ http://www.hardcoded.net/licenses/hs_license
    [_py setIgnoreHardlinkMatches:n2b([ud objectForKey:@"ignoreHardlinkMatches"])];
    [_py setMatchScaled:[ud objectForKey:@"matchScaled"]];
    int r = n2i([py doScan]);
-    if (r != 0)
+    if (r != 0) {
        [[ProgressController mainProgressController] hide];
-    if (r == 3)
-    {
+    }
+    if (r == 3) {
        [Dialogs showMessage:@"The selected directories contain no scannable file."];
        [app toggleDirectories:nil];
    }
+    if (r == 4) {
+        [Dialogs showMessage:@"The iPhoto application couldn't be found."];
+    }
 }

 - (IBAction)toggleDirectories:(id)sender
--- a/cocoa/pe/dg_cocoa.py
+++ b/cocoa/pe/dg_cocoa.py
@@ -1,8 +1,8 @@
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
 from core_pe import app_cocoa as app_pe_cocoa
--- a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
@@ -17,6 +17,8 @@
 		CE0C2AC81177021600BC749F /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0C2AC71177021600BC749F /* ProblemDialog.xib */; };
 		CE15C8A80ADEB8B50061D4A5 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
 		CE15C8C00ADEB8D40061D4A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
+		CE1EB5FE12537F9D0034AABB /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1EB5FC12537F9D0034AABB /* HSFairwareReminder.m */; };
+		CE1EB60112537FB90034AABB /* FairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE1EB5FF12537FB90034AABB /* FairwareReminder.xib */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
 		CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; };
 		CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; };
@@ -31,7 +33,6 @@
 		CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.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 */; };
 		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 */; };
@@ -40,7 +41,6 @@
 		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 */; };
-		CE895D7B12144A7800E74705 /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE895D7912144A7800E74705 /* registration.xib */; };
 		CE95865F112C516400F95FD2 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE95865D112C516400F95FD2 /* StatsLabel.m */; };
 		CE9EA7561122C96C008CD2BC /* HSGUIController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7441122C96C008CD2BC /* HSGUIController.m */; };
 		CE9EA7571122C96C008CD2BC /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7461122C96C008CD2BC /* HSOutline.m */; };
@@ -51,6 +51,8 @@
 		CE9EA75C1122C96C008CD2BC /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7551122C96C008CD2BC /* NSTableViewAdditions.m */; };
 		CE9EA7721122CA0B008CD2BC /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */; };
 		CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */; };
+		CEC9DB4712CCAA6B003102F0 /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEC9DB4612CCAA6B003102F0 /* about.xib */; };
+		CEC9DB4C12CCAA7D003102F0 /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.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 */; };
@@ -97,6 +99,10 @@
 		CE0C2AC71177021600BC749F /* ProblemDialog.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ProblemDialog.xib; path = ../base/xib/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
 		CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
 		CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
+		CE1EB5FB12537F9D0034AABB /* HSFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareReminder.h; path = ../../cocoalib/HSFairwareReminder.h; sourceTree = SOURCE_ROOT; };
+		CE1EB5FC12537F9D0034AABB /* HSFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSFairwareReminder.m; path = ../../cocoalib/HSFairwareReminder.m; sourceTree = SOURCE_ROOT; };
+		CE1EB5FD12537F9D0034AABB /* PyFairware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyFairware.h; path = ../../cocoalib/PyFairware.h; sourceTree = SOURCE_ROOT; };
+		CE1EB60012537FB90034AABB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
 		CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
 		CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
@@ -120,8 +126,6 @@
 		CE80DB230FC192D60086DCA6 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
 		CE80DB240FC192D60086DCA6 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
 		CE80DB250FC192D60086DCA6 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CE80DB260FC192D60086DCA6 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
 		CE80DB2A0FC192D60086DCA6 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
 		CE80DB2B0FC192D60086DCA6 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
 		CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
@@ -139,7 +143,6 @@
 		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>"; };
-		CE895D7A12144A7800E74705 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/registration.xib; sourceTree = SOURCE_ROOT; };
 		CE958659112C516400F95FD2 /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CE95865C112C516400F95FD2 /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CE95865D112C516400F95FD2 /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
@@ -153,7 +156,6 @@
 		CE9EA74A1122C96C008CD2BC /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
 		CE9EA74C1122C96C008CD2BC /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = "<group>"; };
 		CE9EA74D1122C96C008CD2BC /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = "<group>"; };
-		CE9EA74E1122C96C008CD2BC /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
 		CE9EA7501122C96C008CD2BC /* HSOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutlineView.h; sourceTree = "<group>"; };
 		CE9EA7511122C96C008CD2BC /* HSOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutlineView.m; sourceTree = "<group>"; };
 		CE9EA7521122C96C008CD2BC /* NSIndexPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSIndexPathAdditions.h; sourceTree = "<group>"; };
@@ -165,6 +167,9 @@
 		CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
 		CEBAE4230FDA97E000B7887D /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
 		CEBAE4240FDA97E000B7887D /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; };
+		CEC9DB4612CCAA6B003102F0 /* about.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = about.xib; path = ../../cocoalib/xib/about.xib; sourceTree = SOURCE_ROOT; };
+		CEC9DB4A12CCAA7D003102F0 /* HSAboutBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSAboutBox.h; path = ../../cocoalib/HSAboutBox.h; sourceTree = SOURCE_ROOT; };
+		CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSAboutBox.m; path = ../../cocoalib/HSAboutBox.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>"; };
@@ -297,7 +302,8 @@
 		CE7AC9141119911200D02F6C /* xib */ = {
 			isa = PBXGroup;
 			children = (
-				CE895D7912144A7800E74705 /* registration.xib */,
+				CEC9DB4612CCAA6B003102F0 /* about.xib */,
+				CE1EB5FF12537FB90034AABB /* FairwareReminder.xib */,
 				CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */,
 				CE7AC9161119911200D02F6C /* progress.xib */,
 			);
@@ -323,14 +329,16 @@
 				CE80DB1C0FC192D60086DCA6 /* Dialogs.m */,
 				CE80DB1D0FC192D60086DCA6 /* HSErrorReportWindow.h */,
 				CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */,
+				CE1EB5FB12537F9D0034AABB /* HSFairwareReminder.h */,
+				CE1EB5FC12537F9D0034AABB /* HSFairwareReminder.m */,
+				CE1EB5FD12537F9D0034AABB /* PyFairware.h */,
+				CEC9DB4A12CCAA7D003102F0 /* HSAboutBox.h */,
+				CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.m */,
 				CE80DB210FC192D60086DCA6 /* ProgressController.h */,
 				CE80DB220FC192D60086DCA6 /* ProgressController.m */,
 				CE80DB230FC192D60086DCA6 /* PyApp.h */,
-				CE9EA74E1122C96C008CD2BC /* PyRegistrable.h */,
 				CE80DB240FC192D60086DCA6 /* RecentDirectories.h */,
 				CE80DB250FC192D60086DCA6 /* RecentDirectories.m */,
-				CE80DB260FC192D60086DCA6 /* RegistrationInterface.h */,
-				CE80DB270FC192D60086DCA6 /* RegistrationInterface.m */,
 				CE80DB2A0FC192D60086DCA6 /* Utils.h */,
 				CE80DB2B0FC192D60086DCA6 /* Utils.m */,
 				CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */,
@@ -462,6 +470,7 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -499,7 +508,8 @@
 				CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */,
 				CE7AC9191119911200D02F6C /* progress.xib in Resources */,
 				CE0C2AC81177021600BC749F /* ProblemDialog.xib in Resources */,
-				CE895D7B12144A7800E74705 /* registration.xib in Resources */,
+				CE1EB60112537FB90034AABB /* FairwareReminder.xib in Resources */,
+				CEC9DB4712CCAA6B003102F0 /* about.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -519,7 +529,6 @@
 				CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */,
 				CE80DB310FC192D60086DCA6 /* ProgressController.m in Sources */,
 				CE80DB320FC192D60086DCA6 /* RecentDirectories.m in Sources */,
-				CE80DB330FC192D60086DCA6 /* RegistrationInterface.m in Sources */,
 				CE80DB350FC192D60086DCA6 /* Utils.m in Sources */,
 				CE80DB360FC192D60086DCA6 /* ValueTransformers.m in Sources */,
 				CE80DB470FC193650086DCA6 /* NSNotificationAdditions.m in Sources */,
@@ -542,18 +551,20 @@
 				CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */,
 				CEF12A7E124DFD400087B51D /* HSTableView.m in Sources */,
 				CEF12A84124DFD620087B51D /* ResultTable.m in Sources */,
+				CE1EB5FE12537F9D0034AABB /* HSFairwareReminder.m in Sources */,
+				CEC9DB4C12CCAA7D003102F0 /* HSAboutBox.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */

 /* Begin PBXVariantGroup section */
-		CE895D7912144A7800E74705 /* registration.xib */ = {
+		CE1EB5FF12537FB90034AABB /* FairwareReminder.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				CE895D7A12144A7800E74705 /* en */,
+				CE1EB60012537FB90034AABB /* en */,
 			);
-			name = registration.xib;
+			name = FairwareReminder.xib;
 			path = ../../cocoalib/xib;
 			sourceTree = SOURCE_ROOT;
 		};
--- a/cocoa/pe/main.m
+++ b/cocoa/pe/main.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/se/AppDelegate.h
+++ b/cocoa/se/AppDelegate.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/se/AppDelegate.m
+++ b/cocoa/se/AppDelegate.m
@@ -1,14 +1,13 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "AppDelegate.h"
 #import "../../cocoalib/ProgressController.h"
-#import "../../cocoalib/RegistrationInterface.h"
 #import "../../cocoalib/Utils.h"
 #import "../../cocoalib/ValueTransformers.h"
 #import "DetailsPanel.h"
--- a/cocoa/se/Info.plist
+++ b/cocoa/se/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>2.12.0</string>
+	<string>2.12.2</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
--- a/cocoa/se/PyDupeGuru.h
+++ b/cocoa/se/PyDupeGuru.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/se/ResultWindow.h
+++ b/cocoa/se/ResultWindow.h
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/cocoa/se/ResultWindow.m
+++ b/cocoa/se/ResultWindow.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import "ResultWindow.h"
--- a/cocoa/se/dg_cocoa.py
+++ b/cocoa/se/dg_cocoa.py
@@ -1,8 +1,8 @@
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from hscommon.cocoa import signature

--- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj
@@ -12,6 +12,8 @@
 		CE073F6309CAE1A3005C1D2F /* dupeguru_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_help */; };
 		CE19BC6311199231007CCEB0 /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE19BC6011199231007CCEB0 /* ErrorReportWindow.xib */; };
 		CE19BC6411199231007CCEB0 /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE19BC6111199231007CCEB0 /* progress.xib */; };
+		CE27D3C112CCA42500859E67 /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE27D3C012CCA42500859E67 /* about.xib */; };
+		CE27D3C412CCA43800859E67 /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CE27D3C312CCA43800859E67 /* HSAboutBox.m */; };
 		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 */; };
@@ -30,10 +32,11 @@
 		CE76FDD4111EE3A7006618EA /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */; };
 		CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDDE111EE42F006618EA /* HSOutline.m */; };
 		CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDF6111EE561006618EA /* NSEventAdditions.m */; };
+		CE79638612536C94008D405B /* FairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE79638412536C94008D405B /* FairwareReminder.xib */; };
+		CE79638C12536F4E008D405B /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE79638B12536F4E008D405B /* HSFairwareReminder.m */; };
 		CE8C53BC117324CE0011B41F /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE8C53BB117324CE0011B41F /* HSTable.m */; };
 		CE91F216113BC22D0010360B /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE91F214113BC22D0010360B /* StatsLabel.m */; };
 		CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEAC6810109B0B7E00B43C85 /* Preferences.xib */; };
-		CEBC6C3912144A4B007B43AE /* registration.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEBC6C3712144A4B007B43AE /* registration.xib */; };
 		CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */; };
 		CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */; };
 		CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE7EA120FE675C80004E467 /* DetailsPanel.m */; };
@@ -47,7 +50,6 @@
 		CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.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 */; };
 		CEFC7FA50FC9517500CD5728 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F9B0FC9517500CD5728 /* Utils.m */; };
 		CEFC7FA60FC9517500CD5728 /* ValueTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F9D0FC9517500CD5728 /* ValueTransformers.m */; };
 		CEFC7FB90FC951A700CD5728 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7FB20FC951A700CD5728 /* AppDelegate.m */; };
@@ -79,6 +81,9 @@
 		CE073F5409CAE1A3005C1D2F /* dupeguru_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_help; path = ../../help_se/dupeguru_help; sourceTree = "<group>"; };
 		CE19BC6011199231007CCEB0 /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; };
 		CE19BC6111199231007CCEB0 /* progress.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = progress.xib; sourceTree = "<group>"; };
+		CE27D3C012CCA42500859E67 /* about.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = about.xib; path = ../../cocoalib/xib/about.xib; sourceTree = SOURCE_ROOT; };
+		CE27D3C212CCA43800859E67 /* HSAboutBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSAboutBox.h; path = ../../cocoalib/HSAboutBox.h; sourceTree = SOURCE_ROOT; };
+		CE27D3C312CCA43800859E67 /* HSAboutBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSAboutBox.m; path = ../../cocoalib/HSAboutBox.m; sourceTree = SOURCE_ROOT; };
 		CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
 		CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
@@ -114,13 +119,16 @@
 		CE76FDDE111EE42F006618EA /* HSOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutline.m; sourceTree = "<group>"; };
 		CE76FDF5111EE561006618EA /* NSEventAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSEventAdditions.h; path = ../../cocoalib/NSEventAdditions.h; sourceTree = SOURCE_ROOT; };
 		CE76FDF6111EE561006618EA /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; };
+		CE79638212536C6E008D405B /* PyFairware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyFairware.h; path = ../../cocoalib/PyFairware.h; sourceTree = SOURCE_ROOT; };
+		CE79638512536C94008D405B /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/FairwareReminder.xib; sourceTree = SOURCE_ROOT; };
+		CE79638A12536F4E008D405B /* HSFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareReminder.h; path = ../../cocoalib/HSFairwareReminder.h; sourceTree = SOURCE_ROOT; };
+		CE79638B12536F4E008D405B /* HSFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSFairwareReminder.m; path = ../../cocoalib/HSFairwareReminder.m; sourceTree = SOURCE_ROOT; };
 		CE8C53B61173248F0011B41F /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
 		CE8C53BB117324CE0011B41F /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
 		CE91F210113BC22D0010360B /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyStatsLabel.h; path = ../base/PyStatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CE91F213113BC22D0010360B /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; };
 		CE91F214113BC22D0010360B /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
 		CEAC6810109B0B7E00B43C85 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = xib/Preferences.xib; sourceTree = "<group>"; };
-		CEBC6C3812144A4B007B43AE /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../../cocoalib/en.lproj/registration.xib; sourceTree = SOURCE_ROOT; };
 		CEBE4D72111F0EE1009AAC6D /* HSWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSWindowController.h; sourceTree = "<group>"; };
 		CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSWindowController.m; sourceTree = "<group>"; };
 		CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; };
@@ -140,11 +148,8 @@
 		CEFC7F900FC9517500CD5728 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
 		CEFC7F910FC9517500CD5728 /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
 		CEFC7F920FC9517500CD5728 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F930FC9517500CD5728 /* PyRegistrable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyRegistrable.h; path = ../../cocoalib/PyRegistrable.h; sourceTree = SOURCE_ROOT; };
 		CEFC7F940FC9517500CD5728 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
 		CEFC7F950FC9517500CD5728 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
-		CEFC7F960FC9517500CD5728 /* RegistrationInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegistrationInterface.h; path = ../../cocoalib/RegistrationInterface.h; sourceTree = SOURCE_ROOT; };
-		CEFC7F970FC9517500CD5728 /* RegistrationInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegistrationInterface.m; path = ../../cocoalib/RegistrationInterface.m; sourceTree = SOURCE_ROOT; };
 		CEFC7F9A0FC9517500CD5728 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../cocoalib/Utils.h; sourceTree = SOURCE_ROOT; };
 		CEFC7F9B0FC9517500CD5728 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../../cocoalib/Utils.m; sourceTree = SOURCE_ROOT; };
 		CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueTransformers.h; path = ../../cocoalib/ValueTransformers.h; sourceTree = SOURCE_ROOT; };
@@ -252,7 +257,8 @@
 		CE19BC5F11199231007CCEB0 /* xib */ = {
 			isa = PBXGroup;
 			children = (
-				CEBC6C3712144A4B007B43AE /* registration.xib */,
+				CE27D3C012CCA42500859E67 /* about.xib */,
+				CE79638412536C94008D405B /* FairwareReminder.xib */,
 				CE19BC6011199231007CCEB0 /* ErrorReportWindow.xib */,
 				CE19BC6111199231007CCEB0 /* progress.xib */,
 			);
@@ -348,14 +354,16 @@
 				CEFC7F8B0FC9517500CD5728 /* Dialogs.m */,
 				CEFC7F8C0FC9517500CD5728 /* HSErrorReportWindow.h */,
 				CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */,
+				CE79638A12536F4E008D405B /* HSFairwareReminder.h */,
+				CE79638B12536F4E008D405B /* HSFairwareReminder.m */,
+				CE79638212536C6E008D405B /* PyFairware.h */,
+				CE27D3C212CCA43800859E67 /* HSAboutBox.h */,
+				CE27D3C312CCA43800859E67 /* HSAboutBox.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 */,
 				CEFC7F9A0FC9517500CD5728 /* Utils.h */,
 				CEFC7F9B0FC9517500CD5728 /* Utils.m */,
 				CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */,
@@ -426,6 +434,7 @@
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -462,7 +471,8 @@
 				CE19BC6311199231007CCEB0 /* ErrorReportWindow.xib in Resources */,
 				CE19BC6411199231007CCEB0 /* progress.xib in Resources */,
 				CE647E591173026F006D28BA /* ProblemDialog.xib in Resources */,
-				CEBC6C3912144A4B007B43AE /* registration.xib in Resources */,
+				CE79638612536C94008D405B /* FairwareReminder.xib in Resources */,
+				CE27D3C112CCA42500859E67 /* about.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -480,7 +490,6 @@
 				CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */,
 				CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */,
 				CEFC7FA20FC9517500CD5728 /* RecentDirectories.m in Sources */,
-				CEFC7FA30FC9517500CD5728 /* RegistrationInterface.m in Sources */,
 				CEFC7FA50FC9517500CD5728 /* Utils.m in Sources */,
 				CEFC7FA60FC9517500CD5728 /* ValueTransformers.m in Sources */,
 				CEFC7FB90FC951A700CD5728 /* AppDelegate.m in Sources */,
@@ -501,18 +510,20 @@
 				CE8C53BC117324CE0011B41F /* HSTable.m in Sources */,
 				CE6DD4E7124CA3070089A48D /* ResultTable.m in Sources */,
 				CE6DD547124CAF1F0089A48D /* HSTableView.m in Sources */,
+				CE79638C12536F4E008D405B /* HSFairwareReminder.m in Sources */,
+				CE27D3C412CCA43800859E67 /* HSAboutBox.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */

 /* Begin PBXVariantGroup section */
-		CEBC6C3712144A4B007B43AE /* registration.xib */ = {
+		CE79638412536C94008D405B /* FairwareReminder.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				CEBC6C3812144A4B007B43AE /* en */,
+				CE79638512536C94008D405B /* en */,
 			);
-			name = registration.xib;
+			name = FairwareReminder.xib;
 			path = ../../cocoalib/xib;
 			sourceTree = SOURCE_ROOT;
 		};
--- a/cocoa/se/main.m
+++ b/cocoa/se/main.m
@@ -1,9 +1,9 @@
 /* 
 Copyright 2010 Hardcoded Software (http://www.hardcoded.net)

-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+This software is licensed under the "BSD" 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
+http://www.hardcoded.net/licenses/bsd_license
 */

 #import <Cocoa/Cocoa.h>
--- a/configure.py
+++ b/configure.py
@@ -3,9 +3,9 @@
 # Created On: 2009-12-30
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import sys
 from optparse import OptionParser
--- a/core/app.py
+++ b/core/app.py
@@ -2,9 +2,9 @@
 # Created On: 2006/11/11
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import os
 import os.path as op
@@ -13,7 +13,7 @@ import subprocess
 import re

 from send2trash import send2trash
-from hscommon.reg import RegistrableApplication, RegistrationRequired
+from hscommon.reg import RegistrableApplication
 from hscommon.notify import Broadcaster
 from hsutil import io, files
 from hsutil.path import Path
@@ -32,10 +32,8 @@ class NoScannableFileError(Exception):
    pass

 class DupeGuru(RegistrableApplication, Broadcaster):
-    DEMO_LIMIT_DESC = "In the demo version, only 10 duplicates per session can be sent to the recycle bin, moved or copied."
-    
-    def __init__(self, data_module, appdata, appid):
-        RegistrableApplication.__init__(self, appid)
+    def __init__(self, data_module, appdata):
+        RegistrableApplication.__init__(self, appid=1)
        Broadcaster.__init__(self)
        self.appdata = appdata
        if not op.exists(self.appdata):
@@ -44,7 +42,6 @@ class DupeGuru(RegistrableApplication, Broadcaster):
        self.directories = directories.Directories()
        self.results = results.Results(data_module)
        self.scanner = scanner.Scanner()
-        self.action_count = 0
        self.options = {
            'escape_filter_regexp': True,
            'clean_empty_dirs': False,
@@ -52,15 +49,6 @@ class DupeGuru(RegistrableApplication, Broadcaster):
        }
        self.selected_dupes = []
    
-    def _demo_check(self):
-        if self.registered:
-            return
-        count = self.results.mark_count
-        if count + self.action_count > 10:
-            raise RegistrationRequired()
-        else:
-            self.action_count += count
-    
    def _do_delete(self, j, replace_with_hardlinks):
        def op(dupe):
            j.add_progress()
@@ -125,7 +113,11 @@ class DupeGuru(RegistrableApplication, Broadcaster):
        seen_inodes = set()
        result = []
        for file in files:
+            try:
                inode = io.stat(file.path).st_ino
+            except OSError:
+                # The file was probably deleted or something
+                continue
            if inode not in seen_inodes:
                seen_inodes.add(inode)
                result.append(file)
@@ -206,12 +198,10 @@ class DupeGuru(RegistrableApplication, Broadcaster):
            j.start_job(self.results.mark_count)
            self.results.perform_on_marked(op, not copy)
        
-        self._demo_check()
        jobid = JOB_COPY if copy else JOB_MOVE
        self._start_job(jobid, do)
    
    def delete_marked(self, replace_with_hardlinks=False):
-        self._demo_check()
        self._start_job(JOB_DELETE, self._do_delete, replace_with_hardlinks)
    
    def export_to_xhtml(self, column_ids):
@@ -363,6 +353,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
        if not self.directories.has_any_file():
            raise NoScannableFileError()
        self.results.groups = []
+        self.notify('results_changed')
        self._start_job(JOB_SCAN, do)
    
    def toggle_selected_mark_state(self):
--- a/core/app_cocoa.py
+++ b/core/app_cocoa.py
@@ -2,19 +2,19 @@
 # Created On: 2006/11/11
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import logging
 import os.path as op

-from hscommon import cocoa, job
+from jobprogress import job
+from hscommon import cocoa
 from hscommon.cocoa import install_exception_hook
 from hscommon.cocoa.objcmin import (NSNotificationCenter, NSUserDefaults,
    NSSearchPathForDirectoriesInDomains, NSApplicationSupportDirectory, NSUserDomainMask,
    NSWorkspace)
-from hscommon.reg import RegistrationRequired

 from . import app

@@ -26,24 +26,15 @@ JOBID2TITLE = {
    app.JOB_DELETE: "Sending to Trash",
 }

-def demo_method(method):
-    def wrapper(self, *args, **kwargs):
-        try:
-            return method(self, *args, **kwargs)
-        except RegistrationRequired:
-            NSNotificationCenter.defaultCenter().postNotificationName_object_('RegistrationRequired', self)
-    
-    return wrapper
-
 class DupeGuru(app.DupeGuru):
-    def __init__(self, data_module, appdata_subdir, appid):
+    def __init__(self, data_module, appdata_subdir):
        LOGGING_LEVEL = logging.DEBUG if NSUserDefaults.standardUserDefaults().boolForKey_('debug') else logging.WARNING
        logging.basicConfig(level=LOGGING_LEVEL, format='%(levelname)s %(message)s')
        logging.debug('started in debug mode')
        install_exception_hook()
        appsupport = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, True)[0]
        appdata = op.join(appsupport, appdata_subdir)
-        app.DupeGuru.__init__(self, data_module, appdata, appid)
+        app.DupeGuru.__init__(self, data_module, appdata)
        self.progress = cocoa.ThreadedJobPerformer()
    
    #--- Override
@@ -67,9 +58,6 @@ class DupeGuru(app.DupeGuru):
            NSNotificationCenter.defaultCenter().postNotificationName_object_userInfo_('JobStarted', self, ud)
    
    #---Public
-    copy_or_move_marked = demo_method(app.DupeGuru.copy_or_move_marked)
-    delete_marked = demo_method(app.DupeGuru.delete_marked)
-    
    def start_scanning(self):
        self._select_dupes([])
        try:
--- a/core/app_cocoa_inter.py
+++ b/core/app_cocoa_inter.py
@@ -3,13 +3,13 @@
 # Created On: 2010-02-02
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 # Common interface for all editions' dg_cocoa unit.

-from hscommon.cocoa.inter import signature, PyTable, PyOutline, PyGUIObject, PyRegistrable
+from hscommon.cocoa.inter import signature, PyTable, PyOutline, PyGUIObject, PyFairware

 from .gui.details_panel import DetailsPanel
 from .gui.directory_tree import DirectoryTree
@@ -22,7 +22,7 @@ from .gui.stats_label import StatsLabel
 from core import app, app_cocoa, data, directories, engine, export, ignore, results, fs, scanner
 from hsutil import conflict

-class PyDupeGuruBase(PyRegistrable):
+class PyDupeGuruBase(PyFairware):
    #---Directories
    def addDirectory_(self, directory):
        return self.py.add_directory(directory)
@@ -142,11 +142,15 @@ class PyDupeGuruBase(PyRegistrable):
        except AttributeError:
            # I have *no idea* why this can possible happen (last_progress is always set by
            # create_job() *before* any threaded job notification, which shows the progress panel,
-            # is sent), but it happens anyway, so there we go.
+            # is sent), but it happens anyway, so there we go. ref: #106
            return -1
    
    def getJobDesc(self):
+        try:
            return self.py.progress.last_desc
+        except AttributeError:
+            # see getJobProgress
+            return ''
    
    def cancelJob(self):
        self.py.progress.job_cancelled = True
--- a/core/data.py
+++ b/core/data.py
@@ -2,9 +2,9 @@
 # Created On: 2006/03/15
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from hsutil.str import format_time, FT_DECIMAL, format_size

--- a/core/directories.py
+++ b/core/directories.py
@@ -2,9 +2,9 @@
 # Created On: 2006/02/27
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from xml.etree import ElementTree as ET

--- a/core/engine.py
+++ b/core/engine.py
@@ -2,9 +2,9 @@
 # Created On: 2006/01/29
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license


 import difflib
@@ -16,7 +16,7 @@ from unicodedata import normalize

 from hsutil.misc import flatten
 from hsutil.str import multi_replace
-from hscommon import job
+from jobprogress import job

 (WEIGHT_WORDS,
 MATCH_SIMILAR_WORDS,
--- a/core/export.py
+++ b/core/export.py
@@ -2,9 +2,9 @@
 # Created On: 2006/09/16
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import os.path as op
 from tempfile import mkdtemp
--- a/core/fs.py
+++ b/core/fs.py
@@ -3,9 +3,9 @@
 # Created On: 2009-10-22
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 # This is a fork from hsfs. The reason for this fork is that hsfs has been designed for musicGuru
 # and was re-used for dupeGuru. The problem is that hsfs is way over-engineered for dupeGuru,
--- a/core/gui/base.py
+++ b/core/gui/base.py
@@ -3,9 +3,9 @@
 # Created On: 2010-02-06
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from hscommon.notify import Listener

--- a/core/gui/details_panel.py
+++ b/core/gui/details_panel.py
@@ -3,9 +3,9 @@
 # Created On: 2010-02-05
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from .base import GUIObject

--- a/core/gui/directory_tree.py
+++ b/core/gui/directory_tree.py
@@ -3,11 +3,11 @@
 # Created On: 2010-02-06
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

-from hsgui.tree import Tree, Node
+from hscommon.gui.tree import Tree, Node

 from ..directories import STATE_NORMAL, STATE_REFERENCE, STATE_EXCLUDED
 from .base import GUIObject
--- a/core/gui/problem_dialog.py
+++ b/core/gui/problem_dialog.py
@@ -3,9 +3,9 @@
 # Created On: 2010-04-12
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from hscommon.notify import Broadcaster

--- a/core/gui/problem_table.py
+++ b/core/gui/problem_table.py
@@ -3,12 +3,12 @@
 # Created On: 2010-04-12
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from hscommon.notify import Listener
-from hsgui.table import GUITable, Row
+from hscommon.gui.table import GUITable, Row

 class ProblemTable(GUITable, Listener):
    def __init__(self, view, problem_dialog):
@@ -31,7 +31,6 @@ class ProblemTable(GUITable, Listener):
    #--- Event handlers
    def problems_changed(self):
        self.refresh()
-        self.view.refresh()
    

 class ProblemRow(Row):
--- a/core/gui/result_table.py
+++ b/core/gui/result_table.py
@@ -3,13 +3,13 @@
 # Created On: 2010-02-11
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from operator import attrgetter

-from hsgui.table import GUITable, Row
+from hscommon.gui.table import GUITable, Row

 from .base import GUIObject

@@ -87,7 +87,6 @@ class ResultTable(GUIObject, GUITable):
    
    def _refresh_with_view(self):
        self.refresh()
-        self.view.refresh()
        self.view.show_selected_row()
    
    #--- Public
@@ -139,7 +138,6 @@ class ResultTable(GUIObject, GUITable):
            return
        self._delta_values = value
        self.refresh()
-        self.view.refresh()
    
    @property
    def selected_dupe_count(self):
@@ -156,7 +154,7 @@ class ResultTable(GUIObject, GUITable):
        # What we want to to here is that instead of restoring selected *dupes* after refresh, we
        # restore selected *paths*.
        indexes = self.selected_indexes
-        self.refresh()
+        self.refresh(refresh_view=False)
        self.select(indexes)
        self.view.refresh()
    
--- a/core/gui/stats_label.py
+++ b/core/gui/stats_label.py
@@ -3,9 +3,9 @@
 # Created On: 2010-02-11
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from .base import GUIObject

--- a/core/ignore.py
+++ b/core/ignore.py
@@ -2,9 +2,9 @@
 # Created On: 2006/05/02
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from xml.etree import ElementTree as ET

--- a/core/results.py
+++ b/core/results.py
@@ -2,16 +2,16 @@
 # Created On: 2006/02/23
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import logging
 import re
 from xml.etree import ElementTree as ET

 from . import engine
-from hscommon.job import nulljob
+from jobprogress.job import nulljob
 from hscommon.markable import Markable
 from hsutil.misc import flatten, nonone
 from hsutil.str import format_size
--- a/core/scanner.py
+++ b/core/scanner.py
@@ -2,14 +2,14 @@
 # Created On: 2006/03/03
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import logging
 import re

-from hscommon import job
+from jobprogress import job
 from hsutil import io
 from hsutil.misc import dedupe
 from hsutil.str import get_file_ext, rem_file_ext
--- a/core/tests/app_test.py
+++ b/core/tests/app_test.py
@@ -2,9 +2,9 @@
 # Created On: 2007-06-23
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import os
 import logging
@@ -15,7 +15,8 @@ from hsutil import io
 from hsutil.path import Path
 from hsutil.decorators import log_calls
 import hsutil.files
-from hscommon.job import nulljob
+from hscommon.testutil import CallLogger
+from jobprogress.job import nulljob, Job, JobCancelled

 from . import data
 from .results_test import GetTestGroups
@@ -27,29 +28,21 @@ from ..gui.result_table import ResultTable
 from ..scanner import ScanType

 class DupeGuru(DupeGuruBase):
+    JOB = nulljob
+    
    def __init__(self):
-        DupeGuruBase.__init__(self, data, '/tmp', appid=4)
+        DupeGuruBase.__init__(self, data, '/tmp')
    
    def _start_job(self, jobid, func, *args):
-        func(nulljob, *args)
+        try:
+            func(self.JOB, *args)
+        except JobCancelled:
+            return
    

-class CallLogger(object):
-    """This is a dummy object that logs all calls made to it.
-    
-    It is used to simulate the GUI layer.
-    """
-    def __init__(self):
-        self.calls = []
-    
-    def __getattr__(self, func_name):
-        def func(*args, **kw):
-            self.calls.append(func_name)
-        return func
-    
-    def clear_calls(self):
-        del self.calls[:]
-    
+def add_fake_files_to_directories(directories, files):
+    directories.get_files = lambda: iter(files)
+    directories._dirs.append('this is just so Scan() doesnt return 3')

 class TCDupeGuru(TestCase):
    cls_tested_module = app
@@ -119,8 +112,7 @@ class TCDupeGuru(TestCase):
        f1, f2 = [FakeFile('foo') for i in range(2)]
        f1.is_ref, f2.is_ref = (False, False)
        assert not (bool(f1) and bool(f2))
-        app.directories.get_files = lambda: iter([f1, f2])
-        app.directories._dirs.append('this is just so Scan() doesnt return 3')
+        add_fake_files_to_directories(app.directories, [f1, f2])
        app.start_scanning() # no exception
    
    def test_ignore_hardlink_matches(self):
@@ -190,44 +182,6 @@ class TCDupeGuruWithResults(TestCase):
        io.mkdir(tmppath + 'bar')
        self.app.directories.add_path(tmppath)
    
-    def check_gui_calls(self, gui, expected, verify_order=False):
-        """Checks that the expected calls have been made to 'gui', then clears the log.
-        
-        `expected` is an iterable of strings representing method names.
-        If `verify_order` is True, the order of the calls matters.
-        """
-        if verify_order:
-            eq_(gui.calls, expected)
-        else:
-            eq_(set(gui.calls), set(expected))
-        gui.clear_calls()
-    
-    def check_gui_calls_partial(self, gui, expected=None, not_expected=None):
-        """Checks that the expected calls have been made to 'gui', then clears the log.
-        
-        `expected` is an iterable of strings representing method names. Order doesn't matter.
-        Moreover, if calls have been made that are not in expected, no failure occur.
-        `not_expected` can be used for a more explicit check (rather than calling `check_gui_calls`
-        with an empty `expected`) to assert that calls have *not* been made.
-        """
-        calls = set(gui.calls)
-        if expected is not None:
-            expected = set(expected)
-            not_called = expected - calls
-            assert not not_called, "These calls haven't been made: {0}".format(not_called)
-        if not_expected is not None:
-            not_expected = set(not_expected)
-            called = not_expected & calls
-            assert not called, "These calls shouldn't have been made: {0}".format(called)
-        gui.clear_calls()
-    
-    def clear_gui_calls(self):
-        for attr in dir(self):
-            if attr.endswith('_gui'):
-                gui = getattr(self, attr)
-                if hasattr(gui, 'calls'): # We might have test methods ending with '_gui'
-                    gui.clear_calls()
-    
    def test_GetObjects(self):
        objects = self.objects
        groups = self.groups
@@ -287,8 +241,6 @@ class TCDupeGuruWithResults(TestCase):
    
    def test_selected_powermarker_node_paths(self):
        # app.selected_dupes is correctly converted into paths
-        app = self.app
-        objects = self.objects
        self.rtable.power_marker = True
        self.rtable.select([0, 1, 2])
        self.rtable.power_marker = False
@@ -297,7 +249,6 @@ class TCDupeGuruWithResults(TestCase):
    def test_selected_powermarker_node_paths_after_deletion(self):
        # cases where the selected dupes aren't there are correctly handled
        app = self.app
-        objects = self.objects
        self.rtable.power_marker = True
        self.rtable.select([0, 1, 2])
        app.remove_selected()
@@ -331,10 +282,10 @@ class TCDupeGuruWithResults(TestCase):
    def test_refreshDetailsWithSelected(self):
        self.rtable.select([1, 4])
        eq_(self.dpanel.row(0), ('Filename', 'bar bleh', 'foo bar'))
-        self.check_gui_calls(self.dpanel_gui, ['refresh'])
+        self.dpanel_gui.check_gui_calls(['refresh'])
        self.rtable.select([])
        eq_(self.dpanel.row(0), ('Filename', '---', '---'))
-        self.check_gui_calls(self.dpanel_gui, ['refresh'])
+        self.dpanel_gui.check_gui_calls(['refresh'])
    
    def test_makeSelectedReference(self):
        app = self.app
@@ -413,6 +364,14 @@ class TCDupeGuruWithResults(TestCase):
        self.rtable.select([4])
        app.add_selected_to_ignore_list()
    
+    def test_cancel_scan_with_previous_results(self):
+        # When doing a scan with results being present prior to the scan, correctly invalidate the
+        # results table.
+        app = self.app
+        app.JOB = Job(1, lambda *args, **kw: False) # Cancels the task
+        add_fake_files_to_directories(app.directories, self.objects) # We want the scan to at least start
+        app.start_scanning() # will be cancelled immediately
+        eq_(len(self.rtable), 0)

 class TCDupeGuru_renameSelected(TestCase):
    def setUp(self):
--- a/core/tests/conftest.py
+++ b/core/tests/conftest.py
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Created By: Virgil Dupras
-# Created On: 2010-07-11
-# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# 
-# This software is licensed under the "BSD" 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/bsd_license
-
-# This unit is required to make tests work with py.test. When running
-
-import py
-
-def get_testunit(item):
-    if hasattr(item, 'obj'):
-        testunit = py.builtin._getimself(item.obj)
-        if hasattr(testunit, 'global_setup'):
-            return testunit
-
-def pytest_runtest_setup(item):
-    testunit = get_testunit(item)
-    if testunit is not None:
-        testunit.global_setup()
-
-def pytest_runtest_teardown(item):
-    testunit = get_testunit(item)
-    if testunit is not None:
-        testunit.global_teardown()
--- a/core/tests/data.py
+++ b/core/tests/data.py
@@ -3,9 +3,9 @@
 # Created On: 2009-10-23
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 # data module for tests

--- a/core/tests/directories_test.py
+++ b/core/tests/directories_test.py
@@ -2,9 +2,9 @@
 # Created On: 2006/02/27
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import os.path as op
 import os
--- a/core/tests/engine_test.py
+++ b/core/tests/engine_test.py
@@ -2,13 +2,13 @@
 # Created On: 2006/01/29
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import sys

-from hscommon import job
+from jobprogress import job
 from hsutil.decorators import log_calls
 from hsutil.misc import first
 from hsutil.testutil import eq_
--- a/core/tests/ignore_test.py
+++ b/core/tests/ignore_test.py
@@ -2,9 +2,9 @@
 # Created On: 2006/05/02
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import io
 from xml.etree import ElementTree as ET
--- a/core/tests/results_test.py
+++ b/core/tests/results_test.py
@@ -3,9 +3,9 @@
 # $Id$                                  
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import io
 import os.path as op
--- a/core/tests/scanner_test.py
+++ b/core/tests/scanner_test.py
@@ -2,12 +2,11 @@
 # Created On: 2006/03/03
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

-
-from hscommon import job
+from jobprogress import job
 from hsutil import io
 from hsutil.path import Path
 from hsutil.testutil import eq_
--- a/core_me/app_cocoa.py
+++ b/core_me/app_cocoa.py
@@ -2,9 +2,9 @@
 # Created On: 2006/11/16
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import logging
 from appscript import app, k, CommandError
@@ -26,9 +26,9 @@ JOBID2TITLE.update({

 class DupeGuruME(DupeGuruBase):
    def __init__(self):
-        DupeGuruBase.__init__(self, data, 'dupeGuru Music Edition', appid=1)
+        DupeGuruBase.__init__(self, data, 'dupeGuru Music Edition')
        self.scanner = scanner.ScannerME()
-        self.directories.fileclasses = [fs.Mp3File, fs.Mp4File, fs.WmaFile, fs.OggFile, fs.FlacFile, fs.AiffFile]
+        self.directories.fileclasses = [fs.MusicFile]
        self.dead_tracks = []
    
    def remove_dead_tracks(self):
--- a/core_me/data.py
+++ b/core_me/data.py
@@ -2,9 +2,9 @@
 # Created On: 2006/03/15
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from hsutil.str import format_time, FT_MINUTES, format_size
 from core.data import (format_path, format_timestamp, format_words, format_perc, 
@@ -31,6 +31,9 @@ COLUMNS = [
    {'attr':'dupe_count','display':'Dupe Count'},
 ]

+MATCHPERC_COL = 15
+DUPECOUNT_COL = 17
+
 METADATA_TO_READ = ['size', 'mtime', 'duration', 'bitrate', 'samplerate', 'title', 'artist',
    'album', 'genre', 'year', 'track', 'comment']

@@ -76,19 +79,19 @@ def GetDisplayInfo(dupe, group, delta):
    ]

 def GetDupeSortKey(dupe, get_group, key, delta):
-    if key == 16:
+    if key == MATCHPERC_COL:
        m = get_group().get_match_of(dupe)
        return m.percentage
-    if key == 18:
+    if key == DUPECOUNT_COL:
        return 0
    r = cmp_value(getattr(dupe, COLUMNS[key]['attr'], ''))
-    if delta and (key in (2, 3, 4, 7, 8)):
+    if delta and (key in {2, 3, 4, 7}):
        r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr'], ''))
    return r

 def GetGroupSortKey(group, key):
-    if key == 16:
+    if key == MATCHPERC_COL:
        return group.percentage
-    if key == 18:
+    if key == DUPECOUNT_COL:
        return len(group)
    return cmp_value(getattr(group.ref, COLUMNS[key]['attr'], ''))
--- a/core_me/fs.py
+++ b/core_me/fs.py
@@ -1,18 +1,17 @@
-# -*- coding: utf-8 -*-
 # Created By: Virgil Dupras
 # Created On: 2009-10-23
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

-from hsaudiotag import mpeg, wma, mp4, ogg, flac, aiff
+from hsaudiotag import auto
 from hsutil.str import get_file_ext
 from core import fs

-TAG_FIELDS = ['audiosize', 'duration', 'bitrate', 'samplerate', 'title', 'artist',
-    'album', 'genre', 'year', 'track', 'comment']
+TAG_FIELDS = {'audiosize', 'duration', 'bitrate', 'samplerate', 'title', 'artist',
+    'album', 'genre', 'year', 'track', 'comment'}

 class MusicFile(fs.File):
    INITIAL_INFO = fs.File.INITIAL_INFO.copy()
@@ -29,154 +28,30 @@ class MusicFile(fs.File):
        'year'    : '',
        'track'   : 0,
    })
-    HANDLED_EXTS = set()
    
    @classmethod
    def can_handle(cls, path):
        if not fs.File.can_handle(path):
            return False
-        return get_file_ext(path[-1]) in cls.HANDLED_EXTS
+        return get_file_ext(path[-1]) in auto.EXT2CLASS
    
-
-class Mp3File(MusicFile):
-    HANDLED_EXTS = set(['mp3'])
    def _read_info(self, field):
        if field == 'md5partial':
-            fileinfo = mpeg.Mpeg(str(self.path))
-            self._md5partial_offset = fileinfo.audio_offset
-            self._md5partial_size = fileinfo.audio_size
-        MusicFile._read_info(self, field)
+            f = auto.File(str(self.path))
+            self._md5partial_offset = f.audio_offset
+            self._md5partial_size = f.audio_size
+        fs.File._read_info(self, field)
        if field in TAG_FIELDS:
-            fileinfo = mpeg.Mpeg(str(self.path))
-            self.audiosize = fileinfo.audio_size
-            self.bitrate = fileinfo.bitrate
-            self.duration = fileinfo.duration
-            self.samplerate = fileinfo.sample_rate
-            i1 = fileinfo.id3v1
-            # id3v1, even when non-existant, gives empty values. not id3v2. if id3v2 don't exist,
-            # just replace it with id3v1
-            i2 = fileinfo.id3v2
-            if not i2.exists:
-                i2 = i1
-            self.artist = i2.artist or i1.artist
-            self.album = i2.album or i1.album
-            self.title = i2.title or i1.title
-            self.genre = i2.genre or i1.genre
-            self.comment = i2.comment or i1.comment
-            self.year = i2.year or i1.year
-            self.track = i2.track or i1.track
-
-class WmaFile(MusicFile):
-    HANDLED_EXTS = set(['wma'])
-    def _read_info(self, field):
-        if field == 'md5partial':
-            dec = wma.WMADecoder(str(self.path))
-            self._md5partial_offset = dec.audio_offset
-            self._md5partial_size = dec.audio_size
-        MusicFile._read_info(self, field)
-        if field in TAG_FIELDS:
-            dec = wma.WMADecoder(str(self.path))
-            self.audiosize = dec.audio_size
-            self.bitrate = dec.bitrate
-            self.duration = dec.duration
-            self.samplerate = dec.sample_rate
-            self.artist = dec.artist
-            self.album = dec.album
-            self.title = dec.title
-            self.genre = dec.genre
-            self.comment = dec.comment
-            self.year = dec.year
-            self.track = dec.track
-
-class Mp4File(MusicFile):
-    HANDLED_EXTS = set(['m4a', 'm4p'])
-    def _read_info(self, field):
-        if field == 'md5partial':
-            dec = mp4.File(str(self.path))
-            self._md5partial_offset = dec.audio_offset
-            self._md5partial_size = dec.audio_size
-            dec.close()
-        MusicFile._read_info(self, field)
-        if field in TAG_FIELDS:
-            dec = mp4.File(str(self.path))
-            self.audiosize = dec.audio_size
-            self.bitrate = dec.bitrate
-            self.duration = dec.duration
-            self.samplerate = dec.sample_rate
-            self.artist = dec.artist
-            self.album = dec.album
-            self.title = dec.title
-            self.genre = dec.genre
-            self.comment = dec.comment
-            self.year = dec.year
-            self.track = dec.track
-            dec.close()
-
-class OggFile(MusicFile):
-    HANDLED_EXTS = set(['ogg'])
-    def _read_info(self, field):
-        if field == 'md5partial':
-            dec = ogg.Vorbis(str(self.path))
-            self._md5partial_offset = dec.audio_offset
-            self._md5partial_size = dec.audio_size
-        MusicFile._read_info(self, field)
-        if field in TAG_FIELDS:
-            dec = ogg.Vorbis(str(self.path))
-            self.audiosize = dec.audio_size
-            self.bitrate = dec.bitrate
-            self.duration = dec.duration
-            self.samplerate = dec.sample_rate
-            self.artist = dec.artist
-            self.album = dec.album
-            self.title = dec.title
-            self.genre = dec.genre
-            self.comment = dec.comment
-            self.year = dec.year
-            self.track = dec.track
-
-class FlacFile(MusicFile):
-    HANDLED_EXTS = set(['flac'])
-    def _read_info(self, field):
-        if field == 'md5partial':
-            dec = flac.FLAC(str(self.path))
-            self._md5partial_offset = dec.audio_offset
-            self._md5partial_size = dec.audio_size
-        MusicFile._read_info(self, field)
-        if field in TAG_FIELDS:
-            dec = flac.FLAC(str(self.path))
-            self.audiosize = dec.audio_size
-            self.bitrate = dec.bitrate
-            self.duration = dec.duration
-            self.samplerate = dec.sample_rate
-            self.artist = dec.artist
-            self.album = dec.album
-            self.title = dec.title
-            self.genre = dec.genre
-            self.comment = dec.comment
-            self.year = dec.year
-            self.track = dec.track
-
-class AiffFile(MusicFile):
-    HANDLED_EXTS = set(['aif', 'aiff', 'aifc'])
-    def _read_info(self, field):
-        if field == 'md5partial':
-            dec = aiff.File(str(self.path))
-            self._md5partial_offset = dec.audio_offset
-            self._md5partial_size = dec.audio_size
-        MusicFile._read_info(self, field)
-        if field in TAG_FIELDS:
-            dec = aiff.File(str(self.path))
-            self.audiosize = dec.audio_size
-            self.bitrate = dec.bitrate
-            self.duration = dec.duration
-            self.samplerate = dec.sample_rate
-            tag = dec.tag
-            if tag is not None:
-                self.artist = tag.artist
-                self.album = tag.album
-                self.title = tag.title
-                self.genre = tag.genre
-                self.comment = tag.comment
-                self.year = tag.year
-                self.track = tag.track
+            f = auto.File(str(self.path))
+            self.audiosize = f.audio_size
+            self.bitrate = f.bitrate
+            self.duration = f.duration
+            self.samplerate = f.sample_rate
+            self.artist = f.artist
+            self.album = f.album
+            self.title = f.title
+            self.genre = f.genre
+            self.comment = f.comment
+            self.year = f.year
+            self.track = f.track
    
--- a/core_me/scanner.py
+++ b/core_me/scanner.py
@@ -2,9 +2,9 @@
 # Created On: 2006/03/03
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from core.scanner import Scanner as ScannerBase

--- a/core_me/tests/conftest.py
+++ b/core_me/tests/conftest.py
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Created By: Virgil Dupras
-# Created On: 2010-07-11
-# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-# 
-# This software is licensed under the "BSD" 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/bsd_license
-
-# This unit is required to make tests work with py.test. When running
-
-import py
-
-def get_testunit(item):
-    if hasattr(item, 'obj'):
-        testunit = py.builtin._getimself(item.obj)
-        if hasattr(testunit, 'global_setup'):
-            return testunit
-
-def pytest_runtest_setup(item):
-    testunit = get_testunit(item)
-    if testunit is not None:
-        testunit.global_setup()
-
-def pytest_runtest_teardown(item):
-    testunit = get_testunit(item)
-    if testunit is not None:
-        testunit.global_teardown()
--- a/core_me/tests/scanner_test.py
+++ b/core_me/tests/scanner_test.py
@@ -3,9 +3,9 @@
 # Created On: 2009-10-23
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from hsutil import io
 from hsutil.path import Path
--- a/core_pe/app_cocoa.py
+++ b/core_pe/app_cocoa.py
@@ -2,16 +2,16 @@
 # Created On: 2006/11/13
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import os.path as op
 import plistlib
 import logging
 import re

-from appscript import app, k, CommandError
+from appscript import app, k, CommandError, ApplicationNotFoundError

 from hsutil import io
 from hsutil.str import get_file_ext, remove_invalid_xml
@@ -24,12 +24,14 @@ from core import app_cocoa, directories
 from . import data, _block_osx
 from .scanner import ScannerPE

+IPHOTO_PATH = Path('iPhoto Library')
+
 class Photo(fs.File):
    INITIAL_INFO = fs.File.INITIAL_INFO.copy()
    INITIAL_INFO.update({
        'dimensions': (0,0),
    })
-    HANDLED_EXTS = set(['png', 'jpg', 'jpeg', 'gif', 'psd', 'bmp', 'tiff', 'tif', 'nef', 'cr2'])
+    HANDLED_EXTS = {'png', 'jpg', 'jpeg', 'gif', 'psd', 'bmp', 'tiff', 'tif', 'nef', 'cr2'}
    
    @classmethod
    def can_handle(cls, path):
@@ -97,7 +99,7 @@ class Directories(directories.Directories):
            self.iphoto_libpath = None
    
    def _get_files(self, from_path):
-        if from_path == Path('iPhoto Library'):
+        if from_path == IPHOTO_PATH:
            if self.iphoto_libpath is None:
                return []
            is_ref = self.get_state(from_path) == directories.STATE_REFERENCE
@@ -110,23 +112,26 @@ class Directories(directories.Directories):
    
    @staticmethod
    def get_subfolders(path):
-        if path == Path('iPhoto Library'):
+        if path == IPHOTO_PATH:
            return []
        else:
            return directories.Directories.get_subfolders(path)
    
    def add_path(self, path):
-        if path == Path('iPhoto Library'):
+        if path == IPHOTO_PATH:
            if path not in self:
                self._dirs.append(path)
        else:
            directories.Directories.add_path(self, path)
    
+    def has_iphoto_path(self):
+        return any(path == IPHOTO_PATH for path in self._dirs)
+    
    def has_any_file(self):
        # If we don't do that, it causes a hangup in the GUI when we click Start Scanning because
        # checking if there's any file to scan involves reading the whole library. If we have the
        # iPhoto library, we assume we have at least one file.
-        if any(path == Path('iPhoto Library') for path in self._dirs):
+        if self.has_iphoto_path():
            return True
        else:
            return directories.Directories.has_any_file(self)
@@ -134,7 +139,7 @@ class Directories(directories.Directories):

 class DupeGuruPE(app_cocoa.DupeGuru):
    def __init__(self):
-        app_cocoa.DupeGuru.__init__(self, data, 'dupeGuru Picture Edition', appid=5)
+        app_cocoa.DupeGuru.__init__(self, data, 'dupeGuru Picture Edition')
        self.scanner = ScannerPE()
        self.directories = Directories()
        self.scanner.cache_path = op.join(self.appdata, 'cached_pictures.db')
@@ -158,7 +163,7 @@ class DupeGuruPE(app_cocoa.DupeGuru):
                        self.path2iphoto[str(photo.image_path(timeout=0))] = photo
                    except CommandError:
                        pass
-            except (CommandError, RuntimeError):
+            except (CommandError, RuntimeError, ApplicationNotFoundError):
                pass
        j.start_job(self.results.mark_count, "Sending dupes to the Trash")
        self.results.perform_on_marked(op, True)
@@ -203,3 +208,12 @@ class DupeGuruPE(app_cocoa.DupeGuru):
            return None
        return ref.path
    
+    def start_scanning(self):
+        result = app_cocoa.DupeGuru.start_scanning(self)
+        if self.directories.has_iphoto_path():
+            try:
+                app('iPhoto')
+            except ApplicationNotFoundError:
+                return 4
+        return result
+    
--- a/core_pe/block.py
+++ b/core_pe/block.py
@@ -2,9 +2,9 @@
 # Created On: 2006/09/01
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 from ._block import NoBlocksError, DifferentBlockCountError, avgdiff, getblocks2

--- a/core_pe/cache.py
+++ b/core_pe/cache.py
@@ -2,9 +2,9 @@
 # Created On: 2006/09/14
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# This software is licensed under the "BSD" 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
+# http://www.hardcoded.net/licenses/bsd_license

 import os
 import logging
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Virgil Dupras	75239d6a64	pe v1.11.3	2010-12-31 14:43:00 +01:00
Virgil Dupras	09082955a3	[#125 state:fixed] Wrapped error message around a crash when the iPhoto app can't be found.	2010-12-31 12:10:44 +01:00
Virgil Dupras	6a6f2d51aa	Added tag me5.10.4 for changeset 44f6ff67066c	2010-12-30 16:11:17 +01:00
Virgil Dupras	7b0d3ea8ac	me v5.10.4	2010-12-30 14:55:13 +01:00
Virgil Dupras	1c88b6bb26	Tweaked the wording of the fairware pop up.	2010-12-30 13:07:04 +01:00
Virgil Dupras	e5e8e5d908	Replaced the about box with one that supports fairware registering.	2010-12-30 13:00:44 +01:00
Virgil Dupras	92fadd26b7	[#120 state:fixed] Fixed dangling bogus results after cancelled scan.	2010-12-30 10:24:37 +01:00
Virgil Dupras	45d783ac43	Removed CallLogger-related code in app_test. This code was duplicating the code that was recently added to hscommon.testutil.	2010-12-30 10:00:29 +01:00
Virgil Dupras	ea9e76e7ae	Removed conftest.py modules in tests, which aren't required anymore with pytest v2.0	2010-12-30 09:47:22 +01:00
Virgil Dupras	28426c0e91	[#121 state:fixed] Catch HTTPException in Fairware fetching.	2010-12-30 09:35:45 +01:00
Virgil Dupras	3a9f51b600	[#122 state:fixed] Fixed crash on scanning when file is being deleted during the scan.	2010-12-29 15:41:12 +01:00
Virgil Dupras	f1b4db368e	[#123 state:fixed] Updated codebase to use hsaudiotag v1.1.0 (which fixed the AIFF bug) and made it use the new auto.File wrapper.	2010-12-29 13:17:30 +01:00
Virgil Dupras	95efac187b	Updated hscommon and adapted to changes in hscommon.gui.table.Table.refresh().	2010-11-24 16:12:10 +01:00
Virgil Dupras	6770d22438	Updated hscommon subrepo.	2010-11-22 10:06:42 +01:00
Virgil Dupras	4ce97613c4	Added tag me5.10.3 for changeset ca93352ce351	2010-11-21 17:56:37 +01:00
Virgil Dupras	030eb8eb6e	Fixed debian packaging	2010-11-21 07:49:38 -08:00
Virgil Dupras	c9da8e26e6	Fixed crash caused by outdated hsgui. Also, fixed app_test, which was also outdated.	2010-11-21 16:45:02 +01:00
Virgil Dupras	7ddf9772df	v5.10.3	2010-11-21 16:25:16 +01:00
Virgil Dupras	0382ad1534	Adapted to the job-related code moving to the 'jobprogress' package.	2010-11-20 12:42:15 +01:00
Virgil Dupras	1b6e1369a0	Tranformed PyQt's license warning into a licensing note --HG-- rename : qt/WARNING => qt/ABOUT_LICENSE	2010-11-13 14:37:20 +01:00
Virgil Dupras	835050c337	Added tag pe1.11.2 for changeset 154c8cb6f018	2010-10-07 12:44:04 +02:00
Virgil Dupras	ca6a42e6eb	pe 1.11.2	2010-10-07 11:34:29 +02:00
Virgil Dupras	a2e4d893ac	Added tag me5.10.2 for changeset f9cae82a0752	2010-10-06 12:44:43 +02:00
Virgil Dupras	657520b0b3	me5.10.2	2010-10-06 11:43:37 +02:00
Virgil Dupras	ea4b87895c	Fixed typo in fairware reminder.	2010-10-06 11:37:26 +02:00
Virgil Dupras	19db500a19	Updated cocoalib subrepo.	2010-10-06 10:47:05 +02:00
Virgil Dupras	1366cfd478	Added a "Don't contribute" feedback dialog to fairware reminder.	2010-10-06 10:45:27 +02:00
Virgil Dupras	56a6df1f68	Added tag se2.12.2 for changeset 22239f94589b	2010-10-05 15:56:21 +02:00
Virgil Dupras	a1b35a8abf	Fixed reg demo dialog for windows.	2010-10-05 13:55:26 +01:00
Virgil Dupras	8a8a181186	se 2.12.2	2010-10-05 03:50:28 -07:00
Virgil Dupras	463a551f7d	Fixed debian packaging.	2010-10-05 02:02:02 -07:00
Virgil Dupras	fc613fb325	Fixed Qt packaging under Windows.	2010-10-05 09:48:07 +01:00
Virgil Dupras	4517bea664	Moved the start.py file directly in qt run template instead of using this subprocess thingy. Much easier for packaging.	2010-10-05 10:22:02 +02:00
Virgil Dupras	81dcfbe6ae	Use sys.platform instead of platform.system(). The latter somes crashes with "Interrupted system call".	2010-10-05 10:03:56 +02:00
Virgil Dupras	fa8e64d04a	Fixed delta values color which were mixed up.	2010-10-05 09:54:52 +02:00
Virgil Dupras	562123b219	Fixed qt run template so that the current environment is sent to the new python process.	2010-10-05 00:36:20 -07:00
Virgil Dupras	b217309618	Replaced the use of runpy for running Qt by a simple subprocess call. runpy would cause weird QTimer warnings.	2010-10-05 09:27:32 +02:00
Virgil Dupras	357a02c74b	Use QTimer.singleShot() for nag window showing instead of a complicated scheme like the old one.	2010-10-05 08:44:32 +02:00
Virgil Dupras	508eeffa6e	Fixed register button that linked to the wrong method.	2010-10-05 08:20:53 +02:00
Virgil Dupras	31555aa473	Rather than having a run.py file that checks build config at runtime, this file is generated at build time, making it easier to package it.	2010-10-04 15:42:38 +02:00
Virgil Dupras	d2f968def7	Removed .ui files and made the UI setup "by hand". ui files cause more problems than they solve (UI designer is limited in what it can do).	2010-10-04 15:29:00 +02:00
Virgil Dupras	d574bc611b	[#108 state:fixed] Fixed column mess after the earlier removal of the ctime col.	2010-10-04 10:01:52 +02:00
Virgil Dupras	a50a3b0123	[#106 state:fixed] Wrapped getJobDesc in a try except in case it isn't defined yet.	2010-10-04 09:40:46 +02:00
Virgil Dupras	5b6891dd45	se v2.12.1 me v5.10.1 pe v1.11.1	2010-09-30 12:35:40 +02:00
Virgil Dupras	4886982d43	Re-licensed to BSD	2010-09-30 12:17:41 +02:00
Virgil Dupras	7360f57beb	Converted registration system to Fairware.	2010-09-29 16:49:50 +02:00
Virgil Dupras	491279b7a8	Added tag before-fairware for changeset 96b6aee66839	2010-09-29 16:11:52 +02:00
Virgil Dupras	05b79f81af	Added tag pe1.11.0 for changeset b07ac1398703	2010-09-27 15:13:42 +02:00
Virgil Dupras	96ef2f2dd3	Added tag me5.10.0 for changeset d3fe0d0dcda1	2010-09-27 15:13:36 +02:00
Virgil Dupras	2542af17b6	Adjusted default column widths so it fits better with the revamped UI.	2010-09-27 12:25:31 +02:00
Virgil Dupras	c86bc649ff	pe 1.11.0 and me 5.10.0.	2010-09-27 11:56:02 +02:00
Virgil Dupras	4b8e48ed88	Added tag se2.12.0 for changeset dbfee3ee2fa5	2010-09-26 14:26:06 +02:00