X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/a509b00348962d2980891d0c66657028e280e162..3a1a21d1ea3e060f88ca1d24ea881f3ccb97640c:/PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index b827375..590e6de 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -1,6 +1,7 @@
 #import "PreferencesController.h"
 #import "MainController.h"
 #import "StatusWindow.h"
+#import "StatusWindowController.h"
 #import "CustomMenuTableView.h"
 
 #import <ITKit/ITHotKeyCenter.h>
@@ -105,9 +106,10 @@ static PreferencesController *prefs = nil;
         //Change the launch player checkbox to the proper name
         [launchPlayerAtLaunchCheckbox setTitle:[NSString stringWithFormat:@"Launch %@ when MenuTunes launches", [[controller currentRemote] playerSimpleName]]]; //This isn't localized...
     }
-    [window setLevel:NSStatusWindowLevel];
+
     [window center];
-    [window makeKeyAndOrderFront:self];
+    [NSApp activateIgnoringOtherApps:YES];
+    [window performSelector:@selector(makeKeyAndOrderFront:) withObject:self afterDelay:0.0];
 }
 
 - (IBAction)changeGeneralSetting:(id)sender
@@ -308,12 +310,26 @@ static PreferencesController *prefs = nil;
     [loginWindow release];
     
     if (!found) {
-        if (NSRunInformationalAlertPanel(NSLocalizedString(@"autolaunch", @"Auto-launch MenuTunes"), NSLocalizedString(@"autolaunch_msg", @"Would you like MenuTunes to automatically launch at login?"), @"Yes", @"No", nil) == NSOKButton) {
-            [self setLaunchesAtLogin:YES];
-        }
+        [[StatusWindowController sharedController] showSetupQueryWindow];
     }
 }
 
+- (void)autoLaunchOK
+{
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+    
+    [self setLaunchesAtLogin:YES];
+}
+
+- (void)autoLaunchCancel
+{
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+}
+
 - (IBAction)cancelHotKey:(id)sender
 {
     ITDebugLog(@"Hot key canceled.");