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.

2026-01-22 14:41:39 +00:00 · 2011-01-13 16:20:03 +01:00
parent 064707db43
commit 3ef118c9fa
26 changed files with 257 additions and 384 deletions
--- a/cocoa/base/AppDelegate.h
+++ b/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
--- a/cocoa/base/AppDelegate.m
+++ b/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;
-    }
-    [py saveIgnoreList];
-    [py saveResults];
-    _savedResults = YES;
+    return _recentResults;
+}
+
+- (NSString *)homepageURL
+{
+    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 loadIgnoreList];
-    [py loadResults];
-    _savedResults = NO;
+    [py loadSession];
 }

 - (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
-    [recentDirectories release];
+    // But I need to release HSRecentFiles so it saves the user defaults
+    [_directoryPanel release];
+    [_recentResults release];
 }

- (void)recentDirecoryClicked:(NSString *)directory
+- (void)recentFileClicked:(NSString *)path
 {
-    [[self directoryPanel] addDirectory:directory];
-}
-
-/* SUUpdater delegate */
-
- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation;
-{
-    /* If results aren't saved now, we might get a weird utf-8 lookup error when saving later.
-    **/
-    [self saveResults];
-    return NO;
+    [py loadResultsFrom:path];
 }
@end
--- a/cocoa/base/DirectoryPanel.h
+++ b/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;
--- a/cocoa/base/DirectoryPanel.m
+++ b/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];
-    while ([m numberOfItems] > 0)
-        [m removeItemAtIndex:0];
-    NSMenuItem *mi = [m addItemWithTitle:@"Add New Directory..." action:@selector(askForDirectory:) keyEquivalent:@""];
-    [mi setTarget:self];
-    [m addItem:[NSMenuItem separatorItem]];
-    [_recentDirectories fillMenu:m];
-    [addButtonPopUp selectItem:nil];
-    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+    else {
+        [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
--- a/cocoa/base/PyDupeGuru.h
+++ b/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)saveIgnoreList;
+- (void)loadSession;
+- (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;
--- a/cocoa/base/ResultWindow.h
+++ b/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;
--- a/cocoa/base/ResultWindow.m
+++ b/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]];
    }
 }

--- a/cocoa/base/xib/DirectoryPanel.xib
+++ b/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.InterfaceBuilderVersion">788</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.SystemVersion">10J567</string>
+		<string key="IBDocument.InterfaceBuilderVersion">823</string>
+		<string key="IBDocument.AppKitVersion">1038.35</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>
-			<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="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">
--- a/cocoa/base/xib/MainMenu.xib
+++ b/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="candidateClassName">RecentDirectories</string>
+								<string key="name">recentResultsMenu</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>