diff --git a/.gitmodules b/.gitmodules index 70e6915..5eb61f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "gen_icon"] - path = gen_icon - url = git://gist.github.com/3800241.git [submodule "xcodepkgtool"] path = xcodepkgtool url = git://github.com/youknowone/xcodepkgtool.git diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..e930df0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +language: objective-c +sudo: false +xcode_workspace: VisualJSON.xcworkspace +osx_image: xcode7 +xcode_sdk: + - macosx +xcode_scheme: + - VisualJSON + - VisualXML diff --git a/Podfile b/Podfile index 04ae91f..0fb7c1d 100644 --- a/Podfile +++ b/Podfile @@ -1,5 +1,19 @@ -platform :osx -pod 'cdebug' -pod 'FoundationExtension' -pod 'ObjectXML' -pod 'AFNetworking', '~> 0.10.1' +platform :osx, "10.9" + +target "VisualJSON" do + pod 'cdebug' + pod 'FoundationExtension', '~> 1.2.4' + pod 'ObjectXML', '>= 0.2' + pod 'AFNetworking', '~> 0.10.1' + pod 'Fabric' + pod 'Crashlytics' +end + +target "VisualXML" do + pod 'cdebug' + pod 'FoundationExtension', '~> 1.2.4' + pod 'ObjectXML', '>= 0.2' + pod 'AFNetworking', '~> 0.10.1' + pod 'Fabric' + pod 'Crashlytics' +end diff --git a/README.md b/README.md index 48fb838..2b3e930 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://travis-ci.org/youknowone/VisualJSON.svg?branch=master)](https://travis-ci.org/youknowone/VisualJSON) + Website: [http://youknowone.github.com/VisualJSON](http://youknowone.github.com/VisualJSON) VisualJSON is simple JSON pretty-viewer for Mac OS X. diff --git a/VisualJSON.xcodeproj/project.pbxproj b/VisualJSON.xcodeproj/project.pbxproj index b1ea61b..5a1f278 100644 --- a/VisualJSON.xcodeproj/project.pbxproj +++ b/VisualJSON.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 47; objects = { /* Begin PBXBuildFile section */ @@ -38,14 +38,17 @@ 387B1EBA16EBDEA80059722B /* VJJsonDocumentDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3868F79D1629EDCF00C31163 /* VJJsonDocumentDelegate.m */; }; 387B1EBB16EBDEB40059722B /* JsonElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 38255566157C94C50099CC24 /* JsonElement.m */; }; 387B1EBC16EBDEC30059722B /* VJDocumentHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = 388DE109165480EE00139B31 /* VJDocumentHistory.m */; }; - 387B1EBE16EBDF640059722B /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 387B1EBD16EBDF640059722B /* libPods.a */; }; 387B1EC016EBE3EF0059722B /* Icon.iconset in Resources */ = {isa = PBXBuildFile; fileRef = 387B1EBF16EBE3EF0059722B /* Icon.iconset */; }; 388720AD1745FD50006EFBAD /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 388720AB1745FD50006EFBAD /* MainMenu.xib */; }; 388DE10A165480EE00139B31 /* VJDocumentHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = 388DE109165480EE00139B31 /* VJDocumentHistory.m */; }; 38A1C035157DD7030034EDC4 /* VJRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 38A1C034157DD7030034EDC4 /* VJRequest.m */; }; 38A1C038157E15240034EDC4 /* VJDocument.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 38A1C036157E15240034EDC4 /* VJDocument.xcdatamodeld */; }; - 38B0C710164101F20044C73C /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 38B0C70F164101F20044C73C /* libPods.a */; }; 38C5D64117A37E590005C2BD /* VJJSONPreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38C5D64017A37E590005C2BD /* VJJSONPreferencesWindowController.m */; }; + 38F2F7361B0F248B00372447 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38F2F7351B0F248B00372447 /* SystemConfiguration.framework */; }; + 38F2F7381B0F248F00372447 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 38F2F7371B0F248F00372447 /* libz.dylib */; }; + 38F2F73A1B0F249300372447 /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 38F2F7391B0F249300372447 /* libc++.dylib */; }; + 3CD962861DD51BB73ADC6475 /* libPods-VisualJSON.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 338543E687681EA734AABFE8 /* libPods-VisualJSON.a */; }; + 9BEEA0246D3ED685232F81E4 /* libPods-VisualXML.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81989170E5964B0055B0C283 /* libPods-VisualXML.a */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -72,6 +75,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 338543E687681EA734AABFE8 /* libPods-VisualJSON.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VisualJSON.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 382554BA157BE3550099CC24 /* VisualJSON.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VisualJSON.app; sourceTree = BUILT_PRODUCTS_DIR; }; 382554BE157BE3550099CC24 /* Cocoa.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 382554C1157BE3550099CC24 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; @@ -112,7 +116,6 @@ 3868F79D1629EDCF00C31163 /* VJJsonDocumentDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VJJsonDocumentDelegate.m; sourceTree = ""; }; 3868F79F1629F12200C31163 /* VJXMLDocumentDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VJXMLDocumentDelegate.h; sourceTree = ""; }; 3868F7A01629F12200C31163 /* VJXMLDocumentDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VJXMLDocumentDelegate.m; sourceTree = ""; }; - 387B1EBD16EBDF640059722B /* libPods.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPods.a; path = Pods/build/Debug/libPods.a; sourceTree = ""; }; 387B1EBF16EBE3EF0059722B /* Icon.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; path = Icon.iconset; sourceTree = ""; }; 388720AC1745FD50006EFBAD /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; 388DE108165480EE00139B31 /* VJDocumentHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VJDocumentHistory.h; sourceTree = ""; }; @@ -123,9 +126,16 @@ 38B0C70F164101F20044C73C /* libPods.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPods.a; path = Pods/build/Release/libPods.a; sourceTree = ""; }; 38C5D63F17A37E590005C2BD /* VJJSONPreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VJJSONPreferencesWindowController.h; sourceTree = ""; }; 38C5D64017A37E590005C2BD /* VJJSONPreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VJJSONPreferencesWindowController.m; sourceTree = ""; }; - 38CAB03A1664F46B00181B0D /* version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = version.xcconfig; path = xcodepkgtool/version.xcconfig; sourceTree = ""; }; + 38CAB03A1664F46B00181B0D /* version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = version.xcconfig; sourceTree = ""; }; 38DB21241701FD96006E08D3 /* VisualXML.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = VisualXML.entitlements; sourceTree = ""; }; - C53C08C4F80849EB8B688C6C /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = SOURCE_ROOT; }; + 38F2F7351B0F248B00372447 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + 38F2F7371B0F248F00372447 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + 38F2F7391B0F249300372447 /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "usr/lib/libc++.dylib"; sourceTree = SDKROOT; }; + 38FEC6721CBAB0CA00EE3273 /* Pods-VisualJSON.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Pods-VisualJSON.debug.xcconfig"; path = "Pods/Target Support Files/Pods-VisualJSON/Pods-VisualJSON.debug.xcconfig"; sourceTree = ""; }; + 38FEC6731CBAB0CA00EE3273 /* Pods-VisualJSON.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Pods-VisualJSON.release.xcconfig"; path = "Pods/Target Support Files/Pods-VisualJSON/Pods-VisualJSON.release.xcconfig"; sourceTree = ""; }; + 38FEC6741CBAB0D300EE3273 /* Pods-VisualXML.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Pods-VisualXML.debug.xcconfig"; path = "Pods/Target Support Files/Pods-VisualXML/Pods-VisualXML.debug.xcconfig"; sourceTree = ""; }; + 38FEC6751CBAB0D300EE3273 /* Pods-VisualXML.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Pods-VisualXML.release.xcconfig"; path = "Pods/Target Support Files/Pods-VisualXML/Pods-VisualXML.release.xcconfig"; sourceTree = ""; }; + 81989170E5964B0055B0C283 /* libPods-VisualXML.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VisualXML.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -133,8 +143,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 38F2F73A1B0F249300372447 /* libc++.dylib in Frameworks */, + 38F2F7381B0F248F00372447 /* libz.dylib in Frameworks */, + 38F2F7361B0F248B00372447 /* SystemConfiguration.framework in Frameworks */, 382554BF157BE3550099CC24 /* Cocoa.framework in Frameworks */, - 38B0C710164101F20044C73C /* libPods.a in Frameworks */, + 3CD962861DD51BB73ADC6475 /* libPods-VisualJSON.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -153,8 +166,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 387B1EBE16EBDF640059722B /* libPods.a in Frameworks */, 3868F73D1629E8E700C31163 /* Cocoa.framework in Frameworks */, + 9BEEA0246D3ED685232F81E4 /* libPods-VisualXML.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -164,15 +177,14 @@ 382554AF157BE3550099CC24 = { isa = PBXGroup; children = ( - 387B1EBD16EBDF640059722B /* libPods.a */, 3868F7921629E95200C31163 /* Commons */, 382554C4157BE3550099CC24 /* VisualJSON */, 3868F7931629E9A700C31163 /* VisualXML */, 382554EC157BE3550099CC24 /* VisualJSONImporter */, 382554BD157BE3550099CC24 /* Frameworks */, 382554BB157BE3550099CC24 /* Products */, - C53C08C4F80849EB8B688C6C /* Pods.xcconfig */, 38CAB03A1664F46B00181B0D /* version.xcconfig */, + B2DDA047631B1454C2AA9280 /* Pods */, ); sourceTree = ""; }; @@ -189,6 +201,9 @@ 382554BD157BE3550099CC24 /* Frameworks */ = { isa = PBXGroup; children = ( + 38F2F7391B0F249300372447 /* libc++.dylib */, + 38F2F7371B0F248F00372447 /* libz.dylib */, + 38F2F7351B0F248B00372447 /* SystemConfiguration.framework */, 382554BE157BE3550099CC24 /* Cocoa.framework */, 382554E4157BE3550099CC24 /* CoreServices.framework */, 382554E6157BE3550099CC24 /* CoreFoundation.framework */, @@ -197,6 +212,8 @@ 3868F75C1629E8E800C31163 /* SenTestingKit.framework */, 382554C0157BE3550099CC24 /* Other Frameworks */, 38B0C70F164101F20044C73C /* libPods.a */, + 338543E687681EA734AABFE8 /* libPods-VisualJSON.a */, + 81989170E5964B0055B0C283 /* libPods-VisualXML.a */, ); name = Frameworks; sourceTree = ""; @@ -302,6 +319,17 @@ name = "Supporting Files"; sourceTree = ""; }; + B2DDA047631B1454C2AA9280 /* Pods */ = { + isa = PBXGroup; + children = ( + 38FEC6721CBAB0CA00EE3273 /* Pods-VisualJSON.debug.xcconfig */, + 38FEC6731CBAB0CA00EE3273 /* Pods-VisualJSON.release.xcconfig */, + 38FEC6741CBAB0D300EE3273 /* Pods-VisualXML.debug.xcconfig */, + 38FEC6751CBAB0D300EE3273 /* Pods-VisualXML.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -309,12 +337,15 @@ isa = PBXNativeTarget; buildConfigurationList = 38255500157BE3550099CC24 /* Build configuration list for PBXNativeTarget "VisualJSON" */; buildPhases = ( + C5DF35C53535DC0C196DFC34 /* Check Pods Manifest.lock */, 38CAB03C1664F48D00181B0D /* Generate Version xcconfig */, 382554B6157BE3550099CC24 /* Sources */, 382554B7157BE3550099CC24 /* Frameworks */, 382554B8157BE3550099CC24 /* Resources */, 388227E415924E57000AB63D /* Copy Frameworks */, 346F49323B434C84B4E1D346 /* Copy Pods Resources */, + F5C847DDDE34CBCCC996AC49 /* Embed Pods Frameworks */, + 38F2F72E1B0F235000372447 /* Fabric */, ); buildRules = ( ); @@ -346,10 +377,15 @@ isa = PBXNativeTarget; buildConfigurationList = 3868F7881629E8E800C31163 /* Build configuration list for PBXNativeTarget "VisualXML" */; buildPhases = ( + 0AF0832871F68648A9BA93AC /* Check Pods Manifest.lock */, + 38FEC66F1CBAAFC100EE3273 /* Generate version xcconfig */, 3868F7371629E8E700C31163 /* Sources */, 3868F7381629E8E700C31163 /* Frameworks */, 3868F7391629E8E700C31163 /* Resources */, 3868F79A1629EACF00C31163 /* Copy Frameworks */, + AD5FDDD27CE6756A35191F37 /* Copy Pods Resources */, + 720EAD7A2E83FFBBA3F4F7F2 /* Embed Pods Frameworks */, + 38FEC6711CBAB03E00EE3273 /* Fabric */, ); buildRules = ( ); @@ -367,11 +403,16 @@ isa = PBXProject; attributes = { CLASSPREFIX = VJ; - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0720; ORGANIZATIONNAME = youknowone.org; + TargetAttributes = { + 382554B9157BE3550099CC24 = { + DevelopmentTeam = 9384JEL3M9; + }; + }; }; buildConfigurationList = 382554B4157BE3550099CC24 /* Build configuration list for PBXProject "VisualJSON" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 6.3"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -423,6 +464,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 0AF0832871F68648A9BA93AC /* Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; 346F49323B434C84B4E1D346 /* Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -435,7 +491,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VisualJSON/Pods-VisualJSON-resources.sh\"\n"; }; 38CAB03C1664F48D00181B0D /* Generate Version xcconfig */ = { isa = PBXShellScriptBuildPhase; @@ -449,7 +505,109 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd xcodepkgtool\necho \"APP_VERSION=`./version.sh`\" > version.xcconfig"; + shellScript = "echo \"APP_VERSION=`xcodepkgtool/version.sh`\" > version.xcconfig"; + }; + 38F2F72E1B0F235000372447 /* Fabric */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = Fabric; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "./Pods/Fabric/run 1b5d8443c3eabba778b0d97bff234647af846181 34aaecdde99dce1f9408a963ba788143536760a1c73ce21b46a14f888c5d54c1"; + }; + 38FEC66F1CBAAFC100EE3273 /* Generate version xcconfig */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Generate version xcconfig"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"APP_VERSION=`xcodepkgtool/version.sh`\" > version.xcconfig"; + }; + 38FEC6711CBAB03E00EE3273 /* Fabric */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = Fabric; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "./Pods/Fabric/run 1b5d8443c3eabba778b0d97bff234647af846181 34aaecdde99dce1f9408a963ba788143536760a1c73ce21b46a14f888c5d54c1"; + }; + 720EAD7A2E83FFBBA3F4F7F2 /* Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VisualXML/Pods-VisualXML-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + AD5FDDD27CE6756A35191F37 /* Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VisualXML/Pods-VisualXML-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + C5DF35C53535DC0C196DFC34 /* Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; + F5C847DDDE34CBCCC996AC49 /* Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VisualJSON/Pods-VisualJSON-frameworks.sh\"\n"; + showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -556,8 +714,9 @@ baseConfigurationReference = 38CAB03A1664F46B00181B0D /* version.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -572,7 +731,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = FoundationExtension; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -583,7 +742,7 @@ baseConfigurationReference = 38CAB03A1664F46B00181B0D /* version.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -593,7 +752,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = FoundationExtension; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; }; name = Release; @@ -608,6 +767,7 @@ INFOPLIST_FILE = "VisualJSONImporter/VisualJSONImporter-Info.plist"; INSTALL_PATH = "@executable_path/../Contents/Library/Spotlight"; LIBRARY_STYLE = BUNDLE; + PRODUCT_BUNDLE_IDENTIFIER = "org.youknowone.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; WRAPPER_EXTENSION = mdimporter; @@ -624,6 +784,7 @@ INFOPLIST_FILE = "VisualJSONImporter/VisualJSONImporter-Info.plist"; INSTALL_PATH = "@executable_path/../Contents/Library/Spotlight"; LIBRARY_STYLE = BUNDLE; + PRODUCT_BUNDLE_IDENTIFIER = "org.youknowone.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; WRAPPER_EXTENSION = mdimporter; @@ -632,10 +793,13 @@ }; 38255501157BE3550099CC24 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C53C08C4F80849EB8B688C6C /* Pods.xcconfig */; + baseConfigurationReference = 38FEC6721CBAB0CA00EE3273 /* Pods-VisualJSON.debug.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = VisualJSON/Entitlements.entitlements; COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "VisualJSON/VisualJSON-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = JSON; @@ -644,7 +808,7 @@ "$(inherited)", "\"$(SRCROOT)/Pods/build/$(CONFIGURATION)\"", ); - MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_BUNDLE_IDENTIFIER = "org.3rddev.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -652,11 +816,14 @@ }; 38255502157BE3550099CC24 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C53C08C4F80849EB8B688C6C /* Pods.xcconfig */; + baseConfigurationReference = 38FEC6731CBAB0CA00EE3273 /* Pods-VisualJSON.release.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = VisualJSON/Entitlements.entitlements; - CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application"; COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "VisualJSON/VisualJSON-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = JSON; @@ -665,23 +832,25 @@ "$(inherited)", "\"$(SRCROOT)/Pods/build/$(CONFIGURATION)\"", ); - MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_BUNDLE_IDENTIFIER = "org.3rddev.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = app; }; name = Release; }; 3868F7891629E8E800C31163 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C53C08C4F80849EB8B688C6C /* Pods.xcconfig */; + baseConfigurationReference = 38FEC6741CBAB0D300EE3273 /* Pods-VisualXML.debug.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_ENTITLEMENTS = VisualXML/VisualXML.entitlements; COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "VisualJSON/VisualJSON-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = XML; @@ -690,6 +859,7 @@ "$(inherited)", "\"$(PODS_ROOT)/build/$(CONFIGURATION)\"", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.3rddev.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -697,15 +867,18 @@ }; 3868F78A1629E8E800C31163 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C53C08C4F80849EB8B688C6C /* Pods.xcconfig */; + baseConfigurationReference = 38FEC6751CBAB0D300EE3273 /* Pods-VisualXML.release.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_ENTITLEMENTS = VisualXML/VisualXML.entitlements; - CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application"; COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "VisualJSON/VisualJSON-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = XML; @@ -714,8 +887,8 @@ "$(inherited)", "\"$(PODS_ROOT)/build/$(CONFIGURATION)\"", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.3rddev.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/VisualJSON.xcodeproj/xcshareddata/xcschemes/VisualJSON.xcscheme b/VisualJSON.xcodeproj/xcshareddata/xcschemes/VisualJSON.xcscheme new file mode 100644 index 0000000..9a20fb1 --- /dev/null +++ b/VisualJSON.xcodeproj/xcshareddata/xcschemes/VisualJSON.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VisualJSON.xcodeproj/xcshareddata/xcschemes/VisualXML.xcscheme b/VisualJSON.xcodeproj/xcshareddata/xcschemes/VisualXML.xcscheme new file mode 100644 index 0000000..978d073 --- /dev/null +++ b/VisualJSON.xcodeproj/xcshareddata/xcschemes/VisualXML.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VisualJSON/AppDelegate.h b/VisualJSON/AppDelegate.h index 85d4364..525351e 100644 --- a/VisualJSON/AppDelegate.h +++ b/VisualJSON/AppDelegate.h @@ -8,7 +8,7 @@ #import -@interface AppDelegate : NSObject +@interface AppDelegate : NSObject @property(nonatomic,retain) IBOutlet NSWindowController *preferenceWindowController; diff --git a/VisualJSON/AppDelegate.m b/VisualJSON/AppDelegate.m index f5c21fd..5d82e08 100644 --- a/VisualJSON/AppDelegate.m +++ b/VisualJSON/AppDelegate.m @@ -6,10 +6,17 @@ // Copyright (c) 2012 youknowone.org All rights reserved. // +#import +#import + #import "AppDelegate.h" @implementation AppDelegate +- (void)applicationDidFinishLaunching:(NSNotification *)aNotification { + [Fabric with:@[CrashlyticsKit]]; +} + - (void)showPreference:(id)sender { [self.preferenceWindowController showWindow:sender]; } diff --git a/VisualJSON/VisualJSON-Info.plist b/VisualJSON/VisualJSON-Info.plist index 91ccbae..47bd226 100644 --- a/VisualJSON/VisualJSON-Info.plist +++ b/VisualJSON/VisualJSON-Info.plist @@ -32,7 +32,7 @@ CFBundleIconFile Icon.icns CFBundleIdentifier - org.3rddev.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -45,6 +45,20 @@ ???? CFBundleVersion ${APP_VERSION} + Fabric + + APIKey + 1b5d8443c3eabba778b0d97bff234647af846181 + Kits + + + KitInfo + + KitName + Crashlytics + + + LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion diff --git a/VisualJSON/en.lproj/MainMenu.xib b/VisualJSON/en.lproj/MainMenu.xib index 80c63d3..9ed44ec 100644 --- a/VisualJSON/en.lproj/MainMenu.xib +++ b/VisualJSON/en.lproj/MainMenu.xib @@ -2,13 +2,13 @@ 1070 - 13A558 - 3084 - 1249.11 - 691.00 + 14D136 + 7702 + 1347.57 + 758.70 com.apple.InterfaceBuilder.CocoaPlugin - 3084 + 7702 IBNSLayoutConstraint @@ -1372,7 +1372,7 @@ - + 256 @@ -1388,7 +1388,7 @@ 268435456 Show brief of Array/Dictionary in tree view - LucidaGrande + YES 13 1044 @@ -1415,7 +1415,6 @@ 268 {{18, 18}, {337, 18}} - _NS:9 YES @@ -1438,17 +1437,16 @@ {373, 90} - _NS:20 - {{0, 0}, {1280, 778}} + {{0, 0}, {1920, 1177}} {10000000000000, 10000000000000} NO - + terminate: @@ -1457,6 +1455,14 @@ 448 + + + delegate + + + + 595 + orderFrontStandardAboutPanel: @@ -3245,14 +3251,16 @@ 4 1 + 1 20 1000 - 8 + 0 29 3 + NO @@ -3261,14 +3269,16 @@ 5 1 + 1 20 1000 - 8 + 0 29 3 + NO @@ -3277,14 +3287,16 @@ 6 1 + 1 20 1000 - 8 + 0 29 3 + NO @@ -3293,14 +3305,16 @@ 6 1 + 1 20 1000 - 8 + 0 29 3 + NO @@ -3309,14 +3323,16 @@ 5 1 + 1 20 1000 - 8 + 0 29 3 + NO @@ -3325,14 +3341,16 @@ 3 1 + 1 20 1000 - 8 + 0 29 3 + NO @@ -3587,7 +3605,7 @@ - 594 + 595 @@ -3613,15 +3631,16 @@ 0 IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - + NO + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + YES 3 - {11, 11} - {10, 3} + {12, 12} + {10, 2} {15, 15} YES diff --git a/VisualJSON/en.lproj/VJDocument.xib b/VisualJSON/en.lproj/VJDocument.xib index b713f4d..04e1dcc 100644 --- a/VisualJSON/en.lproj/VJDocument.xib +++ b/VisualJSON/en.lproj/VJDocument.xib @@ -1,14 +1,14 @@ - 1080 - 12C60 - 2844 - 1187.34 - 625.00 + 1070 + 14D136 + 7702 + 1347.57 + 758.70 com.apple.InterfaceBuilder.CocoaPlugin - 2844 + 7702 NSBox @@ -264,7 +264,7 @@ {32, 5} - {32, 32} + {32, 10000} YES YES -1 @@ -338,7 +338,7 @@ 272630784 Address: - LucidaGrande + YES 13 1044 @@ -364,6 +364,7 @@ NO + 1 @@ -408,6 +409,8 @@ YES NO YES + tableViewAction: + 10 @@ -418,9 +421,9 @@ 0 - LucidaGrande + YES 12 - 16 + 787 3 @@ -430,7 +433,7 @@ 338690112 - 1024 + 268436480 YES @@ -473,6 +476,7 @@ NO + 1 @@ -482,7 +486,6 @@ {{483, 119}, {39, 38}} - _NS:687 YES @@ -522,6 +525,7 @@ NO + 1 @@ -633,10 +637,63 @@ AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB -AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES +AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB +AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS -AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA +AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAxIAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMSExp +bm8CEAAAbW50clJHQiBYWVogB84AAgAJAAYAMQAAYWNzcE1TRlQAAAAASUVDIHNSR0IAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1IUCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAARY3BydAAAAVAAAAAzZGVzYwAAAYQAAABsd3RwdAAAAfAAAAAUYmtwdAAAAgQAAAAUclhZWgAA +AhgAAAAUZ1hZWgAAAiwAAAAUYlhZWgAAAkAAAAAUZG1uZAAAAlQAAABwZG1kZAAAAsQAAACIdnVlZAAA +A0wAAACGdmlldwAAA9QAAAAkbHVtaQAAA/gAAAAUbWVhcwAABAwAAAAkdGVjaAAABDAAAAAMclRSQwAA +BDwAAAgMZ1RSQwAABDwAAAgMYlRSQwAABDwAAAgMdGV4dAAAAABDb3B5cmlnaHQgKGMpIDE5OTggSGV3 +bGV0dC1QYWNrYXJkIENvbXBhbnkAAGRlc2MAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAA +AAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAFhZWiAAAAAAAADzUQABAAAAARbMWFlaIAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA +b6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9kZXNjAAAAAAAA +ABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAAAAAAAAAAABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAuSUVDIDYx +OTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAuSUVDIDYxOTY2 +LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRl +c2MAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAA +AAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAB2aWV3AAAAAAATpP4AFF8uABDPFAAD7cwABBMLAANcngAAAAFYWVogAAAAAABM +CVYAUAAAAFcf521lYXMAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAKPAAAAAnNpZyAAAAAAQ1JUIGN1 +cnYAAAAAAAAEAAAAAAUACgAPABQAGQAeACMAKAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3 +AHwAgQCGAIsAkACVAJoAnwCkAKkArgCyALcAvADBAMYAywDQANUA2wDgAOUA6wDwAPYA+wEBAQcBDQET +ARkBHwElASsBMgE4AT4BRQFMAVIBWQFgAWcBbgF1AXwBgwGLAZIBmgGhAakBsQG5AcEByQHRAdkB4QHp +AfIB+gIDAgwCFAIdAiYCLwI4AkECSwJUAl0CZwJxAnoChAKOApgCogKsArYCwQLLAtUC4ALrAvUDAAML +AxYDIQMtAzgDQwNPA1oDZgNyA34DigOWA6IDrgO6A8cD0wPgA+wD+QQGBBMEIAQtBDsESARVBGMEcQR+ +BIwEmgSoBLYExATTBOEE8AT+BQ0FHAUrBToFSQVYBWcFdwWGBZYFpgW1BcUF1QXlBfYGBgYWBicGNwZI +BlkGagZ7BowGnQavBsAG0QbjBvUHBwcZBysHPQdPB2EHdAeGB5kHrAe/B9IH5Qf4CAsIHwgyCEYIWghu +CIIIlgiqCL4I0gjnCPsJEAklCToJTwlkCXkJjwmkCboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3Arz +CwsLIgs5C1ELaQuAC5gLsAvIC+EL+QwSDCoMQwxcDHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3e +DfgOEw4uDkkOZA5/DpsOtg7SDu4PCQ8lD0EPXg96D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPURExEx +EU8RbRGMEaoRyRHoEgcSJhJFEmQShBKjEsMS4xMDEyMTQxNjE4MTpBPFE+UUBhQnFEkUahSLFK0UzhTw +FRIVNBVWFXgVmxW9FeAWAxYmFkkWbBaPFrIW1hb6Fx0XQRdlF4kXrhfSF/cYGxhAGGUYihivGNUY+hkg +GUUZaxmRGbcZ3RoEGioaURp3Gp4axRrsGxQbOxtjG4obshvaHAIcKhxSHHscoxzMHPUdHh1HHXAdmR3D +HeweFh5AHmoelB6+HukfEx8+H2kflB+/H+ogFSBBIGwgmCDEIPAhHCFIIXUhoSHOIfsiJyJVIoIiryLd +IwojOCNmI5QjwiPwJB8kTSR8JKsk2iUJJTglaCWXJccl9yYnJlcmhya3JugnGCdJJ3onqyfcKA0oPyhx +KKIo1CkGKTgpaymdKdAqAio1KmgqmyrPKwIrNitpK50r0SwFLDksbiyiLNctDC1BLXYtqy3hLhYuTC6C +Lrcu7i8kL1ovkS/HL/4wNTBsMKQw2zESMUoxgjG6MfIyKjJjMpsy1DMNM0YzfzO4M/E0KzRlNJ402DUT +NU01hzXCNf02NzZyNq426TckN2A3nDfXOBQ4UDiMOMg5BTlCOX85vDn5OjY6dDqyOu87LTtrO6o76Dwn +PGU8pDzjPSI9YT2hPeA+ID5gPqA+4D8hP2E/oj/iQCNAZECmQOdBKUFqQaxB7kIwQnJCtUL3QzpDfUPA +RANER0SKRM5FEkVVRZpF3kYiRmdGq0bwRzVHe0fASAVIS0iRSNdJHUljSalJ8Eo3Sn1KxEsMS1NLmkvi +TCpMcky6TQJNSk2TTdxOJU5uTrdPAE9JT5NP3VAnUHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSP +VNtVKFV1VcJWD1ZcVqlW91dEV5JX4FgvWH1Yy1kaWWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3J +XhpebF69Xw9fYV+zYAVgV2CqYPxhT2GiYfViSWKcYvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeT +Z+loP2iWaOxpQ2maafFqSGqfavdrT2una/9sV2yvbQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHw +cktypnMBc11zuHQUdHB0zHUodYV14XY+dpt2+HdWd7N4EXhueMx5KnmJeed6RnqlewR7Y3vCfCF8gXzh +fUF9oX4BfmJ+wn8jf4R/5YBHgKiBCoFrgc2CMIKSgvSDV4O6hB2EgITjhUeFq4YOhnKG14c7h5+IBIhp +iM6JM4mZif6KZIrKizCLlov8jGOMyo0xjZiN/45mjs6PNo+ekAaQbpDWkT+RqJIRknqS45NNk7aUIJSK +lPSVX5XJljSWn5cKl3WX4JhMmLiZJJmQmfyaaJrVm0Kbr5wcnImc951kndKeQJ6unx2fi5/6oGmg2KFH +obaiJqKWowajdqPmpFakx6U4pammGqaLpv2nbqfgqFKoxKk3qamqHKqPqwKrdavprFys0K1ErbiuLa6h +rxavi7AAsHWw6rFgsdayS7LCszizrrQltJy1E7WKtgG2ebbwt2i34LhZuNG5SrnCuju6tbsuu6e8Ibyb +vRW9j74KvoS+/796v/XAcMDswWfB48JfwtvDWMPUxFHEzsVLxcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2 +y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 +2vvbgNwF3IrdEN2W3hzeot8p36/gNuC94UThzOJT4tvjY+Pr5HPk/OWE5g3mlucf56noMui86Ubp0Opb +6uXrcOv77IbtEe2c7ijutO9A78zwWPDl8XLx//KM8xnzp/Q09ML1UPXe9m32+/eK+Bn4qPk4+cf6V/rn ++3f8B/yY/Sn9uv5L/tz/bf//A @@ -675,6 +732,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -703,6 +761,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -724,6 +783,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -731,7 +791,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 2304 + 2322 @@ -758,7 +818,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {392, 56} - + _NS:13 @@ -797,7 +857,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + 1 @@ -813,7 +873,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - 6 + 70 {463, 10000000} @@ -902,11 +962,63 @@ AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A AAAA/wAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A ////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/FBQU1AUFBXEAAAAG////AP///wTr6+tO ZWVluC4uLuoAAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8AABABAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA -EM4BAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE -AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENYBGwAFAAAAAQAAEN4BHAADAAAAAQAB -AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEOYAAAAAAAgACAAIAAgSAAAAACAAABIA -AAAAIAAAAAEAAQABAAE +////AP///wD///8A////AP///wD///8AABEBAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA +EOoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE +AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENoBGwAFAAAAAQAAEOIBHAADAAAAAQAB +AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEPKHcwAHAAAMSAAAEPoAAAAAAAAAkAAA +AAEAAACQAAAAAQAIAAgACAAIAAEAAQABAAEAAAxITGlubwIQAABtbnRyUkdCIFhZWiAHzgACAAkABgAx +AABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQICAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFjcHJ0AAABUAAAADNkZXNjAAABhAAA +AGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAACGAAAABRnWFlaAAACLAAAABRiWFlaAAACQAAA +ABRkbW5kAAACVAAAAHBkbWRkAAACxAAAAIh2dWVkAAADTAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAA +ABRtZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJDAAAEPAAACAxnVFJDAAAEPAAACAxiVFJDAAAEPAAA +CAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5OCBIZXdsZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAA +AAAAAAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNRAAEAAAAB +FsxYWVogAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAA +GNpYWVogAAAAAAAAJKAAAA+EAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAA +AAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBz +cGFjZSAtIHNSR0IAAAAAAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFj +ZSAtIHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcg +Q29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRp +dGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAAABOk/gAU +Xy4AEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAAAAAAAAABAAAAAAAA +AAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAo +AC0AMgA3ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8 +AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFu +AXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJn +AnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOu +A7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJ +BVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9 +B08HYQd0B4YHmQesB78H0gflB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmP +CaQJugnPCeUJ+woRCicKPQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxD +DFwMdQyODKcMwAzZDPMNDQ0mDUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9e +D3oPlg+zD88P7BAJECYQQxBhEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLj +EwMTIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbW +FvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7 +G2MbihuyG9ocAhwqHFIcexyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAV +IEEgbCCYIMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVo +JZclxyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2 +K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGC +Mbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQ +OIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+i +P+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7 +R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/d +UCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjL +WRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJ +Ypxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpIap9q92tPa6dr/2xX +bK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4 +d1Z3s3gReG54zHkqeYl553pGeqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIw +gpKC9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/ +jmaOzo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/Jpo +mtWbQpuvnByciZz3nWSd0p5Anq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adu +p+CoUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUT +tYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NY +w9TEUcTOxUvFyMZGxsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/ +0sHTRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM +4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/ +8ozzGfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t//8 @@ -976,6 +1088,7 @@ wGw 4 + YES @@ -986,6 +1099,8 @@ wGw _NS:83 NO + _doScroller: + _doScroller: 1 @@ -1000,6 +1115,8 @@ wGw _NS:33 NO + _doScroller: + 1 _doScroller: @@ -1010,7 +1127,7 @@ wGw {{87, 14}, {394, 58}} - + _NS:9 133138 @@ -1027,7 +1144,6 @@ wGw {{483, 66}, {39, 38}} - _NS:1574 YES @@ -1035,7 +1151,7 @@ wGw 134217728 - LucidaGrande + YES 10 2843 @@ -1072,6 +1188,7 @@ wGw NO + 1 @@ -1095,7 +1212,6 @@ wGw {{17, 6}, {535, 173}} - YES _NS:18 {0, 0} @@ -1104,15 +1220,17 @@ wGw 0 Resource - LucidaGrande + YES 11 3100 - 3 - MCAwLjgwMDAwMDAxMTkAA + 6 + System + labelColor + @@ -1127,6 +1245,7 @@ wGw _NS:1113 + YES NSView @@ -1135,18 +1254,20 @@ wGw - 18 + 274 + + public.item + {{13, 10}, {543, 298}} - _NS:608 1 - 256 + 274 @@ -1154,7 +1275,7 @@ wGw - 2304 + 2322 @@ -1163,7 +1284,7 @@ wGw {487, 214} - + _NS:1703 YES NO @@ -1249,7 +1370,7 @@ wGw 3 2 - + 17 -767557632 @@ -1271,6 +1392,7 @@ wGw 4 + YES @@ -1281,6 +1403,8 @@ wGw _NS:1726 NO + _doScroller: + _doScroller: 37 @@ -1292,9 +1416,10 @@ wGw {{1, 119}, {223, 15}} - _NS:1728 NO + _doScroller: + 1 _doScroller: @@ -1302,7 +1427,7 @@ wGw - 2304 + 2338 @@ -1314,12 +1439,13 @@ wGw 4 + YES {{17, 17}, {489, 232}} - + _NS:1699 133682 @@ -1390,7 +1516,7 @@ wGw - + @@ -1400,7 +1526,7 @@ wGw 1 - 6 + 70 {494, 10000000} @@ -1433,6 +1559,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4 + YES @@ -1442,6 +1569,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA _NS:1494 NO + _doScroller: + _doScroller: 1 @@ -1455,6 +1584,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA _NS:1482 NO + _doScroller: + 1 _doScroller: @@ -1499,6 +1630,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA _NS:1116 + YES NSView @@ -1515,7 +1647,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - {{0, 0}, {1680, 1028}} + {{0, 0}, {1920, 1177}} {600, 610} {10000000000000, 10000000000000} YES @@ -1555,6 +1687,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -1598,6 +1731,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -1618,6 +1752,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NO + 1 @@ -1725,7 +1860,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 3 2 - + 17 -700448768 @@ -1746,6 +1881,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4 + YES @@ -1755,6 +1891,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA _NS:58 NO + _doScroller: + _doScroller: 37 @@ -1768,6 +1906,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA _NS:60 NO + _doScroller: + 1 _doScroller: @@ -1786,6 +1926,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4 + YES {{14, 35}, {320, 144}} @@ -1914,7 +2055,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 - {318, 160} + {318.5, 160} _NS:13 @@ -1924,7 +2065,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 - {318, 17} + {318.5, 17} _NS:16 @@ -1996,7 +2137,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 3 2 - + 17 -700448768 @@ -2017,6 +2158,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4 + YES @@ -2026,6 +2168,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA _NS:58 NO + _doScroller: + _doScroller: 37 @@ -2039,6 +2183,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA _NS:60 NO + _doScroller: + 1 _doScroller: @@ -2057,6 +2203,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 4 + YES {{17, 39}, {320, 178}} @@ -2181,7 +2328,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - + @@ -2191,7 +2338,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1 - 6 + 70 {463, 10000000} @@ -2279,11 +2426,63 @@ AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A AAAA/wAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A ////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/FBQU1AUFBXEAAAAG////AP///wTr6+tO ZWVluC4uLuoAAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A -////AP///wD///8A////AP///wD///8AABABAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA -EM4BAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE -AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENYBGwAFAAAAAQAAEN4BHAADAAAAAQAB -AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEOYAAAAAAAgACAAIAAgSAAAAACAAABIA -AAAAIAAAAAEAAQABAAE +////AP///wD///8A////AP///wD///8AABEBAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA +EOoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE +AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENoBGwAFAAAAAQAAEOIBHAADAAAAAQAB +AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEPKHcwAHAAAMSAAAEPoAAAAAAAAAkAAA +AAEAAACQAAAAAQAIAAgACAAIAAEAAQABAAEAAAxITGlubwIQAABtbnRyUkdCIFhZWiAHzgACAAkABgAx +AABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQICAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFjcHJ0AAABUAAAADNkZXNjAAABhAAA +AGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAACGAAAABRnWFlaAAACLAAAABRiWFlaAAACQAAA +ABRkbW5kAAACVAAAAHBkbWRkAAACxAAAAIh2dWVkAAADTAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAA +ABRtZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJDAAAEPAAACAxnVFJDAAAEPAAACAxiVFJDAAAEPAAA +CAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5OCBIZXdsZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAA +AAAAAAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNRAAEAAAAB +FsxYWVogAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAA +GNpYWVogAAAAAAAAJKAAAA+EAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAA +AAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBz +cGFjZSAtIHNSR0IAAAAAAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFj +ZSAtIHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcg +Q29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRp +dGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAAABOk/gAU +Xy4AEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAAAAAAAAABAAAAAAAA +AAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAo +AC0AMgA3ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8 +AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFu +AXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJn +AnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOu +A7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJ +BVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9 +B08HYQd0B4YHmQesB78H0gflB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmP +CaQJugnPCeUJ+woRCicKPQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxD +DFwMdQyODKcMwAzZDPMNDQ0mDUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9e +D3oPlg+zD88P7BAJECYQQxBhEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLj +EwMTIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbW +FvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7 +G2MbihuyG9ocAhwqHFIcexyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAV +IEEgbCCYIMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVo +JZclxyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2 +K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGC +Mbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQ +OIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+i +P+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7 +R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/d +UCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjL +WRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJ +Ypxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpIap9q92tPa6dr/2xX +bK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4 +d1Z3s3gReG54zHkqeYl553pGeqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIw +gpKC9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/ +jmaOzo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/Jpo +mtWbQpuvnByciZz3nWSd0p5Anq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adu +p+CoUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUT +tYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NY +w9TEUcTOxUvFyMZGxsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/ +0sHTRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM +4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/ +8ozzGfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t//8 @@ -2353,6 +2552,7 @@ wGw 4 + YES @@ -2362,6 +2562,8 @@ wGw _NS:83 NO + _doScroller: + _doScroller: 1 @@ -2375,6 +2577,8 @@ wGw _NS:33 NO + _doScroller: + 1 _doScroller: @@ -2440,7 +2644,7 @@ wGw - + window @@ -3874,6 +4078,7 @@ wGw com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {423, 268} com.apple.InterfaceBuilder.CocoaPlugin {{133, 170}, {507, 413}} @@ -4013,9 +4218,27 @@ wGw NSTextView + + IBProjectSource + VisualJSON/VJDocument.h + + + + VJDocument + + methodMatrixChanged: + id + + + methodMatrixChanged: + + methodMatrixChanged: + id + + IBProjectSource - ./Classes/VJDocument.h + VisualJSON/VJDocument.m @@ -4049,10 +4272,7 @@ wGw NSTableView - - IBProjectSource - ./Classes/VJHeaderTableViewController.h - + VJQuerydataTableViewController @@ -4090,25 +4310,367 @@ wGw NSTextView + + + + + + NSActionCell + NSCell - IBProjectSource - ./Classes/VJQuerydataTableViewController.h + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSBox + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSBox.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSComboBox + NSTextField + + IBFrameworkSource + AppKit.framework/Headers/NSComboBox.h + + + + NSComboBoxCell + NSTextFieldCell + + IBFrameworkSource + AppKit.framework/Headers/NSComboBoxCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSController + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSController.h + + + + NSDocument + NSObject + + id + id + id + id + id + id + + + + printDocument: + id + + + revertDocumentToSaved: + id + + + runPageLayout: + id + + + saveDocument: + id + + + saveDocumentAs: + id + + + saveDocumentTo: + id + + + + IBFrameworkSource + AppKit.framework/Headers/NSDocument.h + + + + NSDrawer + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSManagedObjectContext + NSObject + + IBFrameworkSource + CoreData.framework/Headers/NSManagedObjectContext.h + + + + NSMatrix + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSMatrix.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSObjectController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSObjectController.h + + + + NSOutlineView + NSTableView + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSPersistentDocument + NSDocument + + IBFrameworkSource + AppKit.framework/Headers/NSPersistentDocument.h + + + + NSProgressIndicator + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSProgressIndicator.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSScrollView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSScrollView.h + + + + NSScroller + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSScroller.h + + + + NSSplitView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSSplitView.h + + + + NSTabView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTabView.h + + + + NSTabViewItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTabViewItem.h + + + + NSTableColumn + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableColumn.h + + + + NSTableHeaderView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTableHeaderView.h + + + + NSTableView + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSText + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSText.h + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSTextView + NSText + + IBFrameworkSource + AppKit.framework/Headers/NSTextView.h + + + + NSToolbar + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbar.h + + + + NSToolbarItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSUserDefaultsController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSUserDefaultsController.h + + + + NSView + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSWindow + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h 0 IBCocoaFramework + NO + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + YES 3 {512, 512} - {15, 15} - {8, 8} - {11, 11} - {10, 3} - {10, 12} - {8, 8} + {14, 14} + {11, 11} + {12, 12} + {10, 2} + {11, 15} + {11, 11} {32, 32} {32, 32} {32, 32} diff --git a/VisualJSONImporter/VisualJSONImporter-Info.plist b/VisualJSONImporter/VisualJSONImporter-Info.plist index 7bbc202..6d32949 100644 --- a/VisualJSONImporter/VisualJSONImporter-Info.plist +++ b/VisualJSONImporter/VisualJSONImporter-Info.plist @@ -20,7 +20,7 @@ CFBundleIconFile CFBundleIdentifier - org.youknowone.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/VisualXML/VisualXML-Info.plist b/VisualXML/VisualXML-Info.plist index 91ccbae..8fae732 100644 --- a/VisualXML/VisualXML-Info.plist +++ b/VisualXML/VisualXML-Info.plist @@ -32,7 +32,7 @@ CFBundleIconFile Icon.icns CFBundleIdentifier - org.3rddev.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/gen_icon b/gen_icon deleted file mode 160000 index 466a25f..0000000 --- a/gen_icon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 466a25f4ad4f7655c62a04d40119e836c4b17960 diff --git a/xcodepkgtool b/xcodepkgtool index e6bbca5..f371180 160000 --- a/xcodepkgtool +++ b/xcodepkgtool @@ -1 +1 @@ -Subproject commit e6bbca52aa71b4b626c09577b660046da0f44d72 +Subproject commit f371180b95f35ef96fcbd46fbb8f78e4d008c8a3 diff --git a/build_settings.sh b/xcodepkgtool_settings.sh similarity index 76% rename from build_settings.sh rename to xcodepkgtool_settings.sh index 9b58c83..8bc1fe5 100644 --- a/build_settings.sh +++ b/xcodepkgtool_settings.sh @@ -4,20 +4,21 @@ # If tag is 'v1.3.1', set this 'v' tagprefix='v' +workspace='VisualJSON.xcworkspace' + # Deploy configuration name configuration='Release' -# Target name +# Scheme name # If your project have applicaiton target name 'YourApp', set this 'YourApp' -target='VisualJSON' +scheme='VisualJSON' # Application name # If your app name is not same to target name, change this. # If you set this 'MyApp', output is 'MyApp.app' and 'MyApp.pkg' -appname="$target" +appname="$scheme" # Codesign # You need '3rd Party Mac Developer Installer: Company Name' codesign to deploy your app to appstore -#codesign="3rd Party Mac Developer Installer" -codesign='3rd Party Mac Developer Installer: 3rddev Inc.' +codesign="3rd Party Mac Developer Installer"