averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update the Integration prefs pane

Browse Source 
The integration pane now contains descriptive text concerning the 'Edit
in ODBEditor' input manager.
This commit is contained in:
Nico Weber
2008-03-06 19:35:22 +01:00
committed by Bjorn Winckler
parent 9d568fc7c9
commit 2fefb81d43
4 changed files with 41 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MacVim/English.lproj/Preferences.nib/classes.nib
Generated
+25 -57
View File
@@ -1,57 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBClasses</key>
<array>
<dict>
<key>ACTIONS</key>
<dict>
<key>installOdb</key>
<string>id</string>
<key>uninstallOdb</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>MMPreferenceController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>editors</key>
<string>NSPopUpButton</string>
<key>generalPreferences</key>
<string>NSView</string>
<key>installOdbButton</key>
<string>NSButton</string>
<key>integrationPreferences</key>
<string>NSView</string>
<key>obdBundleVersionLabel</key>
<string>NSTextField</string>
<key>uninstallOdbButton</key>
<string>NSButton</string>
</dict>
<key>SUPERCLASS</key>
<string>DBPrefsWindowController</string>
</dict>
<dict>
<key>CLASS</key>
<string>FirstResponder</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>DBPrefsWindowController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSWindowController</string>
</dict>
</array>
<key>IBVersion</key>
<string>1</string>
</dict>
</plist>
{
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;
}
src/MacVim/English.lproj/Preferences.nib/info.nib
Generated
+11 -4
View File
@@ -1,19 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>69 14 356 240 0 0 1024 746 </string>
<key>IBEditorPositions</key>
<dict>
<key>191</key>
<string>260 290 503 416 0 0 1024 746 </string>
</dict>
<key>IBFramework Version</key>
<string>629</string>
<string>489.0</string>
<key>IBLastKnownRelativeProjectPath</key>
<string>../../MacVim.xcodeproj</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
<integer>213</integer>
<integer>191</integer>
</array>
<key>IBSystem Version</key>
<string>9C31</string>
<string>8S165</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib
Generated
BIN
View File
Binary file not shown.
src/MacVim/MMPreferenceController.m
+5 -4
View File
@@ -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: