Results are not automatically saved/load anymore. There's a reminder on quitting if you haven't saved your results. Also, for easier re-loading, there's a 'open recent results' menu item.

cocoa/base/AppDelegate.h

@@ -7,31 +7,32 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "RecentDirectories.h"
 #import "PyDupeGuru.h"
 #import "ResultWindow.h"
 #import "DetailsPanel.h"
 #import "DirectoryPanel.h"
 #import "HSAboutBox.h"
+#import "HSRecentFiles.h"
 
 @interface AppDelegateBase : NSObject
 {
     IBOutlet PyDupeGuruBase *py;
-    IBOutlet RecentDirectories *recentDirectories;
     IBOutlet ResultWindowBase *result;
+    IBOutlet NSMenu *recentResultsMenu;
     
     DirectoryPanel *_directoryPanel;
     DetailsPanel *_detailsPanel;
     HSAboutBox *_aboutBox;
-    BOOL _savedResults;
+    HSRecentFiles *_recentResults;
 }
 - (PyDupeGuruBase *)py;
-- (RecentDirectories *)recentDirectories;
 - (DirectoryPanel *)directoryPanel;
 - (DetailsPanel *)detailsPanel;
-- (void)saveResults;
+- (HSRecentFiles *)recentResults;
+- (NSString *)homepageURL;
 
 - (IBAction)showAboutBox:(id)sender;
 - (IBAction)openWebsite:(id)sender;
 - (IBAction)openHelp:(id)sender;
+- (IBAction)toggleDirectories:(id)sender;
 @end

cocoa/base/AppDelegate.m

@@ -11,11 +11,17 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "HSFairwareReminder.h"
 #import "Utils.h"
 #import "Consts.h"
+#import "Dialogs.h"
 #import <Sparkle/SUUpdater.h>
 
 @implementation AppDelegateBase
+- (void)awakeFromNib
+{
+    _recentResults = [[HSRecentFiles alloc] initWithName:@"recentResults" menu:recentResultsMenu];
+    [_recentResults setDelegate:self];
+}
+
 - (PyDupeGuruBase *)py { return py; }
-- (RecentDirectories *)recentDirectories { return recentDirectories; }
 - (DirectoryPanel *)directoryPanel
 {
     if (!_directoryPanel)
@@ -30,14 +36,14 @@ http://www.hardcoded.net/licenses/bsd_license
     return _detailsPanel;
 }
 
-- (void)saveResults
+- (HSRecentFiles *)recentResults
 {
-    if (_savedResults) {
+    return _recentResults;
-        return;
+}
-    }
+
-    [py saveIgnoreList];
+- (NSString *)homepageURL
-    [py saveResults];
+{
-    _savedResults = YES;
+    return @""; // Virtual
 }
 
 - (IBAction)showAboutBox:(id)sender
@@ -50,6 +56,7 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (IBAction)openWebsite:(id)sender
 {
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[self homepageURL]]];
 }
 
 - (IBAction)openHelp:(id)sender
@@ -60,6 +67,11 @@ http://www.hardcoded.net/licenses/bsd_license
     [[NSWorkspace sharedWorkspace] openURL:u];
 }
 
+- (IBAction)toggleDirectories:(id)sender
+{
+    [[self directoryPanel] toggleVisible:sender];
+}
+
 /* Delegate */
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
@@ -73,10 +85,7 @@ http://www.hardcoded.net/licenses/bsd_license
     else
         [result resetColumnsToDefault:nil];
     [HSFairwareReminder showNagWithApp:[self py]];
-    //Restore results
+    [py loadSession];
-    [py loadIgnoreList];
-    [py loadResults];
-    _savedResults = NO;
 }
 
 - (void)applicationWillBecomeActive:(NSNotification *)aNotification
@@ -85,38 +94,39 @@ http://www.hardcoded.net/licenses/bsd_license
         [result showWindow:NSApp];
 }
 
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+{
+    if ([py resultsAreModified]) {
+        NSString *msg = @"You have unsaved results, do you really want to quit?";
+        if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) { // NO
+            return NSTerminateCancel;
+        }
+    }
+    return NSTerminateNow;
+}
+
 - (void)applicationWillTerminate:(NSNotification *)aNotification
 {
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
     [ud setObject: [result getColumnsOrder] forKey:@"columnsOrder"];
     [ud setObject: [result getColumnsWidth] forKey:@"columnsWidth"];
-    [self saveResults];
     NSInteger sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
-    if (sc >= 10)
+    if (sc >= 10) {
-    {
         sc = -1;
         [py purgeIgnoreList];
     }
     sc++;
+    [py saveSession];
     [ud setInteger:sc forKey:@"sessionCountSinceLastIgnorePurge"];
     // NSApplication does not release nib instances objects, we must do it manually
     // Well, it isn't needed because the memory is freed anyway (we are quitting the application
-    // But I need to release RecentDirectories so it saves the user defaults
+    // But I need to release HSRecentFiles so it saves the user defaults
-    [recentDirectories release];
+    [_directoryPanel release];
+    [_recentResults release];
 }
 
-- (void)recentDirecoryClicked:(NSString *)directory
+- (void)recentFileClicked:(NSString *)path
 {
-    [[self directoryPanel] addDirectory:directory];
+    [py loadResultsFrom:path];
-}
-
-/* SUUpdater delegate */
-
-- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation;
-{
-    /* If results aren't saved now, we might get a weird utf-8 lookup error when saving later.
-    **/
-    [self saveResults];
-    return NO;
 }
 @end

cocoa/base/DirectoryPanel.h

@@ -7,8 +7,8 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "RecentDirectories.h"
 #import "HSOutlineView.h"
+#import "HSRecentFiles.h"
 #import "DirectoryOutline.h"
 #import "PyDupeGuru.h"
 
@@ -19,7 +19,7 @@ http://www.hardcoded.net/licenses/bsd_license
     IBOutlet NSButton *removeButton;
     
     PyDupeGuruBase *_py;
-    RecentDirectories *_recentDirectories;
+    HSRecentFiles *_recentDirectories;
     DirectoryOutline *outline;
 }
 - (id)initWithParentApp:(id)aParentApp;

cocoa/base/DirectoryPanel.m

@@ -18,7 +18,8 @@ http://www.hardcoded.net/licenses/bsd_license
     [self window];
     AppDelegateBase *app = aParentApp;
     _py = [app py];
