diff --git a/src/MacVim/English.lproj/Preferences.nib/classes.nib b/src/MacVim/English.lproj/Preferences.nib/classes.nib index 506294265c..5f3dcfc9e2 100644 --- a/src/MacVim/English.lproj/Preferences.nib/classes.nib +++ b/src/MacVim/English.lproj/Preferences.nib/classes.nib @@ -2,22 +2,8 @@ IBClasses = ( {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { - ACTIONS = { - loginShellDidChange = id; - openFilesInTabsDidChange = id; - terminateAfterLastWindowClosedDidChange = id; - translateCtrlClickDidChange = id; - untitledWindowDidChange = id; - }; CLASS = MMPreferenceController; LANGUAGE = ObjC; - OUTLETS = { - loginShellButton = id; - openFilesInTabsButton = id; - terminateAfterLastWindowClosedButton = id; - translateCtrlClickButton = id; - untitledWindowPopUp = id; - }; SUPERCLASS = NSWindowController; } ); diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib index 98e3fed998..085a76f228 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 8e94752611..7071be4470 100644 --- a/src/MacVim/MMPreferenceController.h +++ b/src/MacVim/MMPreferenceController.h @@ -11,19 +11,8 @@ #import @interface MMPreferenceController : NSWindowController { - IBOutlet id loginShellButton; - IBOutlet id openFilesInTabsButton; - IBOutlet id terminateAfterLastWindowClosedButton; - IBOutlet id translateCtrlClickButton; - IBOutlet id untitledWindowPopUp; } + (MMPreferenceController *)sharedPreferenceController; -- (IBAction)loginShellDidChange:(id)sender; -- (IBAction)openFilesInTabsDidChange:(id)sender; -- (IBAction)terminateAfterLastWindowClosedDidChange:(id)sender; -- (IBAction)translateCtrlClickDidChange:(id)sender; -- (IBAction)untitledWindowDidChange:(id)sender; - @end diff --git a/src/MacVim/MMPreferenceController.m b/src/MacVim/MMPreferenceController.m index ef8cde83a6..1f3b9fcb67 100644 --- a/src/MacVim/MMPreferenceController.m +++ b/src/MacVim/MMPreferenceController.m @@ -32,51 +32,4 @@ return self; } -- (void)windowDidLoad -{ - NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - - [loginShellButton setState:[ud boolForKey:MMLoginShellKey]]; - [openFilesInTabsButton setState:[ud boolForKey:MMOpenFilesInTabsKey]]; - [terminateAfterLastWindowClosedButton setState: - [ud boolForKey:MMTerminateAfterLastWindowClosedKey]]; - [translateCtrlClickButton setState:[ud boolForKey:MMTranslateCtrlClickKey]]; - - int tag = [[ud objectForKey:MMUntitledWindowKey] intValue]; - if (tag < 0) tag = 0; - else if (tag > 3) tag = 3; - [untitledWindowPopUp selectItemWithTag:tag]; -} - -- (IBAction)loginShellDidChange:(id)sender -{ - NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - [ud setBool:[sender state] forKey:MMLoginShellKey]; -} - -- (IBAction)openFilesInTabsDidChange:(id)sender -{ - NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - [ud setBool:[sender state] forKey:MMOpenFilesInTabsKey]; -} - -- (IBAction)terminateAfterLastWindowClosedDidChange:(id)sender -{ - NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - [ud setBool:[sender state] forKey:MMTerminateAfterLastWindowClosedKey]; -} - -- (IBAction)translateCtrlClickDidChange:(id)sender -{ - NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - [ud setBool:[sender state] forKey:MMTranslateCtrlClickKey]; -} - -- (IBAction)untitledWindowDidChange:(id)sender -{ - NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - int tag = [[sender selectedItem] tag]; - [ud setInteger:tag forKey:MMUntitledWindowKey]; -} - @end