diff --git a/Cocoa/Classes/ResourceDocument.m b/Cocoa/Classes/ResourceDocument.m index fd763cf..5bce00a 100644 --- a/Cocoa/Classes/ResourceDocument.m +++ b/Cocoa/Classes/ResourceDocument.m @@ -21,6 +21,12 @@ NSString *DocumentInfoWillChangeNotification = @"DocumentInfoWillChangeNotifica NSString *DocumentInfoDidChangeNotification = @"DocumentInfoDidChangeNotification"; extern NSString *RKResourcePboardType; +@interface ResourceDocument () + +@property (retain) IBOutlet NSView *viewToolbarView; + +@end + @implementation ResourceDocument - (id)init @@ -739,6 +745,7 @@ static NSString *RKEditHexItemIdentifier = @"com.nickshanks.resknife.toolbar.edi static NSString *RKSaveItemIdentifier = @"com.nickshanks.resknife.toolbar.save"; static NSString *RKShowInfoItemIdentifier = @"com.nickshanks.resknife.toolbar.showinfo"; static NSString *RKExportItemIdentifier = @"com.nickshanks.resknife.toolbar.export"; +static NSString *RKViewItemIdentifier = @"com.nickshanks.resknife.toolbar.view"; - (void)setupToolbar:(NSWindowController *)windowController { @@ -823,6 +830,15 @@ static NSString *RKExportItemIdentifier = @"com.nickshanks.resknife.toolbar.exp [item setTarget:self]; [item setAction:@selector(exportResources:)]; [toolbarItems setObject:item forKey:RKExportItemIdentifier]; + + item = [[NSToolbarItem alloc] initWithItemIdentifier:RKViewItemIdentifier]; + [item autorelease]; + [item setLabel:NSLocalizedString(@"View", nil)]; + [item setPaletteLabel:NSLocalizedString(@"View", nil)]; + [item setToolTip:NSLocalizedString(@"View as a list or previews", nil)]; + [item setView:self.viewToolbarView]; + [item setTarget:self]; + [toolbarItems setObject:item forKey:RKViewItemIdentifier]; if([windowController window] == mainWindow) { @@ -847,12 +863,13 @@ static NSString *RKExportItemIdentifier = @"com.nickshanks.resknife.toolbar.exp - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar { - return [NSArray arrayWithObjects:RKCreateItemIdentifier, RKShowInfoItemIdentifier, RKDeleteItemIdentifier, NSToolbarSeparatorItemIdentifier, RKEditItemIdentifier, RKEditHexItemIdentifier, NSToolbarSeparatorItemIdentifier, RKSaveItemIdentifier, NSToolbarPrintItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, nil]; + NSString *separatorIdentifier = NSAppKitVersionNumber < NSAppKitVersionNumber10_7 ? NSToolbarSeparatorItemIdentifier : NSToolbarSpaceItemIdentifier; + return [NSArray arrayWithObjects:RKCreateItemIdentifier, RKShowInfoItemIdentifier, RKDeleteItemIdentifier, RKViewItemIdentifier, separatorIdentifier, RKEditItemIdentifier, RKEditHexItemIdentifier, separatorIdentifier, RKSaveItemIdentifier, NSToolbarPrintItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, nil]; } - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar { - return [NSArray arrayWithObjects:RKCreateItemIdentifier, RKDeleteItemIdentifier, RKEditItemIdentifier, RKEditHexItemIdentifier, RKSaveItemIdentifier, RKExportItemIdentifier, RKShowInfoItemIdentifier, NSToolbarPrintItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, NSToolbarSpaceItemIdentifier, NSToolbarSeparatorItemIdentifier, nil]; + return [NSArray arrayWithObjects:RKCreateItemIdentifier, RKDeleteItemIdentifier, RKEditItemIdentifier, RKEditHexItemIdentifier, RKSaveItemIdentifier, RKExportItemIdentifier, RKShowInfoItemIdentifier, RKViewItemIdentifier, NSToolbarPrintItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, NSToolbarSpaceItemIdentifier, NSToolbarSeparatorItemIdentifier, nil]; } - (BOOL)validateToolbarItem:(NSToolbarItem *)item @@ -1044,7 +1061,18 @@ static NSString *RKExportItemIdentifier = @"com.nickshanks.resknife.toolbar.exp NSData *data = [(Resource *)[outlineView itemAtRow:[outlineView selectedRow]] data]; if(data && [data length] != 0) { - [NSThread detachNewThreadSelector:@selector(playSoundThreadController:) toTarget:self withObject:data]; + xpc_connection_t connection = xpc_connection_create("org.derailer.ResKnife.System7SoundPlayer", NULL); + xpc_object_t dict = xpc_dictionary_create(NULL, NULL, 0); + xpc_dictionary_set_data(dict, "soundData", [data bytes], [data length]); + xpc_connection_set_event_handler(connection, ^(xpc_object_t object) { + if (xpc_get_type(object) == XPC_TYPE_ERROR) { + if (object == XPC_ERROR_CONNECTION_INVALID) + NSLog(@"invalid connection"); + } + }); + xpc_connection_resume(connection); + xpc_connection_send_message(connection, dict); + xpc_release(dict); } else NSBeep(); } diff --git a/Cocoa/English.lproj/ResourceDocument.xib b/Cocoa/English.lproj/ResourceDocument.xib index 58ff8af..b9b0132 100644 --- a/Cocoa/English.lproj/ResourceDocument.xib +++ b/Cocoa/English.lproj/ResourceDocument.xib @@ -2,13 +2,13 @@ 1070 - 11E2620 - 2549 - 1138.47 - 569.00 + 12C3006 + 3084 + 1187.34 + 625.00 com.apple.InterfaceBuilder.CocoaPlugin - 2549 + 3084 NSButton @@ -70,8 +70,10 @@ {540, 384} - + YES + NO + YES 256 @@ -93,7 +95,7 @@ 16 1000 - 75628096 + 75497536 2048 Name @@ -116,7 +118,7 @@ - 338820672 + 338690112 1024 LucidaGrande @@ -150,7 +152,7 @@ 60 60 - 75628096 + 75497536 67110912 Type @@ -158,7 +160,7 @@ - 338820672 + 338690112 67109888 @@ -180,7 +182,7 @@ 60 60 - 75628096 + 75497536 67110912 ID @@ -193,7 +195,7 @@ - 338820672 + 338690112 67109888 @@ -223,7 +225,7 @@ 60 80 - 75628096 + 75497536 67110912 Size @@ -231,7 +233,7 @@ - 338820672 + 338690112 67109888 @@ -253,7 +255,7 @@ 60 1000 - 75628096 + 75497536 134219776 Attributes @@ -261,7 +263,7 @@ - 338820672 + 338690112 1024 @@ -315,10 +317,10 @@ 256 - {{526, 17}, {15, 378}} + {{525, 17}, {16, 384}} - + NO _doScroller: 0.96616542339324951 @@ -326,10 +328,11 @@ 256 - {{1, 386}, {534, 15}} + {{1, 385}, {540, 16}} + NO 1 _doScroller: @@ -353,13 +356,16 @@ {{-1, -1}, {542, 402}} - + 2098 QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 {540, 400} @@ -392,11 +398,10 @@ {69, 25} - _NS:9 YES - 67239424 + 67108864 0 _NS:9 @@ -425,6 +430,7 @@ 4 + NO @@ -432,17 +438,16 @@ {35, 25} - _NS:22 YES - -2080244224 + -2080374784 134217728 _NS:22 - -2033958657 + -2033958912 163 NSImage @@ -453,6 +458,7 @@ 400 75 + NO @@ -460,17 +466,16 @@ {35, 25} - _NS:22 YES - -2080244224 + -2080374784 134217728 _NS:22 - -2033958657 + -2033958912 163 NSImage @@ -481,6 +486,7 @@ 400 75 + NO @@ -517,6 +523,14 @@ 155 + + + viewToolbarView + + + + 172 + delegate @@ -847,7 +861,7 @@ - 171 + 172 @@ -859,47 +873,6 @@ ./Classes/AttributesFormatter.h - - NSDocument - - id - id - id - id - id - id - - - - printDocument: - id - - - revertDocumentToSaved: - id - - - runPageLayout: - id - - - saveDocument: - id - - - saveDocumentAs: - id - - - saveDocumentTo: - id - - - - IBProjectSource - ./Classes/NSDocument.h - - OutlineViewDelegate NSObject @@ -974,6 +947,7 @@ id id id + id id id id @@ -997,6 +971,10 @@ creatorChanged: id + + cut: + id + exportResources: id @@ -1038,6 +1016,7 @@ ResourceDataSource NSWindow NSOutlineView + NSView @@ -1052,6 +1031,10 @@ outlineView NSOutlineView + + viewToolbarView + NSView + IBProjectSource diff --git a/Cocoa/Plug-Ins/PNG Editor/PNGWindowController.xib b/Cocoa/Plug-Ins/PNG Editor/PNGWindowController.xib index 493576c..2a8dc87 100644 --- a/Cocoa/Plug-Ins/PNG Editor/PNGWindowController.xib +++ b/Cocoa/Plug-Ins/PNG Editor/PNGWindowController.xib @@ -1,22 +1,23 @@ - 1070 - 11E53 - 2182 - 1138.47 - 569.00 + 1080 + 12C3006 + 3084 + 1187.34 + 625.00 com.apple.InterfaceBuilder.CocoaPlugin - 2182 + 3084 - NSImageView - NSWindowTemplate - NSView - NSImageCell - NSCustomObject IBNSLayoutConstraint + NSBox + NSCustomObject + NSImageCell + NSImageView + NSView + NSWindowTemplate com.apple.InterfaceBuilder.CocoaPlugin @@ -38,7 +39,7 @@ 15 2 - {{196, 240}, {535, 374}} + {{196, 240}, {625, 449}} 544735232 Window NSWindow @@ -48,35 +49,86 @@ 256 - + - 268 - - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - {{17, 17}, {501, 340}} + 36 + + + + 274 + + + + 268 + + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + {{15, 10}, {553, 387}} + + + _NS:9 + YES + + 134217728 + 33554432 + _NS:9 + 0 + 0 + 0 + NO + + NO + YES + + + {{1, 1}, {583, 407}} + + + _NS:11 + + + {{20, 20}, {585, 409}} _NS:9 - YES - - 130560 - 33554432 - _NS:9 - 0 - 0 - 2 - NO + {0, 0} + + 67108864 + 0 + Box + + LucidaGrande + 11 + 3100 + + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + - YES + + 1 + 4 + 0 + NO + - {535, 374} + {625, 449} @@ -153,9 +205,41 @@ 2 - - - + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + 5 0 @@ -165,13 +249,13 @@ 20 1000 + 8 29 3 - - - + + 3 0 @@ -181,45 +265,85 @@ 20 1000 + 8 29 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - 8 - 29 - 3 - - - - + + + + + 24 + + + + 4 0 4 1 - - 20 + + 11 1000 + 8 29 3 - + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 11 + + 1000 + + 8 + 29 + 3 + + - + 5 @@ -227,7 +351,7 @@ - + 6 @@ -235,23 +359,43 @@ - 11 - + 45 + - 12 - + 48 + + + + + 49 + + + + + 50 + + + + + 51 + + + + + 54 + - 13 - + 55 + - 14 - + 56 + @@ -263,26 +407,38 @@ com.apple.InterfaceBuilder.CocoaPlugin {{357, 418}, {480, 270}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 15 + 56 diff --git a/ResKnife.xcodeproj/project.pbxproj b/ResKnife.xcodeproj/project.pbxproj index ecacb80..4cc4852 100644 --- a/ResKnife.xcodeproj/project.pbxproj +++ b/ResKnife.xcodeproj/project.pbxproj @@ -25,6 +25,12 @@ B229EEF715A4FB6F0032C12C /* InfoWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B229EEEE15A4FB6F0032C12C /* InfoWindow.xib */; }; B229EEF815A4FB6F0032C12C /* PrefsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B229EEF015A4FB6F0032C12C /* PrefsWindow.xib */; }; B229EEF915A4FB6F0032C12C /* ResourceDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = B229EEF215A4FB6F0032C12C /* ResourceDocument.xib */; }; + B234337F16AB59D0007134B9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B5884D0156D40B01000001 /* Foundation.framework */; }; + B234338516AB59D0007134B9 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B234338316AB59D0007134B9 /* InfoPlist.strings */; }; + B234338816AB59D0007134B9 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B234338716AB59D0007134B9 /* main.m */; }; + B234338E16AB5D5D007134B9 /* org.derailer.ResKnife.System7SoundPlayer.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = B234337E16AB59D0007134B9 /* org.derailer.ResKnife.System7SoundPlayer.xpc */; }; + B234339916AB6143007134B9 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B5884A0156D40B01000001 /* Carbon.framework */; }; + B23433DB16AB69AE007134B9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B5884B0156D40B01000001 /* Cocoa.framework */; }; B24925E215A6776600C22060 /* PictWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B24925E015A6776600C22060 /* PictWindow.xib */; }; B24925E615A6778C00C22060 /* ICONWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B24925E415A6778C00C22060 /* ICONWindow.xib */; }; B24FA09915D303A800622683 /* HexFiend.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B25C779815D2B0C500C005DE /* HexFiend.framework */; }; @@ -42,6 +48,7 @@ B2B2C41815A9473C00D6F61C /* Notifications.m in Sources */ = {isa = PBXBuildFile; fileRef = F5C9ECCE027F474A01A8010C /* Notifications.m */; }; B2B2C42115A9EEEF00D6F61C /* RKPatternImageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B2B2C41E15A9EEE100D6F61C /* RKPatternImageCell.m */; }; B2B2C43A15A9FCCF00D6F61C /* RKPatternView.m in Sources */ = {isa = PBXBuildFile; fileRef = B2B2C43915A9FCCF00D6F61C /* RKPatternView.m */; }; + B2B3CEAA16B9DCE90027F33F /* ResourceGridView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B2B3CEA816B9DCE90027F33F /* ResourceGridView.xib */; }; B2B51C9115B700560087978B /* Edit Hex.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F577A8FC0211E4D401A80001 /* Edit Hex.tiff */; }; B2FCA78B15A66ACE00696598 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B5884B0156D40B01000001 /* Cocoa.framework */; }; B2FCA79115A66ACF00696598 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B2FCA78F15A66ACF00696598 /* InfoPlist.strings */; }; @@ -282,6 +289,13 @@ remoteGlobalIDString = B229EEC915A4B8720032C12C; remoteInfo = "PNG Editor"; }; + B234338F16AB5D77007134B9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F5B5880F0156D2A601000001 /* Project object */; + proxyType = 1; + remoteGlobalIDString = B234337D16AB59D0007134B9; + remoteInfo = System7SoundPlayer; + }; B2B2C41315A9467100D6F61C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F5B5880F0156D2A601000001 /* Project object */; @@ -320,6 +334,16 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + B234338D16AB5D4A007134B9 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = Contents/XPCServices; + dstSubfolderSpec = 1; + files = ( + B234338E16AB5D5D007134B9 /* org.derailer.ResKnife.System7SoundPlayer.xpc in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; B24FA09A15D303C900622683 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -435,6 +459,11 @@ B229EEEF15A4FB6F0032C12C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Cocoa/English.lproj/InfoWindow.xib; sourceTree = SOURCE_ROOT; }; B229EEF115A4FB6F0032C12C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Cocoa/English.lproj/PrefsWindow.xib; sourceTree = SOURCE_ROOT; }; B229EEF315A4FB6F0032C12C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Cocoa/English.lproj/ResourceDocument.xib; sourceTree = SOURCE_ROOT; }; + B234337E16AB59D0007134B9 /* org.derailer.ResKnife.System7SoundPlayer.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = org.derailer.ResKnife.System7SoundPlayer.xpc; sourceTree = BUILT_PRODUCTS_DIR; }; + B234338216AB59D0007134B9 /* System7SoundPlayer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "System7SoundPlayer-Info.plist"; sourceTree = ""; }; + B234338416AB59D0007134B9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + B234338616AB59D0007134B9 /* System7SoundPlayer-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "System7SoundPlayer-Prefix.pch"; sourceTree = ""; }; + B234338716AB59D0007134B9 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; B24925E115A6776600C22060 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PictWindow.xib; sourceTree = ""; }; B24925E515A6778C00C22060 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ICONWindow.xib; sourceTree = ""; }; B25C779815D2B0C500C005DE /* HexFiend.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HexFiend.framework; sourceTree = ""; }; @@ -453,6 +482,7 @@ B2B2C41E15A9EEE100D6F61C /* RKPatternImageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RKPatternImageCell.m; path = "Pattern Editor/RKPatternImageCell.m"; sourceTree = ""; }; B2B2C43815A9FCCF00D6F61C /* RKPatternView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RKPatternView.h; path = "Pattern Editor/RKPatternView.h"; sourceTree = ""; }; B2B2C43915A9FCCF00D6F61C /* RKPatternView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RKPatternView.m; path = "Pattern Editor/RKPatternView.m"; sourceTree = ""; }; + B2B3CEA916B9DCE90027F33F /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Cocoa/English.lproj/ResourceGridView.xib; sourceTree = SOURCE_ROOT; }; B2FCA77F15A669C800696598 /* PictWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictWindowController.h; sourceTree = ""; }; B2FCA78015A669C800696598 /* PictWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictWindowController.m; sourceTree = ""; }; B2FCA78115A669C800696598 /* SupportedTypes.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SupportedTypes.plist; sourceTree = ""; }; @@ -644,6 +674,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B234337B16AB59D0007134B9 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + B234337F16AB59D0007134B9 /* Foundation.framework in Frameworks */, + B234339916AB6143007134B9 /* Carbon.framework in Frameworks */, + B23433DB16AB69AE007134B9 /* Cocoa.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; B2B2C40415A9464400D6F61C /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -829,6 +869,25 @@ name = "Other Frameworks"; sourceTree = ""; }; + B234338016AB59D0007134B9 /* System7SoundPlayer */ = { + isa = PBXGroup; + children = ( + B234338716AB59D0007134B9 /* main.m */, + B234338116AB59D0007134B9 /* Supporting Files */, + ); + path = System7SoundPlayer; + sourceTree = ""; + }; + B234338116AB59D0007134B9 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + B234338216AB59D0007134B9 /* System7SoundPlayer-Info.plist */, + B234338316AB59D0007134B9 /* InfoPlist.strings */, + B234338616AB59D0007134B9 /* System7SoundPlayer-Prefix.pch */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; B2B2C3FC15A9451800D6F61C /* Pattern Editor */ = { isa = PBXGroup; children = ( @@ -1010,6 +1069,7 @@ F5B5887C0156D6D901000001 /* Prefix Files */, F5B5881A0156D40B01000001 /* Cocoa */, F5EA10690254A7B401A80001 /* External */, + B234338016AB59D0007134B9 /* System7SoundPlayer */, F5B588490156D40B01000001 /* Frameworks */, F5B588110156D30301000001 /* Products */, ); @@ -1029,6 +1089,7 @@ B229EECA15A4B8720032C12C /* PNG Editor.plugin */, B2FCA78A15A66ACE00696598 /* PICT Editor.plugin */, B2B2C40715A9464400D6F61C /* Pattern Editor.plugin */, + B234337E16AB59D0007134B9 /* org.derailer.ResKnife.System7SoundPlayer.xpc */, ); name = Products; sourceTree = ""; @@ -1115,6 +1176,7 @@ F577A8F30211CFA701A80001 /* Save.tiff */, F577A8F80211DC1E01A80001 /* Show Info.tiff */, 3D35756004DAEB7F00B8225B /* Export.tiff */, + B2B3CEA816B9DCE90027F33F /* ResourceGridView.xib */, ); path = Resources; sourceTree = ""; @@ -1366,6 +1428,23 @@ productReference = B229EECA15A4B8720032C12C /* PNG Editor.plugin */; productType = "com.apple.product-type.bundle"; }; + B234337D16AB59D0007134B9 /* System7SoundPlayer */ = { + isa = PBXNativeTarget; + buildConfigurationList = B234338B16AB59D0007134B9 /* Build configuration list for PBXNativeTarget "System7SoundPlayer" */; + buildPhases = ( + B234337A16AB59D0007134B9 /* Sources */, + B234337B16AB59D0007134B9 /* Frameworks */, + B234337C16AB59D0007134B9 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = System7SoundPlayer; + productName = System7SoundPlayer; + productReference = B234337E16AB59D0007134B9 /* org.derailer.ResKnife.System7SoundPlayer.xpc */; + productType = "com.apple.product-type.bundle"; + }; B2B2C40615A9464400D6F61C /* Pattern Editor */ = { isa = PBXNativeTarget; buildConfigurationList = B2B2C41015A9464400D6F61C /* Build configuration list for PBXNativeTarget "Pattern Editor" */; @@ -1412,6 +1491,7 @@ E18BF586069FEA1300F076B8 /* Frameworks */, E18BF589069FEA1300F076B8 /* Rez */, B24FA09A15D303C900622683 /* CopyFiles */, + B234338D16AB5D4A007134B9 /* CopyFiles */, ); buildRules = ( ); @@ -1423,6 +1503,7 @@ E13F836508F139E900E2A5CB /* PBXTargetDependency */, B229EEE315A4BB720032C12C /* PBXTargetDependency */, B2B2C41415A9467100D6F61C /* PBXTargetDependency */, + B234339016AB5D77007134B9 /* PBXTargetDependency */, ); name = ResKnife; productInstallPath = "$(USER_APPS_DIR)"; @@ -1606,6 +1687,7 @@ B229EEC915A4B8720032C12C /* PNG Editor */, B2FCA78915A66ACE00696598 /* PICT Editor */, B2B2C40615A9464400D6F61C /* Pattern Editor */, + B234337D16AB59D0007134B9 /* System7SoundPlayer */, ); }; /* End PBXProject section */ @@ -1619,6 +1701,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B234337C16AB59D0007134B9 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B234338516AB59D0007134B9 /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; B2B2C40515A9464400D6F61C /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1665,6 +1755,7 @@ B229EEF915A4FB6F0032C12C /* ResourceDocument.xib in Resources */, B271D08015B6CFC70039A282 /* EditHexTemplate.pdf in Resources */, B2B51C9115B700560087978B /* Edit Hex.tiff in Resources */, + B2B3CEAA16B9DCE90027F33F /* ResourceGridView.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1805,6 +1896,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B234337A16AB59D0007134B9 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B234338816AB59D0007134B9 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; B2B2C40315A9464400D6F61C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1973,6 +2072,11 @@ target = B229EEC915A4B8720032C12C /* PNG Editor */; targetProxy = B229EEE215A4BB720032C12C /* PBXContainerItemProxy */; }; + B234339016AB5D77007134B9 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B234337D16AB59D0007134B9 /* System7SoundPlayer */; + targetProxy = B234338F16AB5D77007134B9 /* PBXContainerItemProxy */; + }; B2B2C41415A9467100D6F61C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B2B2C40615A9464400D6F61C /* Pattern Editor */; @@ -2066,6 +2170,14 @@ name = ResourceDocument.xib; sourceTree = ""; }; + B234338316AB59D0007134B9 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + B234338416AB59D0007134B9 /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; B24925E015A6776600C22060 /* PictWindow.xib */ = { isa = PBXVariantGroup; children = ( @@ -2115,6 +2227,14 @@ path = "../../Pattern Editor"; sourceTree = ""; }; + B2B3CEA816B9DCE90027F33F /* ResourceGridView.xib */ = { + isa = PBXVariantGroup; + children = ( + B2B3CEA916B9DCE90027F33F /* English */, + ); + name = ResourceGridView.xib; + sourceTree = ""; + }; B2FCA78F15A66ACF00696598 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -2318,6 +2438,69 @@ }; name = Release; }; + B234338916AB59D0007134B9 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "System7SoundPlayer/System7SoundPlayer-Prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = "System7SoundPlayer/System7SoundPlayer-Info.plist"; + MACH_O_TYPE = mh_execute; + MACOSX_DEPLOYMENT_TARGET = 10.7; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "org.derailer.ResKnife.$(TARGET_NAME:rfc1034identifier)"; + WRAPPER_EXTENSION = xpc; + }; + name = Debug; + }; + B234338A16AB59D0007134B9 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "System7SoundPlayer/System7SoundPlayer-Prefix.pch"; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = "System7SoundPlayer/System7SoundPlayer-Info.plist"; + MACH_O_TYPE = mh_execute; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = "org.derailer.ResKnife.$(TARGET_NAME:rfc1034identifier)"; + WRAPPER_EXTENSION = xpc; + }; + name = Release; + }; B2B2C41115A9464400D6F61C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2550,7 +2733,6 @@ HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Cocoa/Info.plist; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = ResKnife; WARNING_CFLAGS = ( "-Wmost", @@ -2577,7 +2759,6 @@ HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Cocoa/Info.plist; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = ResKnife; WARNING_CFLAGS = ( "-Wmost", @@ -2845,8 +3026,10 @@ buildSettings = { ARCHS = "$(NATIVE_ARCH_ACTUAL)"; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; + CODE_SIGN_IDENTITY = "Developer ID Application: Nate Weaver"; GCC_VERSION = ""; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PROVISIONING_PROFILE = ""; SDKROOT = macosx; }; name = Debug; @@ -2856,8 +3039,10 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; + CODE_SIGN_IDENTITY = "Developer ID Application: Nate Weaver"; GCC_VERSION = ""; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PROVISIONING_PROFILE = ""; SDKROOT = macosx; }; name = Release; @@ -2874,6 +3059,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + B234338B16AB59D0007134B9 /* Build configuration list for PBXNativeTarget "System7SoundPlayer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B234338916AB59D0007134B9 /* Debug */, + B234338A16AB59D0007134B9 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; B2B2C41015A9464400D6F61C /* Build configuration list for PBXNativeTarget "Pattern Editor" */ = { isa = XCConfigurationList; buildConfigurations = (