diff --git a/cocoa/base/AppDelegate.h b/cocoa/base/AppDelegate.h
index 077198d1..315b9a2e 100644
--- a/cocoa/base/AppDelegate.h
+++ b/cocoa/base/AppDelegate.h
@@ -47,5 +47,6 @@ http://www.hardcoded.net/licenses/bsd_license
- (IBAction)openWebsite:(id)sender;
- (IBAction)openHelp:(id)sender;
- (IBAction)showPreferencesPanel:(id)sender;
+- (IBAction)startScanning:(id)sender;
- (IBAction)toggleDirectories:(id)sender;
@end
diff --git a/cocoa/base/AppDelegate.m b/cocoa/base/AppDelegate.m
index c468e9b6..61d849ef 100644
--- a/cocoa/base/AppDelegate.m
+++ b/cocoa/base/AppDelegate.m
@@ -24,6 +24,7 @@ http://www.hardcoded.net/licenses/bsd_license
_preferencesPanel = nil;
_recentResults = [[HSRecentFiles alloc] initWithName:@"recentResults" menu:recentResultsMenu];
[_recentResults setDelegate:self];
+ [[[self directoryPanel] window] makeKeyAndOrderFront:self];
}
/* Virtual */
@@ -109,6 +110,12 @@ http://www.hardcoded.net/licenses/bsd_license
[_preferencesPanel showWindow:sender];
}
+- (IBAction)startScanning:(id)sender
+{
+ [[[self resultWindow] window] makeKeyAndOrderFront:sender];
+ [[self resultWindow] startDuplicateScan:sender];
+}
+
- (IBAction)toggleDirectories:(id)sender
{
[[self directoryPanel] toggleVisible:sender];
@@ -132,8 +139,9 @@ http://www.hardcoded.net/licenses/bsd_license
- (void)applicationWillBecomeActive:(NSNotification *)aNotification
{
- if (![[[self resultWindow] window] isVisible])
- [[self resultWindow] showWindow:NSApp];
+ if (![[[self directoryPanel] window] isVisible]) {
+ [[self directoryPanel] showWindow:NSApp];
+ }
}
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
diff --git a/cocoa/base/ResultWindow.m b/cocoa/base/ResultWindow.m
index 29753253..c29b3056 100644
--- a/cocoa/base/ResultWindow.m
+++ b/cocoa/base/ResultWindow.m
@@ -407,11 +407,6 @@ http://www.hardcoded.net/licenses/bsd_license
}
/* Notifications */
-- (void)windowWillClose:(NSNotification *)aNotification
-{
- [NSApp hide:NSApp];
-}
-
- (void)jobCompleted:(NSNotification *)aNotification
{
id lastAction = [[ProgressController mainProgressController] jobId];
@@ -444,10 +439,6 @@ http://www.hardcoded.net/licenses/bsd_license
if (rowCount == 0)
[Dialogs showMessage:@"No duplicates found."];
}
-
- // Re-activate toolbar items right after the progress bar stops showing instead of waiting until
- // a mouse-over is performed
- [[[self window] toolbar] validateVisibleItems];
}
- (void)jobInProgress:(NSNotification *)aNotification
diff --git a/cocoa/base/xib/DirectoryPanel.xib b/cocoa/base/xib/DirectoryPanel.xib
index 5ef03788..10840f06 100644
--- a/cocoa/base/xib/DirectoryPanel.xib
+++ b/cocoa/base/xib/DirectoryPanel.xib
@@ -12,7 +12,7 @@