[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[620] trunk
Brought to you by:
fredm
From: <fr...@us...> - 2009-09-05 10:44:55
|
Revision: 620 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=620&view=rev Author: fredm Date: 2009-09-05 10:44:44 +0000 (Sat, 05 Sep 2009) Log Message: ----------- Add x86_64 target to Universal Binary. This involves: * Drop competition mode RZX and libgcrypt - this is because the feature is rarely used and it is not trivial to make a x86_64 libgcrypt framework along with all the other targets, so I don't think it is worth the effort to retain. Will revisit if someone else makes a suitable framework. * Move to clang as the compiler for all libraries and plugins * Move to llvm-gcc42 as the compiler for Fuse * Switch to NSNumber rather than int where applicable * Move to 10.5 SDK as the target for all binaries * Add a macro to select the appropriate GINT_TO_POINTER/POINTER_TO_GINT implementation per target Modified Paths: -------------- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj trunk/FuseGenerator/libspectrum.h trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj trunk/FuseImporter/libspectrum.h trunk/README trunk/audiofile/audiofile.xcodeproj/project.pbxproj trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html trunk/fuse/settings.pl trunk/libspectrum/config.h trunk/libspectrum/libspectrum.h trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj Removed Paths: ------------- trunk/libgcrypt/ Property Changed: ---------------- trunk/FuseGenerator/FuseGenerator.xcodeproj/ trunk/FuseImporter/FuseImporter.xcodeproj/ trunk/audiofile/audiofile.xcodeproj/ Property changes on: trunk/FuseGenerator/FuseGenerator.xcodeproj ___________________________________________________________________ Modified: svn:ignore - *.pbxuser *.mode1v3 + *.pbxuser *.mode1v3 *.perspectivev3 Modified: trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj =================================================================== --- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2009-09-04 22:58:49 UTC (rev 619) +++ trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2009-09-05 10:44:44 UTC (rev 620) @@ -525,10 +525,10 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DEAD_CODE_STRIPPING = YES; GCC_C_LANGUAGE_STANDARD = c99; - GCC_VERSION = 4.2; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; Modified: trunk/FuseGenerator/libspectrum.h =================================================================== --- trunk/FuseGenerator/libspectrum.h 2009-09-04 22:58:49 UTC (rev 619) +++ trunk/FuseGenerator/libspectrum.h 2009-09-05 10:44:44 UTC (rev 620) @@ -200,8 +200,13 @@ #define g_array_index(a,t,i) (*(((t*)a->data)+i)) GArray* WIN32_DLL g_array_set_size( GArray *array, guint length ); +#if defined __x86_64__ || defined __ppc64__ +#define GINT_TO_POINTER(i) ((gpointer) (glong)(i)) +#define GPOINTER_TO_INT(p) ((gint) (glong)(p)) +#else #define GINT_TO_POINTER(i) ((gpointer) (i)) #define GPOINTER_TO_INT(p) ((gint) (p)) +#endif /* Library capabilities */ Property changes on: trunk/FuseImporter/FuseImporter.xcodeproj ___________________________________________________________________ Modified: svn:ignore - *.mode1 *.pbxuser + *.mode1 *.pbxuser *.perspectivev3 Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj =================================================================== --- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2009-09-04 22:58:49 UTC (rev 619) +++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2009-09-05 10:44:44 UTC (rev 620) @@ -545,34 +545,34 @@ B6B0E30108CC65D5001D8411 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DEBUG_INFORMATION_FORMAT = dwarf; - GCC_VERSION = 4.0; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Development; }; B6B0E30208CC65D5001D8411 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; - GCC_VERSION = 4.0; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Deployment; }; B6B0E30308CC65D5001D8411 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DEBUG_INFORMATION_FORMAT = dwarf; - GCC_VERSION = 4.0; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Default; }; Modified: trunk/FuseImporter/libspectrum.h =================================================================== --- trunk/FuseImporter/libspectrum.h 2009-09-04 22:58:49 UTC (rev 619) +++ trunk/FuseImporter/libspectrum.h 2009-09-05 10:44:44 UTC (rev 620) @@ -200,8 +200,13 @@ #define g_array_index(a,t,i) (*(((t*)a->data)+i)) GArray* WIN32_DLL g_array_set_size( GArray *array, guint length ); +#if defined __x86_64__ || defined __ppc64__ +#define GINT_TO_POINTER(i) ((gpointer) (glong)(i)) +#define GPOINTER_TO_INT(p) ((gint) (glong)(p)) +#else #define GINT_TO_POINTER(i) ((gpointer) (i)) #define GPOINTER_TO_INT(p) ((gint) (p)) +#endif /* Library capabilities */ Modified: trunk/README =================================================================== --- trunk/README 2009-09-04 22:58:49 UTC (rev 619) +++ trunk/README 2009-09-05 10:44:44 UTC (rev 620) @@ -21,9 +21,6 @@ cd audiofile xcodebuild -configuration Deployment cd .. -cd libgcrypt -xcodebuild -configuration Deployment -cd .. cd libspectrum xcodebuild -configuration Deployment cd .. Property changes on: trunk/audiofile/audiofile.xcodeproj ___________________________________________________________________ Modified: svn:ignore - *.mode1 *.pbxuser + *.mode1 *.pbxuser *.perspectivev3 Modified: trunk/audiofile/audiofile.xcodeproj/project.pbxproj =================================================================== --- trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2009-09-04 22:58:49 UTC (rev 619) +++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2009-09-05 10:44:44 UTC (rev 620) @@ -392,50 +392,48 @@ B62395480C1CF4F8003B8E87 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = NO; FRAMEWORK_VERSION = 0.2.6; - GCC_VERSION = 4.0; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Development; }; B62395490C1CF4F8003B8E87 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; FRAMEWORK_VERSION = 0.2.6; - GCC_VERSION = 4.0; - MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + MACOSX_DEPLOYMENT_TARGET = 10.5; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Deployment; }; B623954A0C1CF4F8003B8E87 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = NO; FRAMEWORK_VERSION = 0.2.6; - GCC_VERSION = 4.0; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Default; }; B62395BD0C1CF586003B8E87 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1.2; @@ -444,7 +442,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 2; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, NDEBUG, @@ -477,8 +474,6 @@ B62395BE0C1CF586003B8E87 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1.2; @@ -486,7 +481,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 2; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, NDEBUG, @@ -519,14 +513,11 @@ B62395BF0C1CF586003B8E87 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1.2; FRAMEWORK_VERSION = 0.2.6; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 2; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, NDEBUG, Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj =================================================================== --- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2009-09-04 22:58:49 UTC (rev 619) +++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2009-09-05 10:44:44 UTC (rev 620) @@ -29,7 +29,6 @@ B61F459D09121DF100C8096C /* tape_plus2a.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C4060765984000DE7E81 /* tape_plus2a.szx */; }; B61F459F09121DF100C8096C /* tape_scorpion.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C40A0765988200DE7E81 /* tape_scorpion.szx */; }; B61F45A209121DF100C8096C /* spectrum.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F541C04303963A9F01C2A5B9 /* spectrum.framework */; }; - B61F45A609121DF100C8096C /* gcrypt.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6BA1A8B04E4F3290017354F /* gcrypt.framework */; }; B61F45FF09121DF100C8096C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; B61F460009121DF100C8096C /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = F5F291060396932B01730B00 /* Credits.html */; }; B61F460109121DF100C8096C /* Debugger.nib in Resources */ = {isa = PBXBuildFile; fileRef = B62E1BC303E298B200A80002 /* Debugger.nib */; }; @@ -162,7 +161,6 @@ B61F469B09121DF100C8096C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; }; B61F469C09121DF100C8096C /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; }; B61F469D09121DF100C8096C /* spectrum.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F541C04303963A9F01C2A5B9 /* spectrum.framework */; }; - B61F46A109121DF100C8096C /* gcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BA1A8B04E4F3290017354F /* gcrypt.framework */; }; B61F46A409121DF100C8096C /* FuseImporter.mdimporter in CopyFiles */ = {isa = PBXBuildFile; fileRef = B64FEA96084F8EC300879389 /* FuseImporter.mdimporter */; }; B6251C3E0C2EB24500BD5543 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6251C3D0C2EB24500BD5543 /* QuartzCore.framework */; }; B62B19E10DD31DF500D42AAF /* scalers16.c in Sources */ = {isa = PBXBuildFile; fileRef = B62B19E00DD31DF500D42AAF /* scalers16.c */; }; @@ -296,7 +294,6 @@ files = ( B6FA75C60C1D76A5007F5A10 /* audiofile.framework in CopyFiles */, B61F45A209121DF100C8096C /* spectrum.framework in CopyFiles */, - B61F45A609121DF100C8096C /* gcrypt.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -488,7 +485,6 @@ B6B076B00B59FE9A00D4F95C /* Emulator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Emulator.h; sourceTree = "<group>"; }; B6B076B10B59FE9A00D4F95C /* Emulator.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Emulator.m; sourceTree = "<group>"; }; B6B99F890B5F798700EE408F /* cocoadisplay.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = cocoadisplay.m; sourceTree = "<group>"; }; - B6BA1A8B04E4F3290017354F /* gcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = gcrypt.framework; path = ../../libgcrypt/build/Deployment/gcrypt.framework; sourceTree = SOURCE_ROOT; }; B6BA1A9404E4F88F0017354F /* uijoystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = uijoystick.h; path = ../ui/uijoystick.h; sourceTree = SOURCE_ROOT; }; B6BA6F0207B1E04200E44C8D /* Preferences.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Preferences.nib; path = nibs/Preferences.nib; sourceTree = "<group>"; }; B6C3479F044B091100E1BBA7 /* ts2068.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ts2068.png; path = resources/ts2068.png; sourceTree = SOURCE_ROOT; }; @@ -662,7 +658,6 @@ B61F469B09121DF100C8096C /* Foundation.framework in Frameworks */, B61F469C09121DF100C8096C /* AppKit.framework in Frameworks */, B61F469D09121DF100C8096C /* spectrum.framework in Frameworks */, - B61F46A109121DF100C8096C /* gcrypt.framework in Frameworks */, B64E2A170A6534A3006863D9 /* Carbon.framework in Frameworks */, B6A6F0EE0B3D5F9E000B88E9 /* CoreAudio.framework in Frameworks */, B6A6F0F30B3D602F000B88E9 /* AudioUnit.framework in Frameworks */, @@ -696,7 +691,6 @@ isa = PBXGroup; children = ( B6FA759C0C1D7507007F5A10 /* audiofile.framework */, - B6BA1A8B04E4F3290017354F /* gcrypt.framework */, F541C04303963A9F01C2A5B9 /* spectrum.framework */, ); name = "Linked Frameworks"; @@ -1697,13 +1691,13 @@ B63319B4086803BA00732AA3 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; GCC_AUTO_VECTORIZATION = NO; GCC_DYNAMIC_NO_PIC = YES; - GCC_VERSION = 4.0; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; YACCFLAGS = "-d"; @@ -1715,14 +1709,14 @@ B63319B5086803BA00732AA3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; GCC_AUTO_VECTORIZATION = NO; GCC_DYNAMIC_NO_PIC = YES; - GCC_VERSION = 4.0; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; YACCFLAGS = "-d"; @@ -1734,13 +1728,13 @@ B63319B6086803BA00732AA3 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; GCC_AUTO_VECTORIZATION = NO; GCC_DYNAMIC_NO_PIC = YES; - GCC_VERSION = 4.0; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; YACCFLAGS = "-d"; Modified: trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib =================================================================== --- trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib 2009-09-04 22:58:49 UTC (rev 619) +++ trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib 2009-09-05 10:44:44 UTC (rev 620) @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9J61</string> - <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.46</string> - <string key="IBDocument.HIToolboxVersion">353.00</string> + <string key="IBDocument.SystemVersion">10A432</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1038</string> + <string key="IBDocument.HIToolboxVersion">437.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="NS.object.0">732</string> + </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="1347"/> <integer value="1446"/> <integer value="6"/> - <integer value="1347"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -18,7 +22,7 @@ </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys" id="0"> <bool key="EncodedWithXMLCoder">YES</bool> </object> <object class="NSMutableArray" key="dict.values"> @@ -56,7 +60,7 @@ <int key="NSToolbarSizeMode">1</int> <object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>1D3C684F-4B0A-4828-ADF3-E4106D08C1CD</string> <string>2C4BF74A-9900-4A0E-A2FC-50ADDA64B166</string> @@ -269,11 +273,9 @@ <reference ref="943816128"/> <reference ref="141636598"/> </object> - <object class="NSMutableArray" key="NSToolbarIBSelectableItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="NSToolbarIBSelectableItems" ref="0"/> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="41054612"> <reference key="NSNextResponder"/> @@ -283,7 +285,7 @@ </object> <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> <string key="NSMinSize">{213, 184}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> <string key="NSFrameAutosaveName"/> </object> <object class="NSCustomView" id="869768206"> @@ -303,7 +305,7 @@ <string key="NSContents">Confirm actions</string> <object class="NSFont" key="NSSupport" id="447006373"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> + <double key="NSSize">13</double> <int key="NSfFlags">1044</int> </object> <reference key="NSControlView" ref="382408068"/> @@ -483,7 +485,7 @@ <object class="NSNumberFormatter" key="NSFormatter" id="815687010"> <object class="NSMutableDictionary" key="NS.attributes"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>allowsFloats</string> <string>decimalSeparator</string> @@ -498,14 +500,14 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1" id="9"/> + <integer value="1"/> <string>.</string> <integer value="1000"/> <string>,</string> - <reference ref="9"/> - <reference ref="9"/> + <integer value="1"/> + <integer value="1"/> <string>-#,##0.00</string> - <integer value="3" id="11"/> + <integer value="3"/> <string>#,##0%</string> <boolean value="YES"/> </object> @@ -516,11 +518,9 @@ <nil key="NS.negativeattrs"/> <object class="NSAttributedString" key="NS.zero"> <string key="NSString">0</string> - <object class="NSDictionary" key="NSAttributes" id="625184385"> + <object class="NSDictionary" key="NSAttributes" id="833979005"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.sortedKeys" ref="0"/> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -531,9 +531,9 @@ </object> <object class="NSAttributedString" key="NS.nan"> <string key="NSString">NaN</string> - <reference key="NSAttributes" ref="625184385"/> + <reference key="NSAttributes" ref="833979005"/> </object> - <reference key="NS.min" ref="9"/> + <integer value="1" key="NS.min"/> <object class="NSDecimalNumberPlaceholder" key="NS.max" id="648108068"> <int key="NS.exponent">0</int> <int key="NS.length">0</int> @@ -550,12 +550,13 @@ <bool key="NS.allowsfloats">YES</bool> </object> <reference key="NSControlView" ref="418457192"/> - <double key="NSTitleWidth">1.610000e+02</double> + <double key="NSTitleWidth">161</double> <object class="NSCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">67108864</int> <string key="NSContents">Emulation speed:</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="418457192"/> </object> </object> <object class="NSFormCell" id="319020855"> @@ -565,39 +566,39 @@ <object class="NSNumberFormatter" key="NSFormatter" id="657991658"> <object class="NSMutableDictionary" key="NS.attributes"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>allowsFloats</string> <string>formatterBehavior</string> + <string>locale</string> <string>maximum</string> <string>minimum</string> <string>numberStyle</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="9"/> - <integer value="1040" id="736002568"/> - <real value="5.000000e+01" id="754928329"/> - <reference ref="9"/> - <integer value="0" id="8"/> + <integer value="1"/> + <integer value="1040"/> + <object class="NSLocale" id="514081757"> + <string key="NS.identifier"/> + </object> + <real value="50"/> + <integer value="1"/> + <integer value="0"/> </object> </object> <string key="NS.positiveformat">#</string> <string key="NS.negativeformat">#</string> <nil key="NS.positiveattrs"/> <nil key="NS.negativeattrs"/> - <object class="NSAttributedString" key="NS.zero"> - <nil key="NSString"/> - </object> - <object class="NSAttributedString" key="NS.nil"> - <nil key="NSString"/> - </object> + <nil key="NS.zero"/> + <nil key="NS.nil"/> <object class="NSAttributedString" key="NS.nan"> <string key="NSString">NaN</string> - <reference key="NSAttributes" ref="625184385"/> + <reference key="NSAttributes" ref="833979005"/> </object> - <reference key="NS.min" ref="9"/> - <reference key="NS.max" ref="754928329"/> + <integer value="1" key="NS.min"/> + <real value="50" key="NS.max"/> <object class="NSDecimalNumberHandler" key="NS.rounding"> <int key="NS.roundingmode">3</int> <bool key="NS.raise.overflow">YES</bool> @@ -607,17 +608,18 @@ <string key="NS.decimal">.</string> <string key="NS.thousand">,</string> <bool key="NS.hasthousands">NO</bool> - <bool key="NS.localized">YES</bool> + <bool key="NS.localized">NO</bool> <bool key="NS.allowsfloats">YES</bool> </object> + <reference key="NSControlView" ref="418457192"/> <int key="NSTag">1</int> - <reference key="NSControlView" ref="418457192"/> - <double key="NSTitleWidth">1.610000e+02</double> + <double key="NSTitleWidth">161</double> <object class="NSCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">67108864</int> <string key="NSContents">Screen refresh rate (1:n):</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="418457192"/> </object> </object> </object> @@ -630,7 +632,7 @@ <int key="NSCellFlags2">205521920</int> <string key="NSContents"/> <reference key="NSSupport" ref="447006373"/> - <double key="NSTitleWidth">1.610000e+02</double> + <double key="NSTitleWidth">161</double> <object class="NSCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">67108864</int> @@ -646,7 +648,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor" id="429360493"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> <object class="NSColor" key="NSCellBackgroundColor" id="70288484"> @@ -828,14 +830,14 @@ </object> <object class="NSFont" key="NSSupport" id="333640230"> <string key="NSName">Helvetica</string> - <double key="NSSize">1.200000e+01</double> + <double key="NSSize">12</double> <int key="NSfFlags">16</int> </object> <reference key="NSControlView" ref="524220653"/> - <double key="NSMaxValue">1.000000e+02</double> - <double key="NSMinValue">0.000000e+00</double> - <double key="NSValue">1.000000e+02</double> - <double key="NSAltIncValue">0.000000e+00</double> + <double key="NSMaxValue">100</double> + <double key="NSMinValue">0.0</double> + <double key="NSValue">100</double> + <double key="NSAltIncValue">0.0</double> <int key="NSNumberOfTickMarks">10</int> <int key="NSTickMarkPosition">0</int> <bool key="NSAllowsTickMarkValuesOnly">YES</bool> @@ -901,10 +903,10 @@ </object> <reference key="NSSupport" ref="333640230"/> <reference key="NSControlView" ref="1032556491"/> - <double key="NSMaxValue">1.000000e+02</double> - <double key="NSMinValue">0.000000e+00</double> - <double key="NSValue">1.000000e+02</double> - <double key="NSAltIncValue">0.000000e+00</double> + <double key="NSMaxValue">100</double> + <double key="NSMinValue">0.0</double> + <double key="NSValue">100</double> + <double key="NSAltIncValue">0.0</double> <int key="NSNumberOfTickMarks">10</int> <int key="NSTickMarkPosition">0</int> <bool key="NSAllowsTickMarkValuesOnly">YES</bool> @@ -1128,7 +1130,7 @@ <object class="NSMutableArray" key="NSCells"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSButtonCell" id="949804708"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags2">0</int> <string key="NSContents">None</string> <reference key="NSSupport" ref="447006373"/> @@ -1148,8 +1150,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">Interface I</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="833825163"/> <int key="NSTag">1</int> - <reference key="NSControlView" ref="833825163"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <reference key="NSAlternateImage" ref="32434582"/> @@ -1165,8 +1167,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">Simple 8-bit IDE</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="833825163"/> <int key="NSTag">2</int> - <reference key="NSControlView" ref="833825163"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <object class="NSImage" key="NSNormalImage"> @@ -1176,7 +1178,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1202,7 +1204,7 @@ AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> @@ -1222,8 +1224,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">ZXATASP interface</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="833825163"/> <int key="NSTag">3</int> - <reference key="NSControlView" ref="833825163"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <object class="NSImage" key="NSNormalImage"> @@ -1233,7 +1235,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1259,7 +1261,7 @@ AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> @@ -1276,8 +1278,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">ZXCF interface</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="833825163"/> <int key="NSTag">4</int> - <reference key="NSControlView" ref="833825163"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <object class="NSImage" key="NSNormalImage"> @@ -1287,7 +1289,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1313,7 +1315,7 @@ AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> @@ -1330,8 +1332,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">DivIDE</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="833825163"/> <int key="NSTag">5</int> - <reference key="NSControlView" ref="833825163"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <object class="NSImage" key="NSNormalImage"> @@ -1341,7 +1343,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1367,7 +1369,7 @@ AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9UABAAdABcANAAGYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsFNph5E4SJug5D71eq3yMqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -1436,8 +1438,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">+D</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="833825163"/> <int key="NSTag">6</int> - <reference key="NSControlView" ref="833825163"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <reference key="NSAlternateImage" ref="32434582"/> @@ -1451,8 +1453,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">Beta 128</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="833825163"/> <int key="NSTag">7</int> - <reference key="NSControlView" ref="833825163"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <reference key="NSAlternateImage" ref="32434582"/> @@ -1466,8 +1468,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">Opus Discovery</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="833825163"/> <int key="NSTag">8</int> - <reference key="NSControlView" ref="833825163"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">0</int> <object class="NSImage" key="NSNormalImage"> @@ -1477,7 +1479,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1503,7 +1505,7 @@ AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAA8kAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAPJGFw cGwCAAAAbW50clJHQiBYWVogB9gACwAIABYALwApYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsijokxhhXhf8T3nB/TjyUvQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -1599,7 +1601,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -1625,7 +1627,7 @@ AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAA8MAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAPDGFw cGwCAAAAbW50clJHQiBYWVogB9gAAQAKABIAGgAiYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsUwOvPlG1ySS6QFVbfQWioQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -1702,8 +1704,7 @@ <int key="NSPeriodicDelay">400</int> <int key="NSPeriodicInterval">75</int> </object> - <int key="NSSelectedRow">8</int> - <reference key="NSSelectedCell" ref="766217337"/> + <reference key="NSSelectedCell" ref="949804708"/> <reference key="NSBackgroundColor" ref="519317542"/> <reference key="NSCellBackgroundColor" ref="70288484"/> <reference key="NSFont" ref="447006373"/> @@ -1810,36 +1811,34 @@ <object class="NSNumberFormatter" key="NSFormatter" id="219085684"> <object class="NSMutableDictionary" key="NS.attributes"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>allowsFloats</string> <string>formatterBehavior</string> + <string>locale</string> <string>maximumIntegerDigits</string> <string>minimum</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="9"/> - <reference ref="736002568"/> - <reference ref="11"/> - <reference ref="8"/> + <integer value="1"/> + <integer value="1040"/> + <reference ref="514081757"/> + <integer value="3"/> + <integer value="0"/> </object> </object> <string key="NS.positiveformat">#</string> <string key="NS.negativeformat">#</string> <nil key="NS.positiveattrs"/> <nil key="NS.negativeattrs"/> - <object class="NSAttributedString" key="NS.zero"> - <nil key="NSString"/> - </object> - <object class="NSAttributedString" key="NS.nil"> - <nil key="NSString"/> - </object> + <nil key="NS.zero"/> + <nil key="NS.nil"/> <object class="NSAttributedString" key="NS.nan"> <string key="NSString">NaN</string> - <reference key="NSAttributes" ref="625184385"/> + <reference key="NSAttributes" ref="833979005"/> </object> - <reference key="NS.min" ref="8"/> + <integer value="0" key="NS.min"/> <reference key="NS.max" ref="648108068"/> <object class="NSDecimalNumberHandler" key="NS.rounding"> <int key="NS.roundingmode">3</int> @@ -1850,16 +1849,17 @@ <string key="NS.decimal">.</string> <string key="NS.thousand">,</string> <bool key="NS.hasthousands">NO</bool> - <bool key="NS.localized">YES</bool> + <bool key="NS.localized">NO</bool> <bool key="NS.allowsfloats">YES</bool> </object> <reference key="NSControlView" ref="566156961"/> - <double key="NSTitleWidth">1.220000e+02</double> + <double key="NSTitleWidth">122</double> <object class="NSCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">67108864</int> <string key="NSContents">MDR cartridge len:</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="566156961"/> </object> </object> </object> @@ -1872,7 +1872,7 @@ <int key="NSCellFlags2">205521920</int> <string key="NSContents"/> <reference key="NSSupport" ref="447006373"/> - <double key="NSTitleWidth">1.220000e+02</double> + <double key="NSTitleWidth">122</double> <object class="NSCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">67108864</int> @@ -1900,7 +1900,7 @@ <string key="NSContents">Mass storage</string> <object class="NSFont" key="NSSupport" id="26"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.100000e+01</double> + <double key="NSSize">11</double> <int key="NSfFlags">3100</int> </object> <object class="NSColor" key="NSBackgroundColor" id="553561812"> @@ -1942,13 +1942,13 @@ <int key="NSCellFlags2">137887744</int> <string key="NSContents">Choose...</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="816191277"/> <int key="NSTag">1</int> - <reference key="NSControlView" ref="816191277"/> <int key="NSButtonFlags">-2038284033</int> <int key="NSButtonFlags2">1</int> <object class="NSFont" key="NSAlternateImage" id="76913610"> <string key="NSName">Helvetica</string> - <double key="NSSize">1.300000e+01</double> + <double key="NSSize">13</double> <int key="NSfFlags">16</int> </object> <string key="NSAlternateContents"/> @@ -1998,12 +1998,13 @@ <string key="NSContents"/> <reference key="NSSupport" ref="447006373"/> <reference key="NSControlView" ref="158300595"/> - <double key="NSTitleWidth">1.310000e+02</double> + <double key="NSTitleWidth">131</double> <object class="NSCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">67108864</int> <string key="NSContents">Graphic Output File:</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="158300595"/> </object> </object> <object class="NSFormCell" id="700509585"> @@ -2011,14 +2012,15 @@ <int key="NSCellFlags2">205521920</int> <string key="NSContents"/> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="158300595"/> <int key="NSTag">1</int> - <reference key="NSControlView" ref="158300595"/> - <double key="NSTitleWidth">1.310000e+02</double> + <double key="NSTitleWidth">131</double> <object class="NSCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">67108864</int> <string key="NSContents">Text Output File:</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="158300595"/> </object> </object> </object> @@ -2031,7 +2033,7 @@ <int key="NSCellFlags2">205521920</int> <string key="NSContents"/> <reference key="NSSupport" ref="447006373"/> - <double key="NSTitleWidth">1.310000e+02</double> + <double key="NSTitleWidth">131</double> <object class="NSCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">67108864</int> @@ -2130,8 +2132,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">Fuller</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="159048013"/> <int key="NSTag">1</int> - <reference key="NSControlView" ref="159048013"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">128</int> <object class="NSImage" key="NSNormalImage"> @@ -2141,7 +2143,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -2167,10 +2169,10 @@ AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBs2U706y3Sst1fqit5+wYbUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA @@ -2236,8 +2238,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">Melodik</string> <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="159048013"/> <int key="NSTag">2</int> - <reference key="NSControlView" ref="159048013"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">128</int> <object class="NSImage" key="NSNormalImage"> @@ -2247,7 +2249,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -2273,7 +2275,7 @@ AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAA8kAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAPJGFw cGwCAAAAbW50clJHQiBYWVogB9gACwAIABYALwApYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsijokxhhXhf8T3nB/TjyUvQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -2369,7 +2371,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> + <integer value="0"/> <object class="NSBitmapImageRep"> <object class="NSData" key="NSTIFFRepresentation"> <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -2395,7 +2397,7 @@ AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> @@ -2443,36 +2445,16 @@ <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="76952719"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSButton" id="676399466"> - <reference key="NSNextResponder" ref="76952719"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{183, 70}, {145, 18}}</string> - <reference key="NSSuperview" ref="76952719"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="807308919"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Competition mode</string> - <reference key="NSSupport" ref="447006373"/> - <reference key="NSControlView" ref="676399466"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="529831564"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> <object class="NSButton" id="785777834"> <reference key="NSNextResponder" ref="76952719"/> <int key="NSvFlags">256</int> <string key="NSFrame">{{183, 90}, {145, 18}}</string> <reference key="NSSuperview" ref="76952719"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="825652056"> <int key="NSCellFlags">67239424</int> @@ -2489,102 +2471,12 @@ <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSForm" id="240510804"> - <reference key="NSNextResponder" ref="76952719"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{185, 42}, {256, 22}}</string> - <reference key="NSSuperview" ref="76952719"/> - <bool key="NSEnabled">YES</bool> - <int key="NSNumRows">1</int> - <int key="NSNumCols">1</int> - <object class="NSMutableArray" key="NSCells"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSFormCell" id="555787033"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">205521920</int> - <reference key="NSSupport" ref="447006373"/> - <object class="NSNumberFormatter" key="NSFormatter" id="781258197"> - <object class="NSMutableDictionary" key="NS.attributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>allowsFloats</string> - <string>formatterBehavior</string> - <string>minimum</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="9"/> - <reference ref="736002568"/> - <reference ref="8"/> - </object> - </object> - <string key="NS.positiveformat">#</string> - <string key="NS.negativeformat">#</string> - <nil key="NS.positiveattrs"/> - <nil key="NS.negativeattrs"/> - <object class="NSAttributedString" key="NS.zero"> - <nil key="NSString"/> - </object> - <object class="NSAttributedString" key="NS.nil"> - <nil key="NSString"/> - </object> - <object class="NSAttributedString" key="NS.nan"> - <string key="NSString">NaN</string> - <reference key="NSAttributes" ref="625184385"/> - </object> - <reference key="NS.min" ref="8"/> - <reference key="NS.max" ref="648108068"/> - <object class="NSDecimalNumberHandler" key="NS.rounding"> - <int key="NS.roundingmode">3</int> - <bool key="NS.raise.overflow">YES</bool> - <bool key="NS.raise.underflow">YES</bool> - <bool key="NS.raise.dividebyzero">YES</bool> - </object> - <string key="NS.decimal">.</string> - <string key="NS.thousand">,</string> - <bool key="NS.hasthousands">NO</bool> - <bool key="NS.localized">YES</bool> - <bool key="NS.allowsfloats">YES</bool> - </object> - <reference key="NSControlView" ref="240510804"/> - <double key="NSTitleWidth">1.210000e+02</double> - <object class="NSCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">67108864</int> - <string key="NSContents">Competition code:</string> - <reference key="NSSupport" ref="447006373"/> - </object> - </object> - </object> - <string key="NSCellSize">{256, 22}</string> - <string key="NSIntercellSpacing">{1, 8}</string> - <int key="NSMatrixFlags">67633152</int> - <string key="NSCellClass">NSActionCell</string> - <object class="NSFormCell" key="NSProtoCell" id="1016506225"> - <int key="NSCellFlags">343014976</int> - <int key="NSCellFlags2">205521920</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="447006373"/> - <double key="NSTitleWidth">1.210000e+02</double> - <object class="NSCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">67108864</int> - <string key="NSContents">Field:</string> - <reference key="NSSupport" ref="447006373"/> - </object> - </object> - <int key="NSSelectedRow">-1</int> - <int key="NSSelectedCol">-1</int> - <reference key="NSBackgroundColor" ref="519317542"/> - <reference key="NSCellBackgroundColor" ref="70288484"/> - <reference key="NSFont" ref="447006373"/> - </object> <object class="NSButton" id="742175854"> <reference key="NSNextResponder" ref="76952719"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{183, 18}, {175, 18}}</string> + <string key="NSFrame">{{183, 70}, {175, 18}}</string> <reference key="NSSuperview" ref="76952719"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="167661398"> <int ... [truncated message content] |