diff --git a/src/MacVim/English.lproj/Preferences.nib/classes.nib b/src/MacVim/English.lproj/Preferences.nib/classes.nib
index d8cde7bef5..09cf929e57 100644
--- a/src/MacVim/English.lproj/Preferences.nib/classes.nib
+++ b/src/MacVim/English.lproj/Preferences.nib/classes.nib
@@ -1,57 +1,25 @@
-
-
-
-
- IBClasses
-
-
- ACTIONS
-
- installOdb
- id
- uninstallOdb
- id
-
- CLASS
- MMPreferenceController
- LANGUAGE
- ObjC
- OUTLETS
-
- editors
- NSPopUpButton
- generalPreferences
- NSView
- installOdbButton
- NSButton
- integrationPreferences
- NSView
- obdBundleVersionLabel
- NSTextField
- uninstallOdbButton
- NSButton
-
- SUPERCLASS
- DBPrefsWindowController
-
-
- CLASS
- FirstResponder
- LANGUAGE
- ObjC
- SUPERCLASS
- NSObject
-
-
- CLASS
- DBPrefsWindowController
- LANGUAGE
- ObjC
- SUPERCLASS
- NSWindowController
-
-
- IBVersion
- 1
-
-
+{
+ IBClasses = (
+ {
+ CLASS = DBPrefsWindowController;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSWindowController;
+ },
+ {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
+ {
+ ACTIONS = {installOdb = id; uninstallOdb = id; };
+ CLASS = MMPreferenceController;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ editors = NSPopUpButton;
+ generalPreferences = NSView;
+ installOdbButton = NSButton;
+ integrationPreferences = NSView;
+ obdBundleVersionLabel = NSTextField;
+ uninstallOdbButton = NSButton;
+ };
+ SUPERCLASS = DBPrefsWindowController;
+ }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
diff --git a/src/MacVim/English.lproj/Preferences.nib/info.nib b/src/MacVim/English.lproj/Preferences.nib/info.nib
index fcc2f42e95..d2cf4b2b86 100644
--- a/src/MacVim/English.lproj/Preferences.nib/info.nib
+++ b/src/MacVim/English.lproj/Preferences.nib/info.nib
@@ -1,19 +1,26 @@
-
+
+ IBDocumentLocation
+ 69 14 356 240 0 0 1024 746
+ IBEditorPositions
+
+ 191
+ 260 290 503 416 0 0 1024 746
+
IBFramework Version
- 629
+ 489.0
IBLastKnownRelativeProjectPath
../../MacVim.xcodeproj
IBOldestOS
5
IBOpenObjects
- 213
+ 191
IBSystem Version
- 9C31
+ 8S165
targetFramework
IBCocoaFramework
diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib
index 9d20775da9..af4f899fb0 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.m b/src/MacVim/MMPreferenceController.m
index 74bee4a724..b220ec5dcc 100644
--- a/src/MacVim/MMPreferenceController.m
+++ b/src/MacVim/MMPreferenceController.m
@@ -214,8 +214,8 @@ NSString *kOdbEditorIdentifierWriteRoom = @"com.hogbaysoftware.WriteRoom";
&& [[NSWorkspace sharedWorkspace] isFilePackageAtPath:ODBEDITOR_PATH];
// enable/disable buttons
+ [installOdbButton setTitle:@"Install"];
if (odbIsInstalled) {
- [installOdbButton setTitle:@"Update"];
[uninstallOdbButton setEnabled:YES];
[editors setEnabled:YES];
@@ -227,6 +227,7 @@ NSString *kOdbEditorIdentifierWriteRoom = @"com.hogbaysoftware.WriteRoom";
versionString = [NSString stringWithFormat:
@"Latest version is %@, you have %@.",
installVersion, installedVersion];
+ [installOdbButton setTitle:@"Update"];
[installOdbButton setEnabled:YES];
break;
case NSOrderedSame:
@@ -243,12 +244,12 @@ NSString *kOdbEditorIdentifierWriteRoom = @"com.hogbaysoftware.WriteRoom";
break;
}
} else {
- [installOdbButton setTitle:@"Install"];
[installOdbButton setEnabled:YES];
[uninstallOdbButton setEnabled:NO];
[editors setEnabled:NO];
- versionString = [NSString stringWithFormat:@"Latest version is %@.",
+ versionString = [NSString
+ stringWithFormat:@"Latest version is %@. It is not installed.",
[self odbBundleInstallVersion]];
}
@@ -340,7 +341,7 @@ NSString *kOdbEditorIdentifierWriteRoom = @"com.hogbaysoftware.WriteRoom";
nil],
[NSDictionary dictionaryWithObjectsAndKeys:
@"/bin/cp", MMCommand,
- [NSArray arrayWithObjects: @"-R", //XXX: -p?
+ [NSArray arrayWithObjects: @"-R",
source, @"/Library/InputManagers", nil], MMArguments,
nil],
[NSDictionary dictionaryWithObjectsAndKeys: