Comment out unused var; modify the -openResourceIn… methods to return the used plug so we can add them to our window controller list in one place. Also add them to the window controller list.

2024-11-04 22:06:17 +00:00 · 2012-07-07 20:58:01 -05:00 · 2012-07-07 20:58:01 -05:00 · ac4463d633
commit ac4463d633
parent 696c0e158d
7 changed files with 63 additions and 49 deletions
--- a/Cocoa/Classes/Resource.m
+++ b/Cocoa/Classes/Resource.m
@ -60,9 +60,7 @@ NSString *RKResourcePboardType = @"RKResourcePboardType";

 + (Resource *)getResourceOfType:(NSString *)typeValue andID:(NSNumber *)resIDValue inDocument:(NSDocument *)searchDoc
 {
-	NSDocument *doc;
-	NSEnumerator *enumerator = [[[NSDocumentController sharedDocumentController] documents] objectEnumerator];
-	while(doc = [enumerator nextObject])
+	for (NSDocument *doc in [[NSDocumentController sharedDocumentController] documents])
 	{
 		if(searchDoc == nil || searchDoc == doc)
 		{
@ -79,9 +77,7 @@ NSString *RKResourcePboardType = @"RKResourcePboardType";
 + (NSArray *)allResourcesOfType:(NSString *)typeValue inDocument:(NSDocument *)searchDoc
 {
 	NSMutableArray *array = [NSMutableArray array];
-	NSDocument *doc;
-	NSEnumerator *enumerator = [[[NSDocumentController sharedDocumentController] documents] objectEnumerator];
-	while(doc = [enumerator nextObject])
+	for (NSDocument *doc in [[NSDocumentController sharedDocumentController] documents])
 	{
 		// parse document for resources
 		if(searchDoc == nil || searchDoc == doc)
@ -92,9 +88,7 @@ NSString *RKResourcePboardType = @"RKResourcePboardType";

 + (Resource *)resourceOfType:(NSString *)typeValue withName:(NSString *)nameValue inDocument:(NSDocument *)searchDoc
 {
-	NSDocument *doc;
-	NSEnumerator *enumerator = [[[NSDocumentController sharedDocumentController] documents] objectEnumerator];
-	while(doc = [enumerator nextObject])
+	for (NSDocument *doc in [[NSDocumentController sharedDocumentController] documents])
 	{
 		if(searchDoc == nil || searchDoc == doc)
 		{
@ -108,9 +102,7 @@ NSString *RKResourcePboardType = @"RKResourcePboardType";

 + (Resource *)resourceOfType:(NSString *)typeValue andID:(NSNumber *)resIDValue inDocument:(NSDocument *)searchDoc
 {
-	NSDocument *doc;
-	NSEnumerator *enumerator = [[[NSDocumentController sharedDocumentController] documents] objectEnumerator];
-	while(doc = [enumerator nextObject])
+	for (NSDocument *doc in [[NSDocumentController sharedDocumentController] documents])
 	{
 		if(searchDoc == nil || searchDoc == doc)
 		{
@ -125,9 +117,7 @@ NSString *RKResourcePboardType = @"RKResourcePboardType";
 // should probably be in resource document, not resource, but it fits in with the above methods quite well
 + (NSDocument *)documentForResource:(Resource *)resource
 {
-	NSDocument *doc;
-	NSEnumerator *enumerator = [[[NSDocumentController sharedDocumentController] documents] objectEnumerator];
-	while(doc = [enumerator nextObject])
+	for (NSDocument *doc in [[NSDocumentController sharedDocumentController] documents])
 	{
 		Resource *res;
 		NSEnumerator *enumerator2 = [[(ResourceDocument *)doc resources] objectEnumerator];
--- a/Cocoa/Classes/ResourceDocument.h
+++ b/Cocoa/Classes/ResourceDocument.h
@ -34,9 +34,9 @@
 - (IBAction)openResources:(id)sender;
 - (IBAction)openResourcesInTemplate:(id)sender;
 - (IBAction)openResourcesAsHex:(id)sender;
- (void)openResourceUsingEditor:(Resource *)resource;
- (void)openResource:(Resource *)resource usingTemplate:(NSString *)templateName;
- (void)openResourceAsHex:(Resource *)resource;
+- (id <ResKnifePluginProtocol>)openResourceUsingEditor:(Resource *)resource;
+- (id <ResKnifePluginProtocol>)openResource:(Resource *)resource usingTemplate:(NSString *)templateName;
+- (id <ResKnifePluginProtocol>)openResourceAsHex:(Resource *)resource;
 - (IBAction)playSound:(id)sender;
 - (void)sound:(NSSound *)sound didFinishPlaying:(BOOL)finished;

--- a/Cocoa/Classes/ResourceDocument.m
+++ b/Cocoa/Classes/ResourceDocument.m
@ -900,8 +900,11 @@ static NSString *RKExportItemIdentifier		= @"com.nickshanks.resknife.toolbar.exp
 	Resource *resource;
 	NSArray *selected = [outlineView selectedItems];
 	NSEnumerator *enumerator = [selected objectEnumerator];
-	while(resource = [enumerator nextObject])
-		[self openResourceUsingEditor:resource];
+	while(resource = [enumerator nextObject]) {
+		id usedPlug = [self openResourceUsingEditor:resource];
+		if ([usedPlug isKindOfClass:[NSWindowController class]])
+			[self addWindowController:usedPlug];
+	}
 }

 - (IBAction)openResourcesInTemplate:(id)sender
@ -934,11 +937,12 @@ static NSString *RKExportItemIdentifier		= @"com.nickshanks.resknife.toolbar.exp
 	
 	REVISIONS:
 		2003-07-31  UK  Changed to use plugin registry instead of file name.
+		2012-07-07	NW	Changed to return the used plugin.
   -------------------------------------------------------------------------- */

 /* Method name should be changed to:  -(void)openResource:(Resource *)resource usingEditor:(Class)overrideEditor <nil == default editor>   */

- (void)openResourceUsingEditor:(Resource *)resource
+- (id <ResKnifePluginProtocol>)openResourceUsingEditor:(Resource *)resource
 {
 	Class editorClass = [[RKEditorRegistry defaultRegistry] editorForType:[resource type]];
 	
@ -949,11 +953,11 @@ static NSString *RKExportItemIdentifier		= @"com.nickshanks.resknife.toolbar.exp
 		// update: doug says window controllers automatically release themselves when their window is closed. All default plugs have a window controller as their principal class, but 3rd party ones might not
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resourceDataDidChange:) name:ResourceDataDidChangeNotification object:resource];
 		id plug = [(id <ResKnifePluginProtocol>)[editorClass alloc] initWithResource:resource];
-		if(plug) return;
+		if(plug) return plug;
 	}
 	
 	// if no editor exists, or the editor is broken, open using template
-	[self openResource:resource usingTemplate:[resource type]];
+	return [self openResource:resource usingTemplate:[resource type]];
 }


@ -967,9 +971,10 @@ static NSString *RKExportItemIdentifier		= @"com.nickshanks.resknife.toolbar.exp
 	
 	REVISIONS:
 		2003-07-31  UK  Changed to use plugin registry instead of file name.
+		2012-07-07	NW	Changed to return the used plugin.
   -------------------------------------------------------------------------- */

- (void)openResource:(Resource *)resource usingTemplate:(NSString *)templateName
+- (id <ResKnifePluginProtocol>)openResource:(Resource *)resource usingTemplate:(NSString *)templateName
 {
 	// opens resource in template using TMPL resource with name templateName
 	Class editorClass = [[RKEditorRegistry defaultRegistry] editorForType:@"Template Editor"];
@ -983,11 +988,11 @@ static NSString *RKExportItemIdentifier		= @"com.nickshanks.resknife.toolbar.exp
 	{
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resourceDataDidChange:) name:ResourceDataDidChangeNotification object:resource];
 		id plug = [(id <ResKnifeTemplatePluginProtocol>)[editorClass alloc] initWithResources:resource, tmpl, nil];
-		if(plug) return;
+		if(plug) return plug;
 	}
 	
 	// if no template exists, or template editor is broken, open as hex
-	[self openResourceAsHex:resource];
+	return [self openResourceAsHex:resource];
 }

 /*!
@ -995,18 +1000,19 @@ static NSString *RKExportItemIdentifier		= @"com.nickshanks.resknife.toolbar.exp
@author			Nicholas Shanks
@created		2001
@updated		2003-07-31 UK:	Changed to use plugin registry instead of file name.
+				2012-07-07 NW:	Changed to return the used plugin.
@description	Open a hex editor for the specified Resource instance. This looks up the hexadecimal editor in the plugin registry and then instantiates an editor object, handing it the resource.
@param			resource	Resource to edit
 */

- (void)openResourceAsHex:(Resource *)resource
+- (id <ResKnifePluginProtocol>)openResourceAsHex:(Resource *)resource
 {
 	Class editorClass = [[RKEditorRegistry defaultRegistry] editorForType: @"Hexadecimal Editor"];
 	// bug: I alloc a plug instance here, but have no idea where I should dealloc it, perhaps the plug ought to call [self autorelease] when it's last window is closed?
 	// update: doug says window controllers automatically release themselves when their window is closed.
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resourceDataDidChange:) name:ResourceDataDidChangeNotification object:resource];
 	id <ResKnifePluginProtocol> plugController = [(id <ResKnifePluginProtocol>)[editorClass alloc] initWithResource:resource];
-#pragma unused(plugController)
+	return plugController;
 }

 /*!
--- a/Cocoa/Info.plist
+++ b/Cocoa/Info.plist
@ -12,7 +12,7 @@
 				<string>rsrc</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>Resource file.icns</string>
+			<string>Resource file</string>
 			<key>CFBundleTypeName</key>
 			<string>ResourceMap</string>
 			<key>CFBundleTypeOSTypes</key>
@ -53,11 +53,11 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>ResKnife Cocoa</string>
+	<string>ResKnife</string>
 	<key>CFBundleGetInfoString</key>
 	<string>A resource editor for Mac OS X.</string>
 	<key>CFBundleIconFile</key>
-	<string>ResKnife.icns</string>
+	<string>ResKnife</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.nickshanks.resknife</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@ -71,7 +71,7 @@
 	<key>CFBundleSignature</key>
 	<string>ResK</string>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 	<key>NSAppleScriptEnabled</key>
 	<true/>
 	<key>NSMainNibFile</key>
--- a/Editor/English.lproj/HexWindow.xib
+++ b/Editor/English.lproj/HexWindow.xib
@ -164,7 +164,7 @@
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<string key="NSWindowContentMinSize">{226, 140}</string>
 				<object class="NSView" key="NSWindowView" id="542921733">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSScrollView" id="813846596">
@ -193,6 +193,7 @@
 											</set>
 											<string key="NSFrameSize">{74, 300}</string>
 											<reference key="NSSuperview" ref="588609848"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="1004349541"/>
 											<object class="NSTextContainer" key="NSTextContainer" id="750324176">
 												<object class="NSLayoutManager" key="NSLayoutManager">
@ -232,7 +233,7 @@
 												<int key="NSTCFlags">1</int>
 											</object>
 											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">33557344</int>
+												<int key="NSFlags">2912</int>
 												<int key="NSTextCheckingTypes">0</int>
 												<nil key="NSMarkedAttributes"/>
 												<object class="NSColor" key="NSBackgroundColor" id="89734044">
@ -279,11 +280,12 @@
 									</array>
 									<string key="NSFrameSize">{74, 300}</string>
 									<reference key="NSSuperview" ref="813846596"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="706277205"/>
 									<reference key="NSDocView" ref="706277205"/>
 									<reference key="NSBGColor" ref="89734044"/>
 									<object class="NSCursor" key="NSCursor">
-										<string key="NSHotSpot">{1, -1}</string>
+										<string key="NSHotSpot">{5, 5}</string>
 										<int key="NSCursorType">0</int>
 									</object>
 									<int key="NScvFlags">4</int>
@ -293,6 +295,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {15, 298}}</string>
 									<reference key="NSSuperview" ref="813846596"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="393811220"/>
 									<reference key="NSTarget" ref="813846596"/>
 									<string key="NSAction">_doScroller:</string>
@ -303,6 +306,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="813846596"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="588609848"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="813846596"/>
@ -313,6 +317,7 @@
 							</array>
 							<string key="NSFrame">{{0, 20}, {74, 300}}</string>
 							<reference key="NSSuperview" ref="542921733"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="588609848"/>
 							<int key="NSsFlags">133120</int>
 							<reference key="NSVScroller" ref="1004349541"/>
@ -351,6 +356,7 @@
 											</set>
 											<string key="NSFrameSize">{339, 298}</string>
 											<reference key="NSSuperview" ref="280341911"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="718325052"/>
 											<object class="NSTextContainer" key="NSTextContainer" id="560345675">
 												<object class="NSLayoutManager" key="NSLayoutManager">
@ -372,7 +378,7 @@
 												<int key="NSTCFlags">1</int>
 											</object>
 											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">33566563</int>
+												<int key="NSFlags">12131</int>
 												<int key="NSTextCheckingTypes">0</int>
 												<nil key="NSMarkedAttributes"/>
 												<reference key="NSBackgroundColor" ref="89734044"/>
@ -397,6 +403,7 @@
 									</array>
 									<string key="NSFrame">{{1, 1}, {339, 298}}</string>
 									<reference key="NSSuperview" ref="760747433"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="310956344"/>
 									<reference key="NSDocView" ref="310956344"/>
 									<reference key="NSBGColor" ref="89734044"/>
@ -429,8 +436,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 								<object class="NSScroller" id="718325052">
 									<reference key="NSNextResponder" ref="760747433"/>
 									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{-100, -100}, {15, 68}}</string>
+									<string key="NSFrame">{{-100, -100}, {15, 298}}</string>
 									<reference key="NSSuperview" ref="760747433"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="824020125"/>
 									<reference key="NSTarget" ref="760747433"/>
 									<string key="NSAction">_doScroller:</string>
@ -441,6 +449,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="760747433"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="280341911"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="760747433"/>
@ -451,6 +460,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							</array>
 							<string key="NSFrame">{{82, 20}, {341, 300}}</string>
 							<reference key="NSSuperview" ref="542921733"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="280341911"/>
 							<int key="NSsFlags">133122</int>
 							<reference key="NSVScroller" ref="718325052"/>
@ -489,6 +499,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 											</set>
 											<string key="NSFrameSize">{138, 298}</string>
 											<reference key="NSSuperview" ref="909246413"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="636540923"/>
 											<object class="NSTextContainer" key="NSTextContainer" id="6753358">
 												<object class="NSLayoutManager" key="NSLayoutManager">
@ -510,7 +521,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 												<int key="NSTCFlags">1</int>
 											</object>
 											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">33566563</int>
+												<int key="NSFlags">12131</int>
 												<int key="NSTextCheckingTypes">0</int>
 												<nil key="NSMarkedAttributes"/>
 												<reference key="NSBackgroundColor" ref="89734044"/>
@ -536,6 +547,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 									</array>
 									<string key="NSFrame">{{1, 1}, {138, 298}}</string>
 									<reference key="NSSuperview" ref="866590901"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="598519770"/>
 									<reference key="NSDocView" ref="598519770"/>
 									<reference key="NSBGColor" ref="89734044"/>
@ -547,6 +559,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{124, 1}, {15, 298}}</string>
 									<reference key="NSSuperview" ref="866590901"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="930024921"/>
 									<reference key="NSTarget" ref="866590901"/>
 									<string key="NSAction">_doScroller:</string>
@ -557,6 +570,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="866590901"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="909246413"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="866590901"/>
@ -567,6 +581,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							</array>
 							<string key="NSFrame">{{431, 20}, {140, 300}}</string>
 							<reference key="NSSuperview" ref="542921733"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="909246413"/>
 							<int key="NSsFlags">133138</int>
 							<reference key="NSVScroller" ref="462029514"/>
@ -578,6 +593,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							<int key="NSvFlags">290</int>
 							<string key="NSFrame">{{4, 2}, {546, 17}}</string>
 							<reference key="NSSuperview" ref="542921733"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="250019369">
 								<int key="NSCellFlags">67239424</int>
@ -605,6 +621,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 						</object>
 					</array>
 					<string key="NSFrameSize">{570, 319}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="813846596"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
--- a/Editor/TemplateWindowController.m
+++ b/Editor/TemplateWindowController.m
@ -124,7 +124,7 @@
 		Class cc = [clone class];
 		
 		BOOL pushedCounter = NO;
-		BOOL pushedKey = NO;
+		//BOOL pushedKey = NO;
 		if(cc == [ElementOCNT class])
 		{	[stream pushCounter:(ElementOCNT *)clone]; pushedCounter = YES; }
 		if(cc == [ElementKBYT class] ||
--- a/ResKnife.xcodeproj/project.pbxproj
+++ b/ResKnife.xcodeproj/project.pbxproj
@ -445,7 +445,7 @@
 		E15CFF80099BECAE004929B6 /* ElementDATE.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ElementDATE.h; sourceTree = "<group>"; };
 		E15CFF81099BECAF004929B6 /* ElementDATE.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ElementDATE.m; sourceTree = "<group>"; };
 		E17ADBC006A2132800842474 /* NovaTools.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NovaTools.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
-		E18BF58C069FEA1400F076B8 /* ResKnife Cocoa.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ResKnife Cocoa.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E18BF58C069FEA1400F076B8 /* ResKnife.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ResKnife.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E18BF5A6069FEA1400F076B8 /* Hexadecimal Editor.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Hexadecimal Editor.plugin"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E18BF5B6069FEA1400F076B8 /* Nicks Template Editor.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Nicks Template Editor.plugin"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E18BF68D069FEA1800F076B8 /* Ulis Template Editor.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Ulis Template Editor.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
@ -946,7 +946,7 @@
 		F5B588110156D30301000001 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				E18BF58C069FEA1400F076B8 /* ResKnife Cocoa.app */,
+				E18BF58C069FEA1400F076B8 /* ResKnife.app */,
 				E18BF5A6069FEA1400F076B8 /* Hexadecimal Editor.plugin */,
 				E18BF5B6069FEA1400F076B8 /* Nicks Template Editor.plugin */,
 				E18BF6C8069FEA1900F076B8 /* Template Editor.plugin */,
@ -1308,9 +1308,9 @@
 			productReference = B2FCA78A15A66ACE00696598 /* PICT Editor.plugin */;
 			productType = "com.apple.product-type.bundle";
 		};
-		E18BF537069FEA1300F076B8 /* ResKnife Cocoa */ = {
+		E18BF537069FEA1300F076B8 /* ResKnife */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = E13F7ED908F0411100E2A5CB /* Build configuration list for PBXNativeTarget "ResKnife Cocoa" */;
+			buildConfigurationList = E13F7ED908F0411100E2A5CB /* Build configuration list for PBXNativeTarget "ResKnife" */;
 			buildPhases = (
 				E18BF53C069FEA1300F076B8 /* Headers */,
 				E18BF553069FEA1300F076B8 /* Resources */,
@ -1330,10 +1330,10 @@
 				E13F836508F139E900E2A5CB /* PBXTargetDependency */,
 				B229EEE315A4BB720032C12C /* PBXTargetDependency */,
 			);
-			name = "ResKnife Cocoa";
+			name = ResKnife;
 			productInstallPath = "$(USER_APPS_DIR)";
 			productName = "ResKnife Cocoa";
-			productReference = E18BF58C069FEA1400F076B8 /* ResKnife Cocoa.app */;
+			productReference = E18BF58C069FEA1400F076B8 /* ResKnife.app */;
 			productType = "com.apple.product-type.application";
 		};
 		E18BF58E069FEA1400F076B8 /* Hex Editor Cocoa */ = {
@ -1501,7 +1501,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				E18BF537069FEA1300F076B8 /* ResKnife Cocoa */,
+				E18BF537069FEA1300F076B8 /* ResKnife */,
 				E18BF58E069FEA1400F076B8 /* Hex Editor Cocoa */,
 				E18BF69E069FEA1800F076B8 /* Template Editor Cocoa */,
 				E18BF5A7069FEA1400F076B8 /* Nick's Template Editor Cocoa */,
@ -2353,7 +2353,7 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = Cocoa/Info.plist;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				PRODUCT_NAME = "ResKnife Cocoa";
+				PRODUCT_NAME = ResKnife;
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",
@ -2372,7 +2372,7 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = Cocoa/Info.plist;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				PRODUCT_NAME = "ResKnife Cocoa";
+				PRODUCT_NAME = ResKnife;
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",
@ -2693,7 +2693,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		E13F7ED908F0411100E2A5CB /* Build configuration list for PBXNativeTarget "ResKnife Cocoa" */ = {
+		E13F7ED908F0411100E2A5CB /* Build configuration list for PBXNativeTarget "ResKnife" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				E13F7EDA08F0411100E2A5CB /* Debug */,