-    _recentDirectories = [app recentDirectories];
+    _recentDirectories = [[HSRecentFiles alloc] initWithName:@"recentDirectories" menu:[addButtonPopUp menu]];
+    [_recentDirectories setDelegate:self];
     outline = [[DirectoryOutline alloc] initWithPyParent:_py view:outlineView];
     [self refreshRemoveButtonText];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(directorySelectionChanged:)
@@ -29,6 +30,7 @@ http://www.hardcoded.net/licenses/bsd_license
 - (void)dealloc
 {
     [outline release];
+    [_recentDirectories release];
     [super dealloc];
 }
 
@@ -51,20 +53,13 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (IBAction)popupAddDirectoryMenu:(id)sender
 {
-    if ([[_recentDirectories directories] count] == 0)
+    if ([[_recentDirectories filepaths] count] == 0) {
-    {
         [self askForDirectory:sender];
-        return;
     }
-    NSMenu *m = [addButtonPopUp menu];
+    else {
-    while ([m numberOfItems] > 0)
+        [addButtonPopUp selectItem:nil];
-        [m removeItemAtIndex:0];
+        [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
-    NSMenuItem *mi = [m addItemWithTitle:@"Add New Directory..." action:@selector(askForDirectory:) keyEquivalent:@""];
+    }
-    [mi setTarget:self];
-    [m addItem:[NSMenuItem separatorItem]];
-    [_recentDirectories fillMenu:m];
-    [addButtonPopUp selectItem:nil];
-    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
 }
 
 - (IBAction)removeSelectedDirectory:(id)sender
@@ -104,7 +99,7 @@ http://www.hardcoded.net/licenses/bsd_license
         }
         [Dialogs showMessage:[NSString stringWithFormat:m,directory]];
     }
-    [_recentDirectories addDirectory:directory];
+    [_recentDirectories addFile:directory];
     [[self window] makeKeyAndOrderFront:nil];
 }
 
@@ -128,6 +123,11 @@ http://www.hardcoded.net/licenses/bsd_license
     return isdir;
 }
 
+- (void)recentFileClicked:(NSString *)path
+{
+    [self addDirectory:path];
+}
+
 /* Notifications */
 
 - (void)directorySelectionChanged:(NSNotification *)aNotification

cocoa/base/PyDupeGuru.h

@@ -13,12 +13,10 @@ http://www.hardcoded.net/licenses/bsd_license
 //Actions
 - (NSNumber *)addDirectory:(NSString *)name;
 - (void)removeDirectory:(NSNumber *)index;
-- (void)loadResults;
 - (void)loadResultsFrom:(NSString *)filename;
-- (void)saveResults;
 - (void)saveResultsAs:(NSString *)filename;
-- (void)loadIgnoreList;
+- (void)loadSession;
-- (void)saveIgnoreList;
+- (void)saveSession;
 - (void)clearIgnoreList;
 - (void)purgeIgnoreList;
 - (NSString *)exportToXHTMLwithColumns:(NSArray *)aColIds;
@@ -46,6 +44,7 @@ http://www.hardcoded.net/licenses/bsd_license
 - (NSNumber *)getIgnoreListCount;
 - (NSNumber *)getMarkCount;
 - (BOOL)scanWasProblematic;
+- (BOOL)resultsAreModified;
 
 //Scanning options
 - (void)setMinMatchPercentage:(NSNumber *)percentage;

cocoa/base/ResultWindow.h

@@ -38,6 +38,7 @@ http://www.hardcoded.net/licenses/bsd_license
 - (void)initResultColumns;
 - (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;
 - (void)sendMarkedToTrash:(BOOL)hardlinkDeleted;
+- (void)updateOptionSegments;
 
 /* Actions */
 - (IBAction)clearIgnoreList:(id)sender;

cocoa/base/ResultWindow.m

@@ -254,6 +254,7 @@ http://www.hardcoded.net/licenses/bsd_license
     if ([op runModal] == NSOKButton) {
         NSString *filename = [[op filenames] objectAtIndex:0];
         [py loadResultsFrom:filename];
+        [[(AppDelegateBase *)app recentResults] addFile:filename];
     }
 }
 
@@ -356,6 +357,7 @@ http://www.hardcoded.net/licenses/bsd_license
     [sp setTitle:@"Select a file to save your results to"];
     if ([sp runModal] == NSOKButton) {
         [py saveResultsAs:[sp filename]];
+        [[(AppDelegateBase *)app recentResults] addFile:[sp filename]];
     }
 }
 

cocoa/base/xib/DirectoryPanel.xib

@@ -2,30 +2,25 @@
 <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.SystemVersion">10J567</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
+		<string key="IBDocument.InterfaceBuilderVersion">823</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.HIToolboxVersion">462.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="50"/>
+			<integer value="8"/>
 		</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>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
+			<integer value="1" key="NS.object.0"/>
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="238648523">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -322,11 +317,12 @@
 								</object>
 								<int key="NSPeriodicDelay">400</int>
 								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="688039571">
+								<object class="NSMenuItem" key="NSMenuItem" id="808696042">
 									<reference key="NSMenu" ref="910678368"/>
-									<string type="base64-UTF8" key="NSTitle">IA</string>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
 									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<int key="NSState">1</int>
 									<object class="NSCustomResource" key="NSOnImage">
@@ -347,9 +343,18 @@
 									</object>
 									<object class="NSMutableArray" key="NSMenuItems">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="688039571"/>
+										<object class="NSMenuItem" id="688039571">
+											<reference key="NSMenu" ref="910678368"/>
+											<string key="NSTitle"> Add New Directory...</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="429063917"/>
+										</object>
+										<reference ref="808696042"/>
 									</object>
 								</object>
+								<int key="NSSelectedIndex">1</int>
 								<int key="NSPreferredEdge">3</int>
 								<bool key="NSUsesItemFromMenu">YES</bool>
 								<bool key="NSAltersState">YES</bool>
@@ -498,13 +503,23 @@
 					</object>
 					<int key="connectionID">54</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">askForDirectory:</string>
+						<reference key="source" ref="566600593"/>
+						<reference key="destination" ref="688039571"/>
+					</object>
+					<int key="connectionID">58</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="children" ref="238648523"/>
 						<nil key="parent"/>
 					</object>
@@ -669,6 +684,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="688039571"/>
+							<reference ref="808696042"/>
 						</object>
 						<reference key="parent" ref="429063917"/>
 					</object>
