diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib index 83fcd54b7d..889450913a 100644 --- a/src/MacVim/English.lproj/Preferences.nib/designable.nib +++ b/src/MacVim/English.lproj/Preferences.nib/designable.nib @@ -1,30 +1,32 @@ - - + + - + + + - + - + - + - + @@ -38,8 +40,8 @@ - - + + @@ -47,11 +49,11 @@ - + - + @@ -74,8 +76,8 @@ - - + + @@ -83,19 +85,21 @@ - - + + This applies to files opened from the Finder (e.g. by double-clicking on a file or by dragging a file onto the MacVim dock icon) or from external programs such as Xcode. @@ -104,7 +108,7 @@ - + @@ -131,8 +135,8 @@ - - + + @@ -161,8 +165,8 @@ - - + + @@ -170,15 +174,31 @@ - - + + + + diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib index cd0271eebc..3dc85ed47f 100644 Binary files a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib and b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib differ diff --git a/src/MacVim/MMPreferenceController.h b/src/MacVim/MMPreferenceController.h index 6c7679bedc..0e8deb39cb 100644 --- a/src/MacVim/MMPreferenceController.h +++ b/src/MacVim/MMPreferenceController.h @@ -17,9 +17,11 @@ // General pane IBOutlet NSPopUpButton *layoutPopUpButton; + IBOutlet NSButton *autoInstallUpdateButton; } // General pane - (IBAction)openInCurrentWindowSelectionChanged:(id)sender; +- (IBAction)checkForUpdatesChanged:(id)sender; @end diff --git a/src/MacVim/MMPreferenceController.m b/src/MacVim/MMPreferenceController.m index 2b1eab9417..5314ba8a50 100644 --- a/src/MacVim/MMPreferenceController.m +++ b/src/MacVim/MMPreferenceController.m @@ -86,8 +86,20 @@ - (IBAction)openInCurrentWindowSelectionChanged:(id)sender BOOL openInCurrentWindowSelected = ([[sender selectedCell] tag] != 0); BOOL useWindowsLayout = ([[layoutPopUpButton selectedItem] tag] == MMLayoutWindows); - if (openInCurrentWindowSelected && useWindowsLayout) - [layoutPopUpButton selectItemWithTag:MMLayoutTabs]; + if (openInCurrentWindowSelected && useWindowsLayout) { + [[NSUserDefaults standardUserDefaults] setInteger:MMLayoutTabs forKey:MMOpenLayoutKey]; + } +} + +- (IBAction)checkForUpdatesChanged:(id)sender +{ + // Sparkle's auto-install update preference trumps "check for update", so + // need to make sure to unset that if the user unchecks "check for update". + NSButton *button = (NSButton *)sender; + BOOL checkForUpdates = ([button state] != 0); + if (!checkForUpdates) { + [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"SUAutomaticallyUpdate"]; + } } @end