From a614dfbfcdb9025172ad1f60210cd57ef734c01c Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Sat, 16 Aug 2008 16:27:25 +0200 Subject: [PATCH] Reorder preferences panel "Use login shell" is now enabled by default and has been moved to the Advanced pane. Also, when clicking this or the "Use ATSUI renderer" button the preload cache is rebuilt. --- .../English.lproj/Preferences.nib/classes.nib | 2 ++ .../English.lproj/Preferences.nib/info.nib | 2 +- .../Preferences.nib/keyedobjects.nib | Bin 32615 -> 32634 bytes src/MacVim/MMAppController.m | 27 +++++++++++++----- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/MacVim/English.lproj/Preferences.nib/classes.nib b/src/MacVim/English.lproj/Preferences.nib/classes.nib index 60b1524025..fbdbe5193b 100644 --- a/src/MacVim/English.lproj/Preferences.nib/classes.nib +++ b/src/MacVim/English.lproj/Preferences.nib/classes.nib @@ -74,6 +74,8 @@ ACTIONS + atsuiButtonClicked + id loginShellButtonClicked id quickstartButtonClicked diff --git a/src/MacVim/English.lproj/Preferences.nib/info.nib b/src/MacVim/English.lproj/Preferences.nib/info.nib index dda7819870..9c4b5d95c6 100644 --- a/src/MacVim/English.lproj/Preferences.nib/info.nib +++ b/src/MacVim/English.lproj/Preferences.nib/info.nib @@ -10,7 +10,7 @@ 5 IBOpenObjects - 620 + 115 IBSystem Version 9E17 diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib index 73798532d3735161b8180045cafea4a006adb669..2729ceab3b04ddde71f2a8e42f3632274f644d67 100644 GIT binary patch delta 13230 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 diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m index 63e3bec827..d6fdaf8dab 100644 --- a/src/MacVim/MMAppController.m +++ b/src/MacVim/MMAppController.m @@ -117,6 +117,7 @@ static int executeInLoginShell(NSString *path, NSArray *args); - (int)maxPreloadCacheSize; - (MMVimController *)takeVimControllerFromCache; - (void)clearPreloadCacheWithCount:(int)count; +- (void)rebuildPreloadCache; - (NSDate *)rcFilesModificationDate; - (BOOL)openVimControllerWithArguments:(NSDictionary *)arguments; - (void)activateWhenNextWindowOpens; @@ -165,7 +166,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef, [NSNumber numberWithBool:YES], MMTranslateCtrlClickKey, [NSNumber numberWithInt:0], MMOpenInCurrentWindowKey, [NSNumber numberWithBool:NO], MMNoFontSubstitutionKey, - [NSNumber numberWithBool:NO], MMLoginShellKey, + [NSNumber numberWithBool:YES], MMLoginShellKey, [NSNumber numberWithBool:NO], MMAtsuiRendererKey, [NSNumber numberWithInt:MMUntitledWindowAlways], MMUntitledWindowKey, @@ -964,15 +965,18 @@ fsEventCallback(ConstFSEventStreamRef streamRef, [NSApp makeWindowsPerform:@selector(performZoom:) inOrder:YES]; } +- (IBAction)atsuiButtonClicked:(id)sender +{ + // This action is called when the user clicks the "use ATSUI renderer" + // button in the advanced preferences pane. + [self rebuildPreloadCache]; +} + - (IBAction)loginShellButtonClicked:(id)sender { // This action is called when the user clicks the "use login shell" button - // in the general preferences pane. - if ([self maxPreloadCacheSize] > 0) { - [self clearPreloadCacheWithCount:-1]; - [self cancelVimControllerPreloadRequests]; - [self scheduleVimControllerPreloadAfterDelay:1.0]; - } + // in the advanced preferences pane. + [self rebuildPreloadCache]; } - (IBAction)quickstartButtonClicked:(id)sender @@ -1559,6 +1563,15 @@ fsEventCallback(ConstFSEventStreamRef streamRef, [cachedVimControllers removeObjectAtIndex:0]; } +- (void)rebuildPreloadCache +{ + if ([self maxPreloadCacheSize] > 0) { + [self clearPreloadCacheWithCount:-1]; + [self cancelVimControllerPreloadRequests]; + [self scheduleVimControllerPreloadAfterDelay:1.0]; + } +} + - (NSDate *)rcFilesModificationDate { // Check modification dates for ~/.vimrc and ~/.gvimrc and return the