@@ -718,6 +734,11 @@
 						<reference key="object" ref="142495353"/>
 						<reference key="parent" ref="104112446"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">59</int>
+						<reference key="object" ref="808696042"/>
+						<reference key="parent" ref="910678368"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -766,10 +787,12 @@
 					<string>55.IBPluginDependency</string>
 					<string>56.IBPluginDependency</string>
 					<string>57.IBPluginDependency</string>
+					<string>59.IBPluginDependency</string>
 					<string>6.IBPluginDependency</string>
 					<string>6.ImportedFromIB2</string>
 					<string>7.IBPluginDependency</string>
 					<string>7.ImportedFromIB2</string>
+					<string>8.IBEditorWindowLastContentRect</string>
 					<string>8.IBPluginDependency</string>
 					<string>8.ImportedFromIB2</string>
 					<string>9.IBPluginDependency</string>
@@ -802,9 +825,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>{{88, 571}, {369, 269}}</string>
+					<string>{{89, 571}, {369, 269}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{88, 571}, {369, 269}}</string>
+					<string>{{89, 571}, {369, 269}}</string>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{369, 269}</string>
@@ -820,9 +843,11 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
+					<string>{{95, 586}, {197, 33}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -845,7 +870,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">57</int>
+			<int key="maxID">59</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -971,6 +996,13 @@
 					<string key="className">NSObject</string>
 					<reference key="sourceIdentifier" ref="53364925"/>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../views/HSTableView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="42597526">

cocoa/base/xib/MainMenu.xib

@@ -12,8 +12,8 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="21"/>
 			<integer value="106"/>
+			<integer value="21"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -98,11 +98,9 @@
 								<string key="NSToolbarItemPaletteLabel">Options</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSegmentedControl" key="NSToolbarItemView" id="474998293">
-									<reference key="NSNextResponder"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{0, 14}, {195, 23}}</string>
-									<reference key="NSSuperview"/>
-									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSegmentedCell" key="NSCell" id="124830474">
 										<int key="NSCellFlags">67239424</int>
@@ -178,11 +176,9 @@
 								<string key="NSToolbarItemPaletteLabel">Filter</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSearchField" key="NSToolbarItemView" id="1013657232">
-									<reference key="NSNextResponder"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">258</int>
 									<string key="NSFrame">{{0, 14}, {81, 22}}</string>
-									<reference key="NSSuperview"/>
-									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSearchFieldCell" key="NSCell" id="484816507">
 										<int key="NSCellFlags">343014976</int>
@@ -265,7 +261,7 @@
 								<nil key="NSToolbarItemTarget"/>
 								<nil key="NSToolbarItemAction"/>
 								<string key="NSToolbarItemMinSize">{81, 22}</string>
-								<string key="NSToolbarItemMaxSize">{200, 22}</string>
+								<string key="NSToolbarItemMaxSize">{300, 22}</string>
 								<bool key="NSToolbarItemEnabled">YES</bool>
 								<bool key="NSToolbarItemAutovalidates">YES</bool>
 								<int key="NSToolbarItemTag">0</int>
@@ -302,11 +298,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"/>
-									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSPopUpButtonCell" key="NSCell" id="436420677">
 										<int key="NSCellFlags">-2076049856</int>
@@ -991,6 +985,21 @@
 									<reference key="NSOnImage" ref="852972005"/>
 									<reference key="NSMixedImage" ref="218295580"/>
 								</object>
+								<object class="NSMenuItem" id="356425059">
+									<reference key="NSMenu" ref="948321368"/>
+									<string key="NSTitle">Load Recent Results</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="852972005"/>
+									<reference key="NSMixedImage" ref="218295580"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="782784943">
+										<string key="NSTitle">Load Recent Results</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+										</object>
+									</object>
+								</object>
 								<object class="NSMenuItem" id="975401896">
 									<reference key="NSMenu" ref="948321368"/>
 									<string key="NSTitle">Save Results...</string>
@@ -1463,9 +1472,6 @@
 			<object class="NSCustomObject" id="339936126">
 				<string key="NSClassName">ResultWindow</string>
 			</object>
-			<object class="NSCustomObject" id="455842268">
-				<string key="NSClassName">RecentDirectories</string>
-			</object>
 			<object class="NSCustomObject" id="875360857">
 				<string key="NSClassName">PyDupeGuru</string>
 			</object>
@@ -1652,22 +1658,6 @@
 					</object>
 					<int key="connectionID">445</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="455842268"/>
-						<reference key="destination" ref="91622651"/>
-					</object>
-					<int key="connectionID">502</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">recentDirectories</string>
-						<reference key="source" ref="91622651"/>
-						<reference key="destination" ref="455842268"/>
-					</object>
-					<int key="connectionID">503</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">toggleDetailsPanel:</string>
@@ -2188,6 +2178,14 @@
 					</object>
 					<int key="connectionID">1238</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">recentResultsMenu</string>
+						<reference key="source" ref="91622651"/>
+						<reference key="destination" ref="782784943"/>
+					</object>
+					<int key="connectionID">1242</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2661,12 +2659,6 @@
 						<reference key="parent" ref="0"/>
 						<string key="objectName">ResultWindow</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">497</int>
-						<reference key="object" ref="455842268"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">RecentDirectoriesController</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">613</int>
 						<reference key="object" ref="875360857"/>
@@ -2946,6 +2938,7 @@
 							<reference ref="777321316"/>
 							<reference ref="975401896"/>
 							<reference ref="630362403"/>
+							<reference ref="356425059"/>
 						</object>
 						<reference key="parent" ref="252491888"/>
 					</object>
@@ -3062,6 +3055,23 @@
 						<reference key="object" ref="124830474"/>
 						<reference key="parent" ref="474998293"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1239</int>
+						<reference key="object" ref="356425059"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="782784943"/>
+						</object>
+						<reference key="parent" ref="948321368"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1240</int>
+						<reference key="object" ref="782784943"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="parent" ref="356425059"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -3124,6 +3134,9 @@
 					<string>1234.IBPluginDependency</string>
 					<string>1235.IBPluginDependency</string>
 					<string>1235.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
+					<string>1239.IBPluginDependency</string>
+					<string>1240.IBEditorWindowLastContentRect</string>
+					<string>1240.IBPluginDependency</string>
 					<string>134.IBPluginDependency</string>
 					<string>134.ImportedFromIB2</string>
 					<string>136.IBPluginDependency</string>
