Frameworks/JSON.framework/Headers Frameworks/JSON.framework/JSON Frameworks/JSON.framework/PrivateHeaders Frameworks/JSON.framework/Resources Frameworks/JSON.framework/Versions/A/Headers/JSON.h Frameworks/JSON.framework/Versions/A/Headers/SBJsonParser.h Frameworks/JSON.framework/Versions/A/Headers/SBJsonWriter.h Frameworks/JSON.framework/Versions/A/JSON Frameworks/JSON.framework/Versions/A/PrivateHeaders/NSObject+SBJSON.h Frameworks/JSON.framework/Versions/A/PrivateHeaders/NSString+SBJSON.h Frameworks/JSON.framework/Versions/A/PrivateHeaders/SBJSON.h Frameworks/JSON.framework/Versions/A/Resources/Info.plist Frameworks/JSON.framework/Versions/Current LICENSE README.markdown Source/NSInvocationAdditions.h Source/NSInvocationAdditions.m @@ -10,11 +10,10 @@ 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - A10333520E32CD1800230ABD /* PFLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = A10333510E32CD1800230ABD /* PFLogging.m */; }; A10333550E32CD2200230ABD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A10333540E32CD2200230ABD /* AppDelegate.m */; }; A10333720E32D0CC00230ABD /* BasicTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A10333710E32D0CC00230ABD /* BasicTests.m */; }; - A11DC5020E3CD31A009DA8A8 /* NSInvocationAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = A11DC5000E3CD31A009DA8A8 /* NSInvocationAdditions.h */; }; - A11DC5030E3CD31A009DA8A8 /* NSInvocationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A11DC5010E3CD31A009DA8A8 /* NSInvocationAdditions.m */; }; + A10769A30F8D5B1900BA3DAE /* NSInvocationAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = A10769A10F8D5B1900BA3DAE /* NSInvocationAdditions.h */; }; + A10769A40F8D5B1900BA3DAE /* NSInvocationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A10769A20F8D5B1900BA3DAE /* NSInvocationAdditions.m */; }; A11DC72B0E3D23CD009DA8A8 /* PFProduct.h in Headers */ = {isa = PBXBuildFile; fileRef = A11DC7290E3D23CD009DA8A8 /* PFProduct.h */; settings = {ATTRIBUTES = (Public, ); }; }; A11DC72C0E3D23CD009DA8A8 /* PFProduct.m in Sources */ = {isa = PBXBuildFile; fileRef = A11DC72A0E3D23CD009DA8A8 /* PFProduct.m */; }; A154EF7E0E3BE8EA002973AE /* PotionStorefront.framework in Copy Framework */ = {isa = PBXBuildFile; fileRef = A154EF750E3BE81F002973AE /* PotionStorefront.framework */; }; @@ -39,9 +38,9 @@ A154F1460E3C1B70002973AE /* PFAddress.h in Headers */ = {isa = PBXBuildFile; fileRef = A154F1440E3C1B70002973AE /* PFAddress.h */; settings = {ATTRIBUTES = (Public, ); }; }; A154F1470E3C1B70002973AE /* PFAddress.m in Sources */ = {isa = PBXBuildFile; fileRef = A154F1450E3C1B70002973AE /* PFAddress.m */; }; A154F1690E3C1D6D002973AE /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A154F1680E3C1D6D002973AE /* AddressBook.framework */; }; - A154F2440E3C37AE002973AE /* PFLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = A10333510E32CD1800230ABD /* PFLogging.m */; }; - A16B8EDE0E3D415C00B1C248 /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A16B8EDD0E3D415C00B1C248 /* JSON.framework */; }; - A16B8F170E3D479400B1C248 /* JSON.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = A16B8EDD0E3D415C00B1C248 /* JSON.framework */; }; + A157E86A0F942DE800FD0CD7 /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A157E8690F942DE800FD0CD7 /* JSON.framework */; }; + A157E8840F942E6000FD0CD7 /* JSON.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = A157E8690F942DE800FD0CD7 /* JSON.framework */; }; + A15EC4FD0F9592AD0074DCFC /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = A15EC4FC0F9592AD0074DCFC /* LICENSE */; }; A16B90340E3D787500B1C248 /* PFCollectionRow.h in Headers */ = {isa = PBXBuildFile; fileRef = A16B90320E3D787500B1C248 /* PFCollectionRow.h */; }; A16B90350E3D787500B1C248 /* PFCollectionRow.m in Sources */ = {isa = PBXBuildFile; fileRef = A16B90330E3D787500B1C248 /* PFCollectionRow.m */; }; A1A11E7D0E3EE5D700F0C6E4 /* PFLockImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = A1A11E7B0E3EE5D700F0C6E4 /* PFLockImageView.h */; }; @@ -84,7 +83,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - A16B8F170E3D479400B1C248 /* JSON.framework in Copy Frameworks */, + A157E8840F942E6000FD0CD7 /* JSON.framework in Copy Frameworks */, ); name = "Copy Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -102,18 +101,14 @@ 32CA4F630368D1EE00C91783 /* PotionStorefront_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PotionStorefront_Prefix.pch; sourceTree = "<group>"; }; 8D1107310486CEB800E47090 /* TestApp-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TestApp-Info.plist"; sourceTree = "<group>"; }; 8D1107320486CEB800E47090 /* TestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; - A103334E0E32CD1800230ABD /* PFKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PFKit.h; path = Sources/PFKit.h; sourceTree = "<group>"; }; - A103334F0E32CD1800230ABD /* PFMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PFMacros.h; path = Sources/PFMacros.h; sourceTree = "<group>"; }; - A10333500E32CD1800230ABD /* PFLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PFLogging.h; path = Sources/PFLogging.h; sourceTree = "<group>"; }; - A10333510E32CD1800230ABD /* PFLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PFLogging.m; path = Sources/PFLogging.m; sourceTree = "<group>"; }; A10333530E32CD2200230ABD /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; A10333540E32CD2200230ABD /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; A10333670E32CEF800230ABD /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; A10333680E32CEF800230ABD /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; }; A10333700E32D0CC00230ABD /* BasicTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BasicTests.h; sourceTree = "<group>"; }; A10333710E32D0CC00230ABD /* BasicTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BasicTests.m; sourceTree = "<group>"; }; - A11DC5000E3CD31A009DA8A8 /* NSInvocationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSInvocationAdditions.h; path = ../../PFKit/Sources/NSInvocationAdditions.h; sourceTree = "<group>"; }; - A11DC5010E3CD31A009DA8A8 /* NSInvocationAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSInvocationAdditions.m; path = ../../PFKit/Sources/NSInvocationAdditions.m; sourceTree = "<group>"; }; + A10769A10F8D5B1900BA3DAE /* NSInvocationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSInvocationAdditions.h; sourceTree = "<group>"; }; + A10769A20F8D5B1900BA3DAE /* NSInvocationAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSInvocationAdditions.m; sourceTree = "<group>"; }; A11DC7290E3D23CD009DA8A8 /* PFProduct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFProduct.h; sourceTree = "<group>"; }; A11DC72A0E3D23CD009DA8A8 /* PFProduct.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFProduct.m; sourceTree = "<group>"; }; A154EF750E3BE81F002973AE /* PotionStorefront.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PotionStorefront.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -138,7 +133,9 @@ A154F1440E3C1B70002973AE /* PFAddress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFAddress.h; sourceTree = "<group>"; }; A154F1450E3C1B70002973AE /* PFAddress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFAddress.m; sourceTree = "<group>"; }; A154F1680E3C1D6D002973AE /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = /System/Library/Frameworks/AddressBook.framework; sourceTree = "<absolute>"; }; - A16B8EDD0E3D415C00B1C248 /* JSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JSON.framework; path = ../3rdParty/JSON/build/Release/JSON.framework; sourceTree = SOURCE_ROOT; }; + A157E8690F942DE800FD0CD7 /* JSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JSON.framework; path = Frameworks/JSON.framework; sourceTree = "<group>"; }; + A15EC4F90F958A440074DCFC /* README.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.markdown; sourceTree = "<group>"; }; + A15EC4FC0F9592AD0074DCFC /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; }; A16B90320E3D787500B1C248 /* PFCollectionRow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFCollectionRow.h; sourceTree = "<group>"; }; A16B90330E3D787500B1C248 /* PFCollectionRow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFCollectionRow.m; sourceTree = "<group>"; }; A1A11E7B0E3EE5D700F0C6E4 /* PFLockImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFLockImageView.h; sourceTree = "<group>"; }; @@ -168,8 +165,8 @@ buildActionMask = 2147483647; files = ( A154F1690E3C1D6D002973AE /* AddressBook.framework in Frameworks */, - A16B8EDE0E3D415C00B1C248 /* JSON.framework in Frameworks */, A1A11EB80E3EF7E700F0C6E4 /* QuartzCore.framework in Frameworks */, + A157E86A0F942DE800FD0CD7 /* JSON.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -189,8 +186,8 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( + A157E8690F942DE800FD0CD7 /* JSON.framework */, A1A11EB70E3EF7E700F0C6E4 /* QuartzCore.framework */, - A16B8EDD0E3D415C00B1C248 /* JSON.framework */, A154F1680E3C1D6D002973AE /* AddressBook.framework */, 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, ); @@ -220,11 +217,12 @@ 29B97314FDCFA39411CA2CEA /* PotionStorefront */ = { isa = PBXGroup; children = ( + A15EC4F90F958A440074DCFC /* README.markdown */, + A15EC4FC0F9592AD0074DCFC /* LICENSE */, A154EF800E3BE916002973AE /* Framework Code */, 080E96DDFE201D6D7F000001 /* Test App */, A103336F0E32D0A100230ABD /* Tests */, 29B97315FDCFA39411CA2CEA /* Other Sources */, - A103334D0E32CD1800230ABD /* PFKit */, 29B97317FDCFA39411CA2CEA /* Resources */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, @@ -266,18 +264,6 @@ name = Frameworks; sourceTree = "<group>"; }; - A103334D0E32CD1800230ABD /* PFKit */ = { - isa = PBXGroup; - children = ( - A103334E0E32CD1800230ABD /* PFKit.h */, - A103334F0E32CD1800230ABD /* PFMacros.h */, - A10333500E32CD1800230ABD /* PFLogging.h */, - A10333510E32CD1800230ABD /* PFLogging.m */, - ); - name = PFKit; - path = ../../Code/PFKit; - sourceTree = SOURCE_ROOT; - }; A103336F0E32D0A100230ABD /* Tests */ = { isa = PBXGroup; children = ( @@ -346,8 +332,8 @@ A1A11E390E3EDB7E00F0C6E4 /* Additions */ = { isa = PBXGroup; children = ( - A11DC5000E3CD31A009DA8A8 /* NSInvocationAdditions.h */, - A11DC5010E3CD31A009DA8A8 /* NSInvocationAdditions.m */, + A10769A10F8D5B1900BA3DAE /* NSInvocationAdditions.h */, + A10769A20F8D5B1900BA3DAE /* NSInvocationAdditions.m */, ); name = Additions; sourceTree = "<group>"; @@ -365,10 +351,10 @@ A154F0C10E3C0F1F002973AE /* PFBackgroundView.h in Headers */, A154F12D0E3C19E1002973AE /* PFOrder.h in Headers */, A154F1460E3C1B70002973AE /* PFAddress.h in Headers */, - A11DC5020E3CD31A009DA8A8 /* NSInvocationAdditions.h in Headers */, A11DC72B0E3D23CD009DA8A8 /* PFProduct.h in Headers */, A16B90340E3D787500B1C248 /* PFCollectionRow.h in Headers */, A1A11E7D0E3EE5D700F0C6E4 /* PFLockImageView.h in Headers */, + A10769A30F8D5B1900BA3DAE /* NSInvocationAdditions.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -458,6 +444,7 @@ buildActionMask = 2147483647; files = ( 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, + A15EC4FD0F9592AD0074DCFC /* LICENSE in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -506,7 +493,6 @@ buildActionMask = 2147483647; files = ( 8D11072D0486CEB800E47090 /* main.m in Sources */, - A10333520E32CD1800230ABD /* PFLogging.m in Sources */, A10333550E32CD2200230ABD /* AppDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -529,11 +515,10 @@ A154F0C20E3C0F1F002973AE /* PFBackgroundView.m in Sources */, A154F12E0E3C19E1002973AE /* PFOrder.m in Sources */, A154F1470E3C1B70002973AE /* PFAddress.m in Sources */, - A154F2440E3C37AE002973AE /* PFLogging.m in Sources */, - A11DC5030E3CD31A009DA8A8 /* NSInvocationAdditions.m in Sources */, A11DC72C0E3D23CD009DA8A8 /* PFProduct.m in Sources */, A16B90350E3D787500B1C248 /* PFCollectionRow.m in Sources */, A1A11E7E0E3EE5D700F0C6E4 /* PFLockImageView.m in Sources */, + A10769A40F8D5B1900BA3DAE /* NSInvocationAdditions.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -652,6 +637,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../3rdParty/JSON/build/Release\"", + "\"$(SRCROOT)/Frameworks/JSON/build/Release\"", ); FRAMEWORK_VERSION = A; GCC_DYNAMIC_NO_PIC = NO; @@ -685,6 +671,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../3rdParty/JSON/build/Release\"", + "\"$(SRCROOT)/Frameworks/JSON/build/Release\"", ); FRAMEWORK_VERSION = A; GCC_ENABLE_FIX_AND_CONTINUE = NO; PotionStorefront.xcodeproj/project.pbxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9E17</string> - <string key="IBDocument.InterfaceBuilderVersion">670</string> - <string key="IBDocument.AppKitVersion">949.33</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.SystemVersion">9G55</string> + <string key="IBDocument.InterfaceBuilderVersion">677</string> + <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="57"/> @@ -16,6 +16,15 @@ <string>com.apple.InterfaceBuilderKit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> <object class="NSMutableArray" key="IBDocument.RootObjects" id="1048"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSCustomObject" id="1021"> @@ -1126,7 +1135,7 @@ <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Buy</string> - <object class="NSFont" key="NSSupport" id="319283956"> + <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> <double key="NSSize">1.300000e+01</double> <int key="NSfFlags">1044</int> @@ -1140,26 +1149,6 @@ <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSButton" id="1043214211"> - <reference key="NSNextResponder" ref="439893737"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{184, 118}, {118, 32}}</string> - <reference key="NSSuperview" ref="439893737"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="137018684"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Unload</string> - <reference key="NSSupport" ref="319283956"/> - <reference key="NSControlView" ref="1043214211"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> </object> <string key="NSFrameSize">{480, 360}</string> <reference key="NSSuperview"/> @@ -1730,14 +1719,6 @@ </object> <int key="connectionID">455</int> </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">unload:</string> - <reference key="source" ref="759585468"/> - <reference key="destination" ref="1043214211"/> - </object> - <int key="connectionID">458</int> - </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -2325,7 +2306,6 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="671052403"/> - <reference ref="1043214211"/> </object> <reference key="parent" ref="972006081"/> </object> @@ -2658,20 +2638,6 @@ <reference key="object" ref="822453205"/> <reference key="parent" ref="671052403"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">456</int> - <reference key="object" ref="1043214211"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="137018684"/> - </object> - <reference key="parent" ref="439893737"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">457</int> - <reference key="object" ref="137018684"/> - <reference key="parent" ref="1043214211"/> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -2811,7 +2777,6 @@ <string>354.IBPluginDependency</string> <string>354.ImportedFromIB2</string> <string>371.IBEditorWindowLastContentRect</string> - <string>371.IBPluginDependency</string> <string>371.IBWindowTemplateEditedContentRect</string> <string>371.NSWindowTemplate.visibleAtLaunch</string> <string>371.editorWindowContentRectSynchronizationRect</string> @@ -2864,11 +2829,10 @@ <string>417.IBPluginDependency</string> <string>418.IBPluginDependency</string> <string>419.IBPluginDependency</string> + <string>420.IBPluginDependency</string> <string>450.IBPluginDependency</string> <string>452.IBPluginDependency</string> <string>453.IBPluginDependency</string> - <string>456.IBPluginDependency</string> - <string>457.IBPluginDependency</string> <string>5.IBPluginDependency</string> <string>5.ImportedFromIB2</string> <string>56.IBPluginDependency</string> @@ -3040,7 +3004,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{739, 408}, {480, 360}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{739, 408}, {480, 360}}</string> <reference ref="9"/> <string>{{33, 99}, {480, 360}}</string> @@ -3098,7 +3061,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> @@ -3196,13 +3158,24 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/PotionStoreFront.h</string> + <string key="minorKey">Source/PFProduct.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">showRegistrationWindow:</string> + <string key="NS.object.0">id</string> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/PotionStorefront.h</string> </object> </object> </object> </object> <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.LastKnownRelativeProjectPath">../../PotionStoreFront.xcodeproj</string> + <string key="IBDocument.LastKnownRelativeProjectPath">../../PotionStorefront.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> </data> </archive> Resources/English.lproj/MainMenu.xib @@ -12,21 +12,6 @@ @implementation AppDelegate -+ (void)load -{ -// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loaded:) name:NSBundleDidLoadNotification object:nil]; -} - -- (void)applicationDidFinishLaunching:(NSNotification *)aNotification -{ -// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loaded:) name:NSBundleDidLoadNotification object:nil]; -} - -+ (void)loaded:(NSNotification *)notification -{ -// NSLog(@"loaded bundle: %@", [notification userInfo]); -} - - (IBAction)buy:(id)sender { [[PotionStorefront sharedStorefront] setDelegate:self]; @@ -36,12 +21,4 @@ [[PotionStorefront sharedStorefront] beginSheetModalForWindow:mainWindow]; } -- (IBAction)unload:(id)sender -{ -// if ([[NSBundle bundleWithIdentifier:@"com.potionfactory.PotionStorefront"] unload]) -// NSLog(@"unloaded"); -// else -// NSLog(@"did not unload"); -} - @end Source/AppDelegate.m @@ -101,34 +101,34 @@ #pragma mark Accessors - (NSString *)firstName { return firstName; } -- (void)setFirstName:(NSString *)value { if (firstName != value) { [firstName release]; firstName = [[value stringByTrimming] copy]; } } +- (void)setFirstName:(NSString *)value { if (firstName != value) { [firstName release]; firstName = [[value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] copy]; } } - (NSString *)lastName { return lastName; } -- (void)setLastName:(NSString *)value { if (lastName != value) { [lastName release]; lastName = [[value stringByTrimming] copy]; } } +- (void)setLastName:(NSString *)value { if (lastName != value) { [lastName release]; lastName = [[value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] copy]; } } - (NSString *)company { return company; } -- (void)setCompany:(NSString *)value { if (company != value) { [company release]; company = [[value stringByTrimming] copy]; } } +- (void)setCompany:(NSString *)value { if (company != value) { [company release]; company = [[value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] copy]; } } - (NSString *)address1 { return address1; } -- (void)setAddress1:(NSString *)value { if (address1 != value) { [address1 release]; address1 = [[value stringByTrimming] copy]; } } +- (void)setAddress1:(NSString *)value { if (address1 != value) { [address1 release]; address1 = [[value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] copy]; } } - (NSString *)address2 { return address2; } -- (void)setAddress2:(NSString *)value { if (address2 != value) { [address2 release]; address2 = [[value stringByTrimming] copy]; } } +- (void)setAddress2:(NSString *)value { if (address2 != value) { [address2 release]; address2 = [[value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] copy]; } } - (NSString *)city { return city; } -- (void)setCity:(NSString *)value { if (city != value) { [city release]; city = [[value stringByTrimming] copy]; } } +- (void)setCity:(NSString *)value { if (city != value) { [city release]; city = [[value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] copy]; } } - (NSString *)state { return state; } -- (void)setState:(NSString *)value { if (state != value) { [state release]; state = [[value stringByTrimming] copy]; } } +- (void)setState:(NSString *)value { if (state != value) { [state release]; state = [[value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] copy]; } } - (NSString *)zipcode { return zipcode; } -- (void)setZipcode:(NSString *)value { if (zipcode != value) { [zipcode release]; zipcode = [[value stringByTrimming] copy]; } } +- (void)setZipcode:(NSString *)value { if (zipcode != value) { [zipcode release]; zipcode = [[value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] copy]; } } - (NSString *)countryCode { return countryCode; } - (void)setCountryCode:(NSString *)value { if (countryCode != value) { [countryCode release]; countryCode = [value copy]; } } - (NSString *)email { return email; } -- (void)setEmail:(NSString *)value { if (email != value) { [email release]; email = [[value stringByTrimming] copy]; } } +- (void)setEmail:(NSString *)value { if (email != value) { [email release]; email = [[value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] copy]; } } #pragma mark - #pragma mark Validation @@ -136,37 +136,37 @@ - (BOOL)validateFirstName:(id *)value error:(NSError **)outError { if (outError) *outError = nil; - return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] != 0; + return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length] != 0; } - (BOOL)validateLastName:(id *)value error:(NSError **)outError { if (outError) *outError = nil; - return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] != 0; + return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length] != 0; } - (BOOL)validateAddress1:(id *)value error:(NSError **)outError { if (outError) *outError = nil; - return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] != 0; + return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length] != 0; } - (BOOL)validateCity:(id *)value error:(NSError **)outError { if (outError) *outError = nil; - return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] != 0; + return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length] != 0; } - (BOOL)validateState:(id *)value error:(NSError **)outError { if (outError) *outError = nil; - return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] != 0; + return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length] != 0; } - (BOOL)validateZipcode:(id *)value error:(NSError **)outError { if (outError) *outError = nil; - return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] != 0; + return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length] != 0; } - (BOOL)validateEmail:(id *)value error:(NSError **)outError @@ -175,7 +175,7 @@ // Passes validation when value is a string, at least 5 letters long, and has a '@' and a '.' if (outError) *outError = nil; if ([*value isKindOfClass:[NSString class]] == NO) return NO; - NSString *string = [*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; + NSString *string = [*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; BOOL isEmail = (([string length] >= 5) && ([string rangeOfString:@"@"].location != NSNotFound) && ([string rangeOfString:@"."].location != NSNotFound)); Source/PFAddress.m @@ -198,7 +198,7 @@ fail: for (PFProduct *myitem in lineItems) { for (NSDictionary *dict in [responseOrder objectForKey:@"line_items"]) { if ([[dict objectForKey:@"product_id"] isEqual:[myitem identifierNumber]]) { - PFAssert([myitem checked], @"Only purchased items should be getting license keys"); + NSAssert([myitem checked], @"Only purchased items should be getting license keys"); [myitem setLicenseKey:[dict objectForKey:@"license_key"]]; licensedCount += 1; } @@ -427,7 +427,7 @@ fail: - (BOOL)validateCreditCardSecurityCode:(id *)value error:(NSError **)outError { if (outError) *outError = nil; - return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] != 0; + return [[*value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length] != 0; } - (BOOL)validateCreditCardExpiration:(NSError **)outError Source/PFOrder.m @@ -4,5 +4,4 @@ #ifdef __OBJC__ #import <Cocoa/Cocoa.h> - #import "PFKit.h" #endif Source/PotionStorefront_Prefix.pch 854b4a3960ace23c6809838207c682129e698020 Andy Kim andy@potionfactory.com http://github.com/potionfactory/potionstorefront/commit/8dc25a0ef6e950a8938913fccfa3bfb1b223fd54 8dc25a0ef6e950a8938913fccfa3bfb1b223fd54

2009-04-14T21:11:13-07:00

Getting ready for a public release d1cb73656eb9d35040347b2e61018ec2d0a1f224 Andy Kim andy@potionfactory.com