From 39b2308db7ea7362996bc7ab5f234812e2ae59f5 Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Thu, 31 Jan 2008 20:51:41 +0100 Subject: [PATCH] Use Cocoa bindings for preferences panel --- .../English.lproj/Preferences.nib/classes.nib | 14 ------ .../Preferences.nib/keyedobjects.nib | Bin 7505 -> 7787 bytes src/MacVim/MMPreferenceController.h | 11 ---- src/MacVim/MMPreferenceController.m | 47 ------------------ 4 files changed, 72 deletions(-) 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 98e3fed998bf27b51f80c845119188d5b12469fb..085a76f2284462efc6a782908c0d01999801fa13 100644 GIT binary patch delta 5180 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 @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