@@ -3165,7 +3178,6 @@
 					<string>398.ImportedFromIB2</string>
 					<string>399.IBPluginDependency</string>
 					<string>399.ImportedFromIB2</string>
-					<string>497.ImportedFromIB2</string>
 					<string>5.IBPluginDependency</string>
 					<string>5.ImportedFromIB2</string>
 					<string>541.IBPluginDependency</string>
@@ -3337,7 +3349,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{242, 705}, {258, 63}}</string>
+					<string>{{242, 685}, {258, 83}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3359,6 +3371,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="2"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{500, 742}, {64, 6}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -3399,7 +3414,6 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3551,7 +3565,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1238</int>
+			<int key="maxID">1242</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3559,101 +3573,11 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">AppDelegate</string>
 					<string key="superclassName">AppDelegateBase</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>openWebsite:</string>
-							<string>toggleDirectories:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>openWebsite:</string>
-							<string>toggleDirectories:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">openWebsite:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleDirectories:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">AppDelegate.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppDelegate</string>
-					<string key="superclassName">AppDelegateBase</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">unlockApp:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">unlockApp:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">unlockApp:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>py</string>
-							<string>recentDirectories</string>
-							<string>unlockMenuItem</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>PyDupeGuru</string>
-							<string>RecentDirectories</string>
-							<string>NSMenuItem</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>py</string>
-							<string>recentDirectories</string>
-							<string>unlockMenuItem</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">py</string>
-								<string key="candidateClassName">PyDupeGuru</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">recentDirectories</string>
-								<string key="candidateClassName">RecentDirectories</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">unlockMenuItem</string>
-								<string key="candidateClassName">NSMenuItem</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">AppDelegateBase</string>
 					<string key="superclassName">NSObject</string>
@@ -3664,12 +3588,14 @@
 							<string>openHelp:</string>
 							<string>openWebsite:</string>
 							<string>showAboutBox:</string>
+							<string>toggleDirectories:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -3679,6 +3605,7 @@
 							<string>openHelp:</string>
 							<string>openWebsite:</string>
 							<string>showAboutBox:</string>
+							<string>toggleDirectories:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3694,6 +3621,10 @@
 								<string key="name">showAboutBox:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">toggleDirectories:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -3701,13 +3632,13 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>py</string>
-							<string>recentDirectories</string>
+							<string>recentResultsMenu</string>
 							<string>result</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>PyDupeGuruBase</string>
-							<string>RecentDirectories</string>
+							<string>NSMenu</string>
 							<string>ResultWindowBase</string>
 						</object>
 					</object>
@@ -3716,7 +3647,7 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>py</string>
-							<string>recentDirectories</string>
+							<string>recentResultsMenu</string>
 							<string>result</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -3726,8 +3657,8 @@
 								<string key="candidateClassName">PyDupeGuruBase</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">recentDirectories</string>
+								<string key="name">recentResultsMenu</string>
-								<string key="candidateClassName">RecentDirectories</string>
+								<string key="candidateClassName">NSMenu</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">result</string>
@@ -3834,86 +3765,6 @@
 						<string key="minorKey">../PyFairware.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">RecentDirectories</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>clearMenu:</string>
-							<string>menuClick:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>clearMenu:</string>
-							<string>menuClick:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">clearMenu:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">menuClick:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>delegate</string>
-							<string>menu</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>NSMenu</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>delegate</string>
-							<string>menu</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">delegate</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">menu</string>
-								<string key="candidateClassName">NSMenu</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../RecentDirectories.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">RecentDirectories</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">ResultWindow</string>
 					<string key="superclassName">ResultWindowBase</string>

cocoa/me/AppDelegate.h

@@ -12,8 +12,5 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "PyDupeGuru.h"
 
 @interface AppDelegate : AppDelegateBase {}
-- (IBAction)openWebsite:(id)sender;
-- (IBAction)toggleDirectories:(id)sender;
-
 - (PyDupeGuru *)py;
 @end

cocoa/me/AppDelegate.m

@@ -56,14 +56,9 @@ http://www.hardcoded.net/licenses/bsd_license
     return self;
 }
 
-- (IBAction)openWebsite:(id)sender
+- (NSString *)homepageURL
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru_me"]];
+    return @"http://www.hardcoded.net/dupeguru_me/"
-}
-
-- (IBAction)toggleDirectories:(id)sender
-{
-    [[self directoryPanel] toggleVisible:sender];
 }
 
 - (DirectoryPanel *)directoryPanel

cocoa/me/ResultWindow.m

@@ -51,9 +51,8 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (IBAction)startDuplicateScan:(id)sender
 {
-    if ([matches numberOfRows] > 0)
+    if ([py resultsAreModified]) {
-    {
+        if ([Dialogs askYesNo:@"You have unsaved results, do you really want to continue?"] == NSAlertSecondButtonReturn) // NO
-        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
             return;
     }
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];

cocoa/me/dupeguru.xcodeproj/project.pbxproj

@@ -29,12 +29,13 @@
 		CE003CCB11242D00004B0AA7 /* NSIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CC311242D00004B0AA7 /* NSIndexPathAdditions.m */; };
 		CE003CCC11242D00004B0AA7 /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CC511242D00004B0AA7 /* NSTableViewAdditions.m */; };
 		CE003CD011242D2C004B0AA7 /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */; };
-		CE073F6309CAE1A3005C1D2F /* dupeguru_me_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */; };
+		CE073F6309CAE1A3005C1D2F /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; };
 		CE0A0C001175A1C000DCA3C6 /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0A0BFF1175A1C000DCA3C6 /* HSTable.m */; };
 		CE0A0C041175A1DE00DCA3C6 /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0A0C021175A1DE00DCA3C6 /* ProblemDialog.m */; };
 		CE0A0C061175A24800DCA3C6 /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0A0C051175A24800DCA3C6 /* ProblemDialog.xib */; };
 		CE1425890AFB718500BD5167 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE14259F0AFB719300BD5167 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
+		CE1EAA0A12DF3E81009BA949 /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1EAA0912DF3E81009BA949 /* HSRecentFiles.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 */; };
@@ -48,7 +49,6 @@
 		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 */; };
 		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 */; };
