Permalink
Browse files

Apply C. Eidhof, O. Lempsink patches

This enables the input manager to be used by any ODB capable editor.
  • Loading branch information...
1 parent 3de7b97 commit b290be4dc0164acd9ab8095157ea815804595cfc @b4winckler committed Aug 16, 2010
@@ -9,9 +9,9 @@
/* Begin PBXBuildFile section */
17085DDA0939627C000D0081 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17085DD90939627C000D0081 /* Carbon.framework */; };
174E80980A57DFA5003FB108 /* url map.plist in Resources */ = {isa = PBXBuildFile; fileRef = 174E80970A57DFA5003FB108 /* url map.plist */; };
- 1796636A093A122C00138851 /* Edit in TextMate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17966367093A122C00138851 /* Edit in TextMate.mm */; };
- 1796636B093A122C00138851 /* NSTextView: Edit in TextMate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17966368093A122C00138851 /* NSTextView: Edit in TextMate.mm */; };
- 1796636C093A122C00138851 /* WebView: Edit in TextMate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17966369093A122C00138851 /* WebView: Edit in TextMate.mm */; };
+ 1796636A093A122C00138851 /* Edit in ODBEditor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17966367093A122C00138851 /* Edit in ODBEditor.mm */; };
+ 1796636B093A122C00138851 /* NSTextView: Edit in ODBEditor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17966368093A122C00138851 /* NSTextView: Edit in ODBEditor.mm */; };
+ 1796636C093A122C00138851 /* WebView: Edit in ODBEditor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17966369093A122C00138851 /* WebView: Edit in ODBEditor.mm */; };
8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
/* End PBXBuildFile section */
@@ -23,11 +23,11 @@
1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
17085DD90939627C000D0081 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
174E80970A57DFA5003FB108 /* url map.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = "url map.plist"; sourceTree = "<group>"; };
- 17966367093A122C00138851 /* Edit in TextMate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "Edit in TextMate.mm"; path = "src/Edit in TextMate.mm"; sourceTree = "<group>"; };
- 17966368093A122C00138851 /* NSTextView: Edit in TextMate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "NSTextView: Edit in TextMate.mm"; path = "src/NSTextView: Edit in TextMate.mm"; sourceTree = "<group>"; };
- 17966369093A122C00138851 /* WebView: Edit in TextMate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "WebView: Edit in TextMate.mm"; path = "src/WebView: Edit in TextMate.mm"; sourceTree = "<group>"; };
- 32DBCF630370AF2F00C91783 /* Edit in TextMate_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Edit in TextMate_Prefix.pch"; sourceTree = "<group>"; };
- 8D5B49B6048680CD000E48DA /* Edit in TextMate.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Edit in TextMate.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 17966367093A122C00138851 /* Edit in ODBEditor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "Edit in ODBEditor.mm"; path = "src/Edit in ODBEditor.mm"; sourceTree = "<group>"; };
+ 17966368093A122C00138851 /* NSTextView: Edit in ODBEditor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "NSTextView: Edit in ODBEditor.mm"; path = "src/NSTextView: Edit in ODBEditor.mm"; sourceTree = "<group>"; };
+ 17966369093A122C00138851 /* WebView: Edit in ODBEditor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "WebView: Edit in ODBEditor.mm"; path = "src/WebView: Edit in ODBEditor.mm"; sourceTree = "<group>"; };
+ 32DBCF630370AF2F00C91783 /* Edit in ODBEditor_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Edit in ODBEditor_Prefix.pch"; sourceTree = "<group>"; };
+ 8D5B49B6048680CD000E48DA /* Edit in ODBEditor.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Edit in ODBEditor.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
/* End PBXFileReference section */
@@ -80,9 +80,9 @@
08FB77AFFE84173DC02AAC07 /* Classes */ = {
isa = PBXGroup;
children = (
- 17966367093A122C00138851 /* Edit in TextMate.mm */,
- 17966368093A122C00138851 /* NSTextView: Edit in TextMate.mm */,
- 17966369093A122C00138851 /* WebView: Edit in TextMate.mm */,
+ 17966367093A122C00138851 /* Edit in ODBEditor.mm */,
+ 17966368093A122C00138851 /* NSTextView: Edit in ODBEditor.mm */,
+ 17966369093A122C00138851 /* WebView: Edit in ODBEditor.mm */,
);
name = Classes;
sourceTree = "<group>";
@@ -108,52 +108,53 @@
19C28FB8FE9D52D311CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
- 8D5B49B6048680CD000E48DA /* Edit in TextMate.bundle */,
+ 8D5B49B6048680CD000E48DA /* Edit in ODBEditor.bundle */,
);
name = Products;
sourceTree = "<group>";
};
32C88E010371C26100C91783 /* Other Sources */ = {
isa = PBXGroup;
children = (
- 32DBCF630370AF2F00C91783 /* Edit in TextMate_Prefix.pch */,
+ 32DBCF630370AF2F00C91783 /* Edit in ODBEditor_Prefix.pch */,
);
name = "Other Sources";
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 8D5B49AC048680CD000E48DA /* Edit in TextMate */ = {
+ 8D5B49AC048680CD000E48DA /* Edit in ODBEditor */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Edit in TextMate" */;
+ buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Edit in ODBEditor" */;
buildPhases = (
8D5B49AF048680CD000E48DA /* Resources */,
8D5B49B1048680CD000E48DA /* Sources */,
8D5B49B3048680CD000E48DA /* Frameworks */,
- 17ECD3290A3A1A6A009A4BA0 /* ShellScript */,
);
buildRules = (
);
dependencies = (
);
- name = "Edit in TextMate";
+ name = "Edit in ODBEditor";
productInstallPath = "$(HOME)/Library/Bundles";
productName = "Edit in TextMate";
- productReference = 8D5B49B6048680CD000E48DA /* Edit in TextMate.bundle */;
+ productReference = 8D5B49B6048680CD000E48DA /* Edit in ODBEditor.bundle */;
productType = "com.apple.product-type.bundle";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
- buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Edit in TextMate" */;
+ buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Edit in ODBEditor" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 089C166AFE841209C02AAC07 /* Edit in TextMate */;
projectDirPath = "";
+ projectRoot = "";
targets = (
- 8D5B49AC048680CD000E48DA /* Edit in TextMate */,
+ 8D5B49AC048680CD000E48DA /* Edit in ODBEditor */,
);
};
/* End PBXProject section */
@@ -170,30 +171,14 @@
};
/* End PBXResourcesBuildPhase section */
-/* Begin PBXShellScriptBuildPhase section */
- 17ECD3290A3A1A6A009A4BA0 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [[ -d ~/Oak/Release/Edit\\ in\\ TextMate.bundle && -d ~/Source/TextMate/resources/Edit\\ in\\ TextMate ]]; then\n cp -pR ~/Oak/Release/Edit\\ in\\ TextMate.bundle ~/Source/TextMate/resources/Edit\\ in\\ TextMate\n touch ~/Source/TextMate/resources/Edit\\ in\\ TextMate\nfi";
- };
-/* End PBXShellScriptBuildPhase section */
-
/* Begin PBXSourcesBuildPhase section */
8D5B49B1048680CD000E48DA /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 1796636A093A122C00138851 /* Edit in TextMate.mm in Sources */,
- 1796636B093A122C00138851 /* NSTextView: Edit in TextMate.mm in Sources */,
- 1796636C093A122C00138851 /* WebView: Edit in TextMate.mm in Sources */,
+ 1796636A093A122C00138851 /* Edit in ODBEditor.mm in Sources */,
+ 1796636B093A122C00138851 /* NSTextView: Edit in ODBEditor.mm in Sources */,
+ 1796636C093A122C00138851 /* WebView: Edit in ODBEditor.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -211,6 +196,42 @@
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
+ 1DD3D5530D82D8D7006E4320 /* Universal */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
+ GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ GCC_MODEL_TUNING = G5;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "Edit in ODBEditor_Prefix.pch";
+ INFOPLIST_FILE = Info.plist;
+ INSTALL_PATH = "";
+ OTHER_LDFLAGS = (
+ "-undefined",
+ dynamic_lookup,
+ );
+ PRODUCT_NAME = "Edit in ODBEditor";
+ SYMROOT = ../build;
+ WRAPPER_EXTENSION = bundle;
+ };
+ name = Universal;
+ };
+ 1DD3D5540D82D8D7006E4320 /* Universal */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ GCC_ENABLE_CPP_EXCEPTIONS = NO;
+ GCC_ENABLE_CPP_RTTI = NO;
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ PREBINDING = NO;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Universal;
+ };
1DEB913B08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -220,14 +241,15 @@
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "Edit in TextMate_Prefix.pch";
+ GCC_PREFIX_HEADER = "Edit in ODBEditor_Prefix.pch";
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Library/Bundles";
+ INSTALL_PATH = "";
OTHER_LDFLAGS = (
"-undefined",
dynamic_lookup,
);
- PRODUCT_NAME = "Edit in TextMate";
+ PRODUCT_NAME = "Edit in ODBEditor";
+ SYMROOT = ../build;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
};
@@ -236,21 +258,18 @@
1DEB913C08733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "Edit in TextMate_Prefix.pch";
+ GCC_PREFIX_HEADER = "Edit in ODBEditor_Prefix.pch";
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Library/Bundles";
+ INSTALL_PATH = "";
OTHER_LDFLAGS = (
"-undefined",
dynamic_lookup,
);
- PRODUCT_NAME = "Edit in TextMate";
+ PRODUCT_NAME = "Edit in ODBEditor";
+ SYMROOT = ../build;
WRAPPER_EXTENSION = bundle;
};
name = Release;
@@ -283,20 +302,22 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Edit in TextMate" */ = {
+ 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Edit in ODBEditor" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB913B08733D840010E9CD /* Debug */,
1DEB913C08733D840010E9CD /* Release */,
+ 1DD3D5530D82D8D7006E4320 /* Universal */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Edit in TextMate" */ = {
+ 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Edit in ODBEditor" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB913F08733D840010E9CD /* Debug */,
1DEB914008733D840010E9CD /* Release */,
+ 1DD3D5540D82D8D7006E4320 /* Universal */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -1,5 +1,5 @@
//
-// Prefix header for all source files of the 'Edit in TextMate' target in the 'Edit in TextMate' project.
+// Prefix header for all source files of the 'Edit in ODBEditor' target in the 'Edit in ODBEditor' project.
//
#ifdef __OBJC__
View
4 Info
@@ -3,13 +3,13 @@
<plist version="1.0">
<dict>
<key>BundleName</key>
- <string>Edit in TextMate.bundle</string>
+ <string>Edit in ODBEditor.bundle</string>
<key>LoadBundleOnLaunch</key>
<string>YES</string>
<key>LocalizedNames</key>
<dict>
<key>English</key>
- <string>Edit in TextMate</string>
+ <string>Edit in ODBEditor</string>
</dict>
<key>NoMenuEntry</key>
<string>YES</string>
View
@@ -6,21 +6,21 @@
<string>English</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
- <key>CFBundleName</key>
- <string>${PRODUCT_NAME}</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>com.macromates.edit_in_textmate</string>
+ <string>org.slashpunt.edit_in_odbeditor</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0</string>
+ <string>1.2</string>
<key>NSPrincipalClass</key>
- <string>EditInTextMate</string>
+ <string>EditInODBEditor</string>
</dict>
</plist>
View
@@ -1,13 +1,14 @@
//
-// Edit in TextMate.h
+// Edit in ODBEditor.h
//
// Created by Allan Odgaard on 2005-11-26.
-// See /trunk/LICENSE for license details
+// See LICENSE for license details
//
+// Generalized by Chris Eidhof and Eelco Lempsink from 'Edit in TextMate.h'
#import <Cocoa/Cocoa.h>
-@interface EditInTextMate : NSObject
+@interface EditInODBEditor : NSObject
{
}
+ (void)externalEditString:(NSString*)aString startingAtLine:(int)aLine forView:(NSView*)aView;
Oops, something went wrong.

0 comments on commit b290be4

Please sign in to comment.