From 85c6b71293086efebec42bde3607f877d824e313 Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Sun, 10 Aug 2008 16:50:02 +0200 Subject: [PATCH] "New Window" item on Dock menu activates MacVim --- .../English.lproj/MainMenu.nib/classes.nib | 2 ++ .../English.lproj/MainMenu.nib/info.nib | 4 +--- .../MainMenu.nib/keyedobjects.nib | Bin 11364 -> 11393 bytes src/MacVim/MMAppController.h | 2 ++ src/MacVim/MMAppController.m | 17 +++++++++++++++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/MacVim/English.lproj/MainMenu.nib/classes.nib b/src/MacVim/English.lproj/MainMenu.nib/classes.nib index 9399a92169..3c4256e6c0 100644 --- a/src/MacVim/English.lproj/MainMenu.nib/classes.nib +++ b/src/MacVim/English.lproj/MainMenu.nib/classes.nib @@ -17,6 +17,8 @@ id newWindow id + newWindowAndActivate + id openWebsite id orderFrontPreferencePanel diff --git a/src/MacVim/English.lproj/MainMenu.nib/info.nib b/src/MacVim/English.lproj/MainMenu.nib/info.nib index bc6ed03a50..a6a251f7d9 100644 --- a/src/MacVim/English.lproj/MainMenu.nib/info.nib +++ b/src/MacVim/English.lproj/MainMenu.nib/info.nib @@ -9,9 +9,7 @@ IBOldestOS 5 IBOpenObjects - - 218 - + IBSystem Version 9E17 targetFramework diff --git a/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib b/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib index f22a283c3323e3221325bd72e45ee37d57728469..d5d3af9bbd3ea5d42a7c9c297987dc4a40b578b2 100644 GIT binary patch literal 11393 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 literal 11364 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 diff --git a/src/MacVim/MMAppController.h b/src/MacVim/MMAppController.h index a7fea15a4c..d49bcf5bf4 100644 --- a/src/MacVim/MMAppController.h +++ b/src/MacVim/MMAppController.h @@ -27,6 +27,7 @@ NSMenuItem *recentFilesMenuItem; NSMutableArray *cachedVimControllers; int preloadPid; + BOOL shouldActivateWhenNextWindowOpens; #ifdef MM_ENABLE_PLUGINS NSMenuItem *plugInMenuItem; @@ -50,6 +51,7 @@ - (void)setPreloadCacheSize:(int)size; - (IBAction)newWindow:(id)sender; +- (IBAction)newWindowAndActivate:(id)sender; - (IBAction)fileOpen:(id)sender; - (IBAction)selectNextWindow:(id)sender; - (IBAction)selectPreviousWindow:(id)sender; diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m index fc7277e876..c8454d5520 100644 --- a/src/MacVim/MMAppController.m +++ b/src/MacVim/MMAppController.m @@ -110,6 +110,7 @@ static int executeInLoginShell(NSString *path, NSArray *args); - (void)clearPreloadCacheWithCount:(int)count; - (NSDate *)rcFilesModificationDate; - (BOOL)openVimControllerWithArguments:(NSDictionary *)arguments; +- (void)activateWhenNextWindowOpens; #ifdef MM_ENABLE_PLUGINS - (void)removePlugInMenu; @@ -724,6 +725,11 @@ static int executeInLoginShell(NSString *path, NSArray *args); [openSelectionString release]; openSelectionString = nil; } + + if (shouldActivateWhenNextWindowOpens) { + [NSApp activateIgnoringOtherApps:YES]; + shouldActivateWhenNextWindowOpens = NO; + } } - (void)setMainMenu:(NSMenu *)mainMenu @@ -849,6 +855,12 @@ static int executeInLoginShell(NSString *path, NSArray *args); } } +- (IBAction)newWindowAndActivate:(id)sender +{ + [self activateWhenNextWindowOpens]; + [self newWindow:sender]; +} + - (IBAction)fileOpen:(id)sender { NSString *dir = nil; @@ -1583,6 +1595,11 @@ static int executeInLoginShell(NSString *path, NSArray *args); return YES; } +- (void)activateWhenNextWindowOpens +{ + shouldActivateWhenNextWindowOpens = YES; +} + @end // MMAppController (Private)