@@ -112,7 +112,7 @@
 		CE003CCD11242D2C004B0AA7 /* DirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryOutline.h; path = ../base/DirectoryOutline.h; sourceTree = SOURCE_ROOT; };
 		CE003CCE11242D2C004B0AA7 /* DirectoryOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryOutline.m; path = ../base/DirectoryOutline.m; sourceTree = SOURCE_ROOT; };
 		CE003CCF11242D2C004B0AA7 /* PyDirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDirectoryOutline.h; path = ../base/PyDirectoryOutline.h; sourceTree = SOURCE_ROOT; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = help; path = ../../build/help; sourceTree = "<group>"; };
+		CE073F5409CAE1A3005C1D2F /* help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = help; path = ../../build/help; sourceTree = "<group>"; };
 		CE0A0BFE1175A1C000DCA3C6 /* HSTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSTable.h; sourceTree = "<group>"; };
 		CE0A0BFF1175A1C000DCA3C6 /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
 		CE0A0C011175A1DE00DCA3C6 /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; };
@@ -121,6 +121,8 @@
 		CE0A0C051175A24800DCA3C6 /* ProblemDialog.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ProblemDialog.xib; path = ../base/xib/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
 		CE0A0C131175A28100DCA3C6 /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
 		CE1425880AFB718500BD5167 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
+		CE1EAA0812DF3E81009BA949 /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; };
+		CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.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; };
@@ -142,8 +144,6 @@
 		CE515DE60FC6C12E00EC695D /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
 		CE515DE70FC6C12E00EC695D /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
 		CE515DE80FC6C12E00EC695D /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
-		CE515DE90FC6C12E00EC695D /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
 		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; };
@@ -265,7 +265,7 @@
 			isa = PBXGroup;
 			children = (
 				CE3FBDD01094637800B72D77 /* xib */,
-				CE073F5409CAE1A3005C1D2F /* dupeguru_me_help */,
+				CE073F5409CAE1A3005C1D2F /* help */,
 				CE381CF509915304003581CE /* dg_cocoa.plugin */,
 				CEFC294309C89E0000D9F998 /* images */,
 				CEEB135109C837A2004D2330 /* dupeguru.icns */,
@@ -378,13 +378,13 @@
 				CE74A12312537F06008A8DF0 /* PyFairware.h */,
 				CE4F934712CCA96C0067A3AE /* HSAboutBox.h */,
 				CE4F934812CCA96C0067A3AE /* HSAboutBox.m */,
+				CE1EAA0812DF3E81009BA949 /* HSRecentFiles.h */,
+				CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */,
 				CE003CB911242D00004B0AA7 /* NSEventAdditions.h */,
 				CE003CBA11242D00004B0AA7 /* NSEventAdditions.m */,
 				CE515DE60FC6C12E00EC695D /* ProgressController.h */,
 				CE515DE70FC6C12E00EC695D /* ProgressController.m */,
 				CE515DE80FC6C12E00EC695D /* PyApp.h */,
-				CE515DE90FC6C12E00EC695D /* RecentDirectories.h */,
-				CE515DEA0FC6C12E00EC695D /* RecentDirectories.m */,
 				CE515DEF0FC6C12E00EC695D /* Utils.h */,
 				CE515DF00FC6C12E00EC695D /* Utils.m */,
 				CE515DF10FC6C12E00EC695D /* ValueTransformers.h */,
@@ -487,7 +487,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
-				CE073F6309CAE1A3005C1D2F /* dupeguru_me_help in Resources */,
+				CE073F6309CAE1A3005C1D2F /* help in Resources */,
 				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
 				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
@@ -519,7 +519,6 @@
 				CE515DF30FC6C12E00EC695D /* Dialogs.m in Sources */,
 				CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */,
 				CE515DF60FC6C12E00EC695D /* ProgressController.m in Sources */,
-				CE515DF70FC6C12E00EC695D /* RecentDirectories.m in Sources */,
 				CE515DFA0FC6C12E00EC695D /* Utils.m in Sources */,
 				CE515DFB0FC6C12E00EC695D /* ValueTransformers.m in Sources */,
 				CE515E1D0FC6C19300EC695D /* AppDelegate.m in Sources */,
@@ -542,6 +541,7 @@
 				CE578303124DFC660004769C /* HSTableView.m in Sources */,
 				CE74A12412537F06008A8DF0 /* HSFairwareReminder.m in Sources */,
 				CE4F934912CCA96C0067A3AE /* HSAboutBox.m in Sources */,
+				CE1EAA0A12DF3E81009BA949 /* HSRecentFiles.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

cocoa/pe/AppDelegate.h

@@ -12,7 +12,6 @@ http://www.hardcoded.net/licenses/bsd_license
 
 @interface AppDelegate : AppDelegateBase {}
 - (IBAction)openWebsite:(id)sender;
-- (IBAction)toggleDirectories:(id)sender;
 
 - (PyDupeGuru *)py;
 @end

cocoa/pe/AppDelegate.m

@@ -48,14 +48,9 @@ http://www.hardcoded.net/licenses/bsd_license
     return _detailsPanel;
 }
 
-- (IBAction)openWebsite:(id)sender
+- (NSString *)homepageURL
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru_pe"]];
+    return @"http://www.hardcoded.net/dupeguru_pe/"
-}
-
-- (IBAction)toggleDirectories:(id)sender
-{
-    [[self directoryPanel] toggleVisible:sender];
 }
 
 - (DirectoryPanel *)directoryPanel

cocoa/pe/ResultWindow.m

@@ -51,9 +51,8 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (IBAction)startDuplicateScan:(id)sender
 {
-    if ([matches numberOfRows] > 0)
+    if ([py resultsAreModified]) {
-    {
+        if ([Dialogs askYesNo:@"You have unsaved results, do you really want to continue?"] == NSAlertSecondButtonReturn) // NO
-        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
             return;
     }
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];

cocoa/pe/dupeguru.xcodeproj/project.pbxproj

@@ -11,7 +11,7 @@
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		CE031751109B340A00517EE6 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031750109B340A00517EE6 /* Preferences.xib */; };
 		CE031754109B345200517EE6 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031753109B345200517EE6 /* MainMenu.xib */; };
