diff --git a/LuLu/App/AppDelegate.m b/LuLu/App/AppDelegate.m index 91c869f..d90325e 100644 --- a/LuLu/App/AppDelegate.m +++ b/LuLu/App/AppDelegate.m @@ -95,11 +95,17 @@ -(void)applicationDidFinishLaunching:(NSNotification *)aNotification //alloc window controller welcomeWindowController = [[WelcomeWindowController alloc] initWithWindowNibName:@"Welcome"]; + //set activation policy + [self setActivationPolicy]; + //show window [self.welcomeWindowController showWindow:self]; - //set activation policy - [self setActivationPolicy]; + //make front + [[NSRunningApplication currentApplication] activateWithOptions:(NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)]; + + //make window front + [self.startupWindowController.window makeKeyAndOrderFront:nil]; //install (self as) login item if(YES != toggleLoginItem(NSBundle.mainBundle.bundleURL, ACTION_INSTALL_FLAG)) @@ -143,7 +149,10 @@ -(void)applicationDidFinishLaunching:(NSNotification *)aNotification //make window front [self.startupWindowController.window makeKeyAndOrderFront:nil]; - + + //make it modal(ish) + [self.startupWindowController.window setLevel:NSPopUpMenuWindowLevel]; + //show window [self.startupWindowController showWindow:nil]; } diff --git a/LuLu/App/Assets.xcassets/InstallApprove.imageset/approve.png b/LuLu/App/Assets.xcassets/InstallApprove.imageset/approve.png index b0f9f66..7cf3bc4 100644 Binary files a/LuLu/App/Assets.xcassets/InstallApprove.imageset/approve.png and b/LuLu/App/Assets.xcassets/InstallApprove.imageset/approve.png differ diff --git a/LuLu/App/StartupWindowController.m b/LuLu/App/StartupWindowController.m index 8a20327..cfbad52 100644 --- a/LuLu/App/StartupWindowController.m +++ b/LuLu/App/StartupWindowController.m @@ -51,6 +51,9 @@ -(void)awakeFromNib [NSApp activateIgnoringOtherApps:YES]; } + //(re)make front + [[NSRunningApplication currentApplication] activateWithOptions:(NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)]; + return; } diff --git a/LuLu/App/UpdateWindowController.m b/LuLu/App/UpdateWindowController.m index 87171e1..4f27bce 100644 --- a/LuLu/App/UpdateWindowController.m +++ b/LuLu/App/UpdateWindowController.m @@ -68,6 +68,9 @@ -(void)windowDidLoad [NSApp activateIgnoringOtherApps:YES]; } + //(re)make front + [[NSRunningApplication currentApplication] activateWithOptions:(NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)]; + return; } diff --git a/LuLu/App/WelcomeWindowController.m b/LuLu/App/WelcomeWindowController.m index 7b39f8a..5bb81b8 100644 --- a/LuLu/App/WelcomeWindowController.m +++ b/LuLu/App/WelcomeWindowController.m @@ -72,6 +72,9 @@ -(void)windowDidLoad { [NSApp activateIgnoringOtherApps:YES]; } + //(re)make front + [[NSRunningApplication currentApplication] activateWithOptions:(NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)]; + return; } @@ -233,6 +236,9 @@ -(IBAction)buttonHandler:(id)sender { [NSApp activateIgnoringOtherApps:YES]; } + //(re)make front + [[NSRunningApplication currentApplication] activateWithOptions:(NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)]; + }); //signal semaphore @@ -250,7 +256,10 @@ -(IBAction)buttonHandler:(id)sender { //show configure view case SHOW_CONFIGURE: + + //show [self showView:self.configureView firstResponder:SHOW_SUPPORT]; + break; //show "support us" view diff --git a/LuLu/Shared/utilities.m b/LuLu/Shared/utilities.m index c16accf..493006b 100644 --- a/LuLu/Shared/utilities.m +++ b/LuLu/Shared/utilities.m @@ -1265,6 +1265,9 @@ NSModalResponse showAlert(NSAlertStyle style, NSString* messageText, NSString* i [NSApp activateIgnoringOtherApps:YES]; } + //(re)make front + [[NSRunningApplication currentApplication] activateWithOptions:(NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)]; + //make alert window front [alert.window makeKeyAndOrderFront:nil];