-		CE073F6309CAE1A3005C1D2F /* dupeguru_pe_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */; };
+		CE073F6309CAE1A3005C1D2F /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; };
 		CE0C2AB61177011000BC749F /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2AB51177011000BC749F /* HSTable.m */; };
 		CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2ABB1177014200BC749F /* ProblemDialog.m */; };
 		CE0C2AC81177021600BC749F /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0C2AC71177021600BC749F /* ProblemDialog.xib */; };
@@ -22,6 +22,7 @@
 		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 */; };
+		CE60180812DF3EA900236FDC /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CE60180712DF3EA900236FDC /* HSRecentFiles.m */; };
 		CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6044EB0FE6796200B71262 /* DetailsPanel.m */; };
 		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; };
 		CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */; };
@@ -32,7 +33,6 @@
 		CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1C0FC192D60086DCA6 /* Dialogs.m */; };
 		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 */; };
 		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 */; };
@@ -89,7 +89,7 @@
 		8D1107320486CEB800E47090 /* dupeGuru PE.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "dupeGuru PE.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CE031750109B340A00517EE6 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
 		CE031753109B345200517EE6 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../../base/xib/MainMenu.xib; sourceTree = "<group>"; };
-		CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = help; path = ../../build/help; sourceTree = SOURCE_ROOT; };
+		CE073F5409CAE1A3005C1D2F /* help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = help; path = ../../build/help; sourceTree = SOURCE_ROOT; };
 		CE0C2AAA117700E700BC749F /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
 		CE0C2AB41177011000BC749F /* HSTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSTable.h; sourceTree = "<group>"; };
 		CE0C2AB51177011000BC749F /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
@@ -108,6 +108,8 @@
 		CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; };
 		CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; };
 		CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; };
+		CE60180612DF3EA900236FDC /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; };
+		CE60180712DF3EA900236FDC /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.m; sourceTree = SOURCE_ROOT; };
 		CE6044EA0FE6796200B71262 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CE6044EB0FE6796200B71262 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; };
 		CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; };
@@ -124,8 +126,6 @@
 		CE80DB210FC192D60086DCA6 /* ProgressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressController.h; path = ../../cocoalib/ProgressController.h; sourceTree = SOURCE_ROOT; };
 		CE80DB220FC192D60086DCA6 /* ProgressController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProgressController.m; path = ../../cocoalib/ProgressController.m; sourceTree = SOURCE_ROOT; };
 		CE80DB230FC192D60086DCA6 /* PyApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyApp.h; path = ../../cocoalib/PyApp.h; sourceTree = SOURCE_ROOT; };
-		CE80DB240FC192D60086DCA6 /* RecentDirectories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecentDirectories.h; path = ../../cocoalib/RecentDirectories.h; sourceTree = SOURCE_ROOT; };
-		CE80DB250FC192D60086DCA6 /* RecentDirectories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RecentDirectories.m; path = ../../cocoalib/RecentDirectories.m; sourceTree = SOURCE_ROOT; };
 		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; };
@@ -268,7 +268,7 @@
 			isa = PBXGroup;
 			children = (
 				CE77C89A10946C6D0078B0DB /* xib */,
-				CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */,
+				CE073F5409CAE1A3005C1D2F /* help */,
 				CE381CF509915304003581CE /* dg_cocoa.plugin */,
 				CEFC294309C89E0000D9F998 /* images */,
 				CEEB135109C837A2004D2330 /* dupeguru.icns */,
@@ -334,11 +334,11 @@
 				CE1EB5FD12537F9D0034AABB /* PyFairware.h */,
 				CEC9DB4A12CCAA7D003102F0 /* HSAboutBox.h */,
 				CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.m */,
+				CE60180612DF3EA900236FDC /* HSRecentFiles.h */,
+				CE60180712DF3EA900236FDC /* HSRecentFiles.m */,
 				CE80DB210FC192D60086DCA6 /* ProgressController.h */,
 				CE80DB220FC192D60086DCA6 /* ProgressController.m */,
 				CE80DB230FC192D60086DCA6 /* PyApp.h */,
-				CE80DB240FC192D60086DCA6 /* RecentDirectories.h */,
-				CE80DB250FC192D60086DCA6 /* RecentDirectories.m */,
 				CE80DB2A0FC192D60086DCA6 /* Utils.h */,
 				CE80DB2B0FC192D60086DCA6 /* Utils.m */,
 				CE80DB2C0FC192D60086DCA6 /* ValueTransformers.h */,
@@ -494,7 +494,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */,
-				CE073F6309CAE1A3005C1D2F /* dupeguru_pe_help in Resources */,
+				CE073F6309CAE1A3005C1D2F /* help in Resources */,
 				CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
 				CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
 				CEFC295509C89FF200D9F998 /* details32.png in Resources */,
@@ -528,7 +528,6 @@
 				CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */,
 				CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */,
 				CE80DB310FC192D60086DCA6 /* ProgressController.m in Sources */,
-				CE80DB320FC192D60086DCA6 /* RecentDirectories.m in Sources */,
 				CE80DB350FC192D60086DCA6 /* Utils.m in Sources */,
 				CE80DB360FC192D60086DCA6 /* ValueTransformers.m in Sources */,
 				CE80DB470FC193650086DCA6 /* NSNotificationAdditions.m in Sources */,
@@ -553,6 +552,7 @@
 				CEF12A84124DFD620087B51D /* ResultTable.m in Sources */,
 				CE1EB5FE12537F9D0034AABB /* HSFairwareReminder.m in Sources */,
 				CEC9DB4C12CCAA7D003102F0 /* HSAboutBox.m in Sources */,
+				CE60180812DF3EA900236FDC /* HSRecentFiles.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

cocoa/se/AppDelegate.h

@@ -11,8 +11,5 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "PyDupeGuru.h"
 
 @interface AppDelegate : AppDelegateBase {}
-- (IBAction)openWebsite:(id)sender;
-- (IBAction)toggleDirectories:(id)sender;
-
 - (PyDupeGuru *)py;
 @end

cocoa/se/AppDelegate.m

@@ -47,14 +47,9 @@ http://www.hardcoded.net/licenses/bsd_license
     return self;
 }
 
-- (IBAction)openWebsite:(id)sender
+- (NSString *)homepageURL
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru"]];
+    return @"http://www.hardcoded.net/dupeguru/";
-}
-
-- (IBAction)toggleDirectories:(id)sender
-{
-    [[self directoryPanel] toggleVisible:sender];
 }
 
 - (PyDupeGuru *)py { return (PyDupeGuru *)py; }

cocoa/se/ResultWindow.m

@@ -41,9 +41,8 @@ http://www.hardcoded.net/licenses/bsd_license
 
 - (IBAction)startDuplicateScan:(id)sender
 {
-    if ([matches numberOfRows] > 0)
+    if ([py resultsAreModified]) {
-    {
+        if ([Dialogs askYesNo:@"You have unsaved results, do you really want to continue?"] == NSAlertSecondButtonReturn) // NO
-        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
             return;
     }
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];

cocoa/se/dupeguru.xcodeproj/project.pbxproj

@@ -43,12 +43,12 @@
 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
 		CEEFC0F810945D9F001F3A39 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */; };
 		CEEFC0FB10945E37001F3A39 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */; };
+		CEF0ACCE12DF3C2000B32F7E /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */; };
 		CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
 		CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
 		CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8B0FC9517500CD5728 /* Dialogs.m */; };
 		CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */; };
 		CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F910FC9517500CD5728 /* ProgressController.m */; };
-		CEFC7FA20FC9517500CD5728 /* RecentDirectories.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F950FC9517500CD5728 /* RecentDirectories.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 */; };
@@ -137,6 +137,8 @@
 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; };
 		CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; };
 		CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailsPanel.xib; path = ../base/xib/DetailsPanel.xib; sourceTree = "<group>"; };
+		CEF0ACCC12DF3C2000B32F7E /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; };
+		CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.m; sourceTree = SOURCE_ROOT; };
 		CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
 		CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
 		CEFC7F8A0FC9517500CD5728 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
@@ -146,8 +148,6 @@
 		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; };
-		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; };
 		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; };
@@ -356,11 +356,11 @@
 				CE79638212536C6E008D405B /* PyFairware.h */,
 				CE27D3C212CCA43800859E67 /* HSAboutBox.h */,
 				CE27D3C312CCA43800859E67 /* HSAboutBox.m */,
+				CEF0ACCC12DF3C2000B32F7E /* HSRecentFiles.h */,
+				CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */,
 				CEFC7F900FC9517500CD5728 /* ProgressController.h */,
 				CEFC7F910FC9517500CD5728 /* ProgressController.m */,
 				CEFC7F920FC9517500CD5728 /* PyApp.h */,
-				CEFC7F940FC9517500CD5728 /* RecentDirectories.h */,
-				CEFC7F950FC9517500CD5728 /* RecentDirectories.m */,
 				CEFC7F9A0FC9517500CD5728 /* Utils.h */,
 				CEFC7F9B0FC9517500CD5728 /* Utils.m */,
 				CEFC7F9C0FC9517500CD5728 /* ValueTransformers.h */,
@@ -485,7 +485,6 @@
 				CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */,
 				CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */,
 				CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */,
-				CEFC7FA20FC9517500CD5728 /* RecentDirectories.m in Sources */,
 				CEFC7FA50FC9517500CD5728 /* Utils.m in Sources */,
 				CEFC7FA60FC9517500CD5728 /* ValueTransformers.m in Sources */,
 				CEFC7FB90FC951A700CD5728 /* AppDelegate.m in Sources */,
@@ -508,6 +507,7 @@
 				CE6DD547124CAF1F0089A48D /* HSTableView.m in Sources */,
 				CE79638C12536F4E008D405B /* HSFairwareReminder.m in Sources */,
 				CE27D3C412CCA43800859E67 /* HSAboutBox.m in Sources */,
+				CEF0ACCE12DF3C2000B32F7E /* HSRecentFiles.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

core/app.py

@@ -67,11 +67,6 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             os.link(str(ref.path), str(dupe.path))
         self.clean_empty_dirs(dupe.path[:-1])
     
-    def _do_load(self, j):
-        self.directories.load_from_file(op.join(self.appdata, 'last_directories.xml'))
-        self.notify('directories_changed')
-        self.results.load_from_xml(op.join(self.appdata, 'last_results.xml'), self._get_file, j)
-    
     def _get_display_info(self, dupe, group, delta=False):
         if (dupe is None) or (group is None):
             return ['---'] * len(self.data.COLUMNS)
@@ -244,18 +239,16 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             subprocess.Popen(cmd, shell=True)
     
     def load(self):
-        self._start_job(JOB_LOAD, self._do_load)
+        self.directories.load_from_file(op.join(self.appdata, 'last_directories.xml'))
-        self.load_ignore_list()
+        self.notify('directories_changed')
+        p = op.join(self.appdata, 'ignore_list.xml')
+        self.scanner.ignore_list.load_from_xml(p)
     
     def load_from(self, filename):
         def do(j):
             self.results.load_from_xml(filename, self._get_file, j)
         self._start_job(JOB_LOAD, do)
     
-    def load_ignore_list(self):
-        p = op.join(self.appdata, 'ignore_list.xml')
-        self.scanner.ignore_list.load_from_xml(p)
-    
     def make_selected_reference(self):
         dupes = self.without_ref(self.selected_dupes)
         changed_groups = set()
@@ -327,19 +320,11 @@ class DupeGuru(RegistrableApplication, Broadcaster):
         if not op.exists(self.appdata):
             os.makedirs(self.appdata)
         self.directories.save_to_file(op.join(self.appdata, 'last_directories.xml'))
-        if self.results.is_modified:
+        p = op.join(self.appdata, 'ignore_list.xml')
-            self.results.save_to_xml(op.join(self.appdata, 'last_results.xml'))
+        self.scanner.ignore_list.save_to_xml(p)
     
     def save_as(self, filename):
         self.results.save_to_xml(filename)
-        # It's not because we saved it here that we don't want to save it in appdata when we quit
-        self.results.is_modified = True
-    
-    def save_ignore_list(self):
-        if not op.exists(self.appdata):
-            os.makedirs(self.appdata)
-        p = op.join(self.appdata, 'ignore_list.xml')
-        self.scanner.ignore_list.save_to_xml(p)
     
     def start_scanning(self):
         def do(j):

core/app_cocoa_inter.py

@@ -40,10 +40,7 @@ class PyDupeGuruBase(PyFairware):
     def exportToXHTMLwithColumns_(self, column_ids):
         return self.py.export_to_xhtml(column_ids)
     
-    def loadIgnoreList(self):
+    def loadSession(self):
-        self.py.load_ignore_list()
-    
-    def loadResults(self):
         self.py.load()
     
     def loadResultsFrom_(self, filename):
@@ -64,10 +61,7 @@ class PyDupeGuruBase(PyFairware):
     def toggleSelectedMark(self):
         self.py.toggle_selected_mark_state()
     
-    def saveIgnoreList(self):
+    def saveSession(self):
-        self.py.save_ignore_list()
-    
-    def saveResults(self):
         self.py.save()
     
     def saveResultsAs_(self, filename):
@@ -118,6 +112,10 @@ class PyDupeGuruBase(PyFairware):
     def scanWasProblematic(self):
         return bool(self.py.results.problems)
     
+    @signature('i@:')
+    def resultsAreModified(self):
+        return self.py.results.is_modified
+    
     #---Properties
     @signature('v@:c')
     def setMixFileKind_(self, mix_file_kind):

qt/base/app.py

@@ -202,7 +202,6 @@ class DupeGuru(DupeGuruBase, QObject):
         self.willSavePrefs.emit()
         self.prefs.save()
         self.save()
-        self.save_ignore_list()
     
     def job_finished(self, jobid):
         self._job_completed(jobid)

qt/base/main_window.py

@@ -14,6 +14,7 @@ from PyQt4.QtGui import (QMainWindow, QMenu, QPixmap, QIcon, QToolButton, QLabel
     QToolBar, QWidget, QVBoxLayout, QAbstractItemView, QStatusBar)
 
 from hscommon.util import nonone
+from qtlib.recent import Recent
 
 from core.app import NoScannableFileError
 
@@ -63,7 +64,7 @@ class MainWindow(QMainWindow):
             ('actionInvertMarking', 'Ctrl+Alt+A', '', "Invert Marking", self.markInvertTriggered),
             ('actionMarkSelected', '', '', "Mark Selected", self.markSelectedTriggered),
             ('actionClearIgnoreList', '', '', "Clear Ignore List", self.clearIgnoreListTriggered),
-            ('actionQuit', 'Ctrl+Q', '', "Quit", QCoreApplication.instance().quit),
+            ('actionQuit', 'Ctrl+Q', '', "Quit", self.close),
             ('actionApplyFilter', 'Ctrl+F', '', "Apply Filter", self.applyFilterTriggered),
             ('actionCancelFilter', 'Ctrl+Shift+F', '', "Cancel Filter", self.cancelFilterTriggered),
             ('actionShowHelp', 'F1', '', "dupeGuru Help", self.showHelpTriggered),
@@ -105,6 +106,8 @@ class MainWindow(QMainWindow):
         self.menuWindow.setTitle("Windows")
         self.menuHelp = QMenu(self.menubar)
         self.menuHelp.setTitle("Help")
+        self.menuLoadRecent = QMenu(self.menuFile)
+        self.menuLoadRecent.setTitle("Load Recent Results")
         self.setMenuBar(self.menubar)
         
         self.menuActions.addAction(self.actionDeleteMarked)
@@ -141,6 +144,7 @@ class MainWindow(QMainWindow):
         self.menuFile.addAction(self.actionScan)
         self.menuFile.addSeparator()
         self.menuFile.addAction(self.actionLoadResults)
+        self.menuFile.addAction(self.menuLoadRecent.menuAction())
         self.menuFile.addAction(self.actionSaveResults)
         self.menuFile.addAction(self.actionExport)
         self.menuFile.addAction(self.actionClearIgnoreList)
@@ -227,6 +231,8 @@ class MainWindow(QMainWindow):
         self._setupActions()
         self._setupMenu()
         self._setupToolbar()
+        self.recentResults = Recent(self.app, self.menuLoadRecent, 'recentResults')
+        self.recentResults.mustOpenItem.connect(self.app.load_from)
         self.statusbar = QStatusBar(self)
         self.statusbar.setSizeGripEnabled(True)
         self.setStatusBar(self.statusbar)
@@ -264,6 +270,15 @@ class MainWindow(QMainWindow):
             colid = action.column_index
             action.setChecked(not h.isSectionHidden(colid))
     
+    #--- QWidget overrides
+    def closeEvent(self, event):
+        event.accept()
+        if self.app.results.is_modified:
+            title = "Unsaved results"
+            msg = "You have unsaved results, do you really want to quit?"
+            if not self._confirm(title, msg):
+                event.ignore()
+    
     #--- Actions
     def aboutTriggered(self):
         self.app.show_about_box()
@@ -348,6 +363,7 @@ class MainWindow(QMainWindow):
         destination = QFileDialog.getOpenFileName(self, title, '', files)
         if destination:
             self.app.load_from(destination)
+            self.recentResults.insertItem(destination)
     
     def makeReferenceTriggered(self):
         self.app.make_selected_reference()
@@ -406,6 +422,7 @@ class MainWindow(QMainWindow):
         destination = QFileDialog.getSaveFileName(self, title, '', files)
         if destination:
             self.app.save_as(destination)
+            self.recentResults.insertItem(destination)
     
     def scanTriggered(self):
         title = "Start a new scan"

qt/base/preferences.py

@@ -40,6 +40,7 @@ class Preferences(PreferencesBase):
         self.mainWindowRect = self.get_rect('MainWindowRect', self.mainWindowRect)
         self.detailsWindowRect = self.get_rect('DetailsWindowRect', self.detailsWindowRect)
         self.directoriesWindowRect = self.get_rect('DirectoriesWindowRect', self.directoriesWindowRect)
+        self.recentResults = get('RecentResults', self.recentResults)
         
         self.registration_code = get('RegistrationCode', self.registration_code)
         self.registration_email = get('RegistrationEmail', self.registration_email)
@@ -62,6 +63,7 @@ class Preferences(PreferencesBase):
         self.mainWindowRect = None
         self.detailsWindowRect = None
         self.directoriesWindowRect = None
+        self.recentResults = []
         
         self.registration_code = ''
         self.registration_email = ''
@@ -91,6 +93,7 @@ class Preferences(PreferencesBase):
         self.set_rect('MainWindowRect', self.mainWindowRect)
         self.set_rect('DetailsWindowRect', self.detailsWindowRect)
         self.set_rect('DirectoriesWindowRect', self.directoriesWindowRect)
+        set_('RecentResults', self.recentResults)
         
         set_('RegistrationCode', self.registration_code)
         set_('RegistrationEmail', self.registration_email)