[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[626] branches/fuse_corevideo
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[626] branches/fuse_corevideo
|
From: <fr...@us...> - 2009-09-07 11:22:32
|
Revision: 626
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=626&view=rev
Author: fredm
Date: 2009-09-07 11:22:22 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
Merge revisions 614-623 from trunk.
Modified Paths:
--------------
branches/fuse_corevideo/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
branches/fuse_corevideo/FuseGenerator/GeneratePreviewForURL.m
branches/fuse_corevideo/FuseGenerator/GenerateThumbnailForURL.m
branches/fuse_corevideo/FuseGenerator/JWSpectrumScreen/AttributeManager.c
branches/fuse_corevideo/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.m
branches/fuse_corevideo/FuseGenerator/generate.pl
branches/fuse_corevideo/FuseGenerator/libspectrum.h
branches/fuse_corevideo/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
branches/fuse_corevideo/FuseImporter/generate.pl
branches/fuse_corevideo/FuseImporter/libspectrum.h
branches/fuse_corevideo/README
branches/fuse_corevideo/audiofile/audiofile.xcodeproj/project.pbxproj
branches/fuse_corevideo/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
branches/fuse_corevideo/fuse/fusepb/FuseMenus.m
branches/fuse_corevideo/fuse/fusepb/controllers/FuseController.m
branches/fuse_corevideo/fuse/fusepb/controllers/PokeFinderController.m
branches/fuse_corevideo/fuse/fusepb/controllers/PreferencesController.m
branches/fuse_corevideo/fuse/fusepb/controllers/SaveBinaryController.m
branches/fuse_corevideo/fuse/fusepb/nibs/Preferences.nib/designable.nib
branches/fuse_corevideo/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
branches/fuse_corevideo/fuse/fusepb/resources/Fuse Help/html/preferences.html
branches/fuse_corevideo/fuse/fusepb/transformers/MachineScalerIsEnabled.m
branches/fuse_corevideo/fuse/fusepb/views/DisplayOpenGLView.m
branches/fuse_corevideo/fuse/fusepb/views/Texture.m
branches/fuse_corevideo/fuse/settings.pl
branches/fuse_corevideo/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.c
branches/fuse_corevideo/fuse/ui/cocoa/cocoadisplay.m
branches/fuse_corevideo/fuse/ui/cocoa/cocoascreenshot.m
branches/fuse_corevideo/libspectrum/config.h
branches/fuse_corevideo/libspectrum/generate.pl
branches/fuse_corevideo/libspectrum/libspectrum.h
branches/fuse_corevideo/libspectrum/libspectrum.xcodeproj/project.pbxproj
Removed Paths:
-------------
branches/fuse_corevideo/libgcrypt/
Property Changed:
----------------
branches/fuse_corevideo/
branches/fuse_corevideo/FuseGenerator/FuseGenerator.xcodeproj/
branches/fuse_corevideo/FuseImporter/FuseImporter.xcodeproj/
branches/fuse_corevideo/audiofile/audiofile.xcodeproj/
branches/fuse_corevideo/fuse/
branches/fuse_corevideo/libspectrum/libspectrum/
branches/fuse_corevideo/libspectrum/libspectrum.h
Property changes on: branches/fuse_corevideo
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk:614-623
Property changes on: branches/fuse_corevideo/FuseGenerator/FuseGenerator.xcodeproj
___________________________________________________________________
Modified: svn:ignore
- *.pbxuser
*.mode1v3
+ *.pbxuser
*.mode1v3
*.perspectivev3
Modified: branches/fuse_corevideo/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
===================================================================
--- branches/fuse_corevideo/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2009-09-07 11:22:22 UTC (rev 626)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 44;
+ objectVersion = 45;
objects = {
/* Begin PBXBuildFile section */
@@ -357,7 +357,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "FuseGenerator" */;
- compatibilityVersion = "Xcode 3.0";
+ compatibilityVersion = "Xcode 3.1";
hasScannedForEncodings = 1;
mainGroup = 089C166AFE841209C02AAC07 /* FuseGenerator */;
projectDirPath = "";
@@ -509,30 +509,29 @@
2CA326230896AD4900168862 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
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;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ SDKROOT = macosx10.5;
};
name = Debug;
};
2CA326240896AD4900168862 /* Release */ = {
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 = "$(ARCHS_STANDARD_32_64_BIT)";
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;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ SDKROOT = macosx10.5;
};
name = Release;
};
Modified: branches/fuse_corevideo/FuseGenerator/GeneratePreviewForURL.m
===================================================================
--- branches/fuse_corevideo/FuseGenerator/GeneratePreviewForURL.m 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/FuseGenerator/GeneratePreviewForURL.m 2009-09-07 11:22:22 UTC (rev 626)
@@ -89,6 +89,8 @@
QLPreviewRequestFlushContext(preview, cgContext);
CFRelease(cgContext);
}
+
+ [imageRep release];
}
break;
case TYPE_IMAGEIO:
Modified: branches/fuse_corevideo/FuseGenerator/GenerateThumbnailForURL.m
===================================================================
--- branches/fuse_corevideo/FuseGenerator/GenerateThumbnailForURL.m 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/FuseGenerator/GenerateThumbnailForURL.m 2009-09-07 11:22:22 UTC (rev 626)
@@ -81,6 +81,8 @@
QLThumbnailRequestFlushContext( thumbnail, cgContext );
CFRelease( cgContext );
}
+
+ [imageRep release];
}
break;
case TYPE_IMAGEIO:
Modified: branches/fuse_corevideo/FuseGenerator/JWSpectrumScreen/AttributeManager.c
===================================================================
--- branches/fuse_corevideo/FuseGenerator/JWSpectrumScreen/AttributeManager.c 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/FuseGenerator/JWSpectrumScreen/AttributeManager.c 2009-09-07 11:22:22 UTC (rev 626)
@@ -9,7 +9,6 @@
#include <assert.h>
#include <string.h>
-#include <ppc_intrinsics.h>
#include "AttributeManager.h"
#include "Colourmacros.h"
Modified: branches/fuse_corevideo/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.m
===================================================================
--- branches/fuse_corevideo/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.m 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.m 2009-09-07 11:22:22 UTC (rev 626)
@@ -167,7 +167,7 @@
- (NSBitmapImageRep*)imageRep
{
- NSBitmapImageRep* imageRep = [[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:0
+ NSBitmapImageRep* imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:0
pixelsWide:canvasSize.width
pixelsHigh:canvasSize.height
bitsPerSample:8
@@ -176,7 +176,7 @@
isPlanar:NO
colorSpaceName:NSDeviceRGBColorSpace
bytesPerRow:canvasSize.width * 3
- bitsPerPixel:24] autorelease];
+ bitsPerPixel:24];
if(imageRep) {
unsigned char* imageBytes = [imageRep bitmapData];
Modified: branches/fuse_corevideo/FuseGenerator/generate.pl
===================================================================
--- branches/fuse_corevideo/FuseGenerator/generate.pl 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/FuseGenerator/generate.pl 2009-09-07 11:22:22 UTC (rev 626)
@@ -141,8 +141,15 @@
#define g_array_index(a,t,i) (*(((t*)a->data)+i))
GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
+#include <TargetConditionals.h>
+
+#ifdef TARGET_RT_64_BIT
+#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
CODE
}
Modified: branches/fuse_corevideo/FuseGenerator/libspectrum.h
===================================================================
--- branches/fuse_corevideo/FuseGenerator/libspectrum.h 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/FuseGenerator/libspectrum.h 2009-09-07 11:22:22 UTC (rev 626)
@@ -38,6 +38,8 @@
#include <stdlib.h>
#include <stdio.h>
+#include <TargetConditionals.h>
+
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN /* Exclude rarely used stuff from Windows
@@ -200,8 +202,13 @@
#define g_array_index(a,t,i) (*(((t*)a->data)+i))
GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
+#ifdef TARGET_RT_64_BIT
+#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: branches/fuse_corevideo/FuseImporter/FuseImporter.xcodeproj
___________________________________________________________________
Modified: svn:ignore
- *.mode1
*.pbxuser
+ *.mode1
*.pbxuser
*.perspectivev3
Modified: branches/fuse_corevideo/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- branches/fuse_corevideo/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2009-09-07 11:22:22 UTC (rev 626)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 45;
objects = {
/* Begin PBXBuildFile section */
@@ -332,7 +332,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = B6B0E30008CC65D5001D8411 /* Build configuration list for PBXProject "FuseImporter" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.1";
hasScannedForEncodings = 1;
mainGroup = 089C166AFE841209C02AAC07 /* FuseImporter */;
projectDirPath = "";
@@ -545,34 +545,31 @@
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)";
DEBUG_INFORMATION_FORMAT = dwarf;
- GCC_VERSION = 4.0;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx10.5;
};
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)";
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 = macosx10.5;
};
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)";
DEBUG_INFORMATION_FORMAT = dwarf;
- GCC_VERSION = 4.0;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx10.5;
};
name = Default;
};
Modified: branches/fuse_corevideo/FuseImporter/generate.pl
===================================================================
--- branches/fuse_corevideo/FuseImporter/generate.pl 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/FuseImporter/generate.pl 2009-09-07 11:22:22 UTC (rev 626)
@@ -141,8 +141,15 @@
#define g_array_index(a,t,i) (*(((t*)a->data)+i))
GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
+#include <TargetConditionals.h>
+
+#ifdef TARGET_RT_64_BIT
+#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
CODE
}
Modified: branches/fuse_corevideo/FuseImporter/libspectrum.h
===================================================================
--- branches/fuse_corevideo/FuseImporter/libspectrum.h 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/FuseImporter/libspectrum.h 2009-09-07 11:22:22 UTC (rev 626)
@@ -38,6 +38,8 @@
#include <stdlib.h>
#include <stdio.h>
+#include <TargetConditionals.h>
+
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN /* Exclude rarely used stuff from Windows
@@ -200,8 +202,13 @@
#define g_array_index(a,t,i) (*(((t*)a->data)+i))
GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );
+#ifdef TARGET_RT_64_BIT
+#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: branches/fuse_corevideo/README
===================================================================
--- branches/fuse_corevideo/README 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/README 2009-09-07 11:22:22 UTC (rev 626)
@@ -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: branches/fuse_corevideo/audiofile/audiofile.xcodeproj
___________________________________________________________________
Modified: svn:ignore
- *.mode1
*.pbxuser
+ *.mode1
*.pbxuser
*.perspectivev3
Modified: branches/fuse_corevideo/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- branches/fuse_corevideo/audiofile/audiofile.xcodeproj/project.pbxproj 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/audiofile/audiofile.xcodeproj/project.pbxproj 2009-09-07 11:22:22 UTC (rev 626)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 45;
objects = {
/* Begin PBXBuildFile section */
@@ -303,7 +303,7 @@
000000000000000016601A90 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = B62395470C1CF4F8003B8E87 /* Build configuration list for PBXProject "audiofile" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.1";
hasScannedForEncodings = 1;
mainGroup = 0000000000000000166142F0;
projectDirPath = "";
@@ -392,50 +392,45 @@
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)";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
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 = macosx10.5;
};
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)";
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 = macosx10.5;
};
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)";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
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 = macosx10.5;
};
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 +439,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 +471,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 +478,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 +510,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,
Property changes on: branches/fuse_corevideo/fuse
___________________________________________________________________
Modified: svn:mergeinfo
- /vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
/vendor/fuse-emulator/current/fuse:530-609
+ /trunk/fuse:614-623
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
/vendor/fuse-emulator/current/fuse:530-609
Modified: branches/fuse_corevideo/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- branches/fuse_corevideo/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2009-09-07 11:22:22 UTC (rev 626)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 45;
objects = {
/* Begin PBXBuildFile section */
@@ -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";
@@ -1322,7 +1316,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.1";
hasScannedForEncodings = 1;
mainGroup = 29B97314FDCFA39411CA2CEA /* Fuse */;
projectDirPath = "";
@@ -1697,15 +1691,14 @@
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)";
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;
+ SDKROOT = macosx10.5;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = YES;
@@ -1715,16 +1708,15 @@
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)";
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;
+ SDKROOT = macosx10.5;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
@@ -1734,15 +1726,14 @@
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)";
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;
+ SDKROOT = macosx10.5;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
Modified: branches/fuse_corevideo/fuse/fusepb/FuseMenus.m
===================================================================
--- branches/fuse_corevideo/fuse/fusepb/FuseMenus.m 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/fuse/fusepb/FuseMenus.m 2009-09-07 11:22:22 UTC (rev 626)
@@ -34,6 +34,7 @@
#include "divide.h"
#include "if1.h"
#include "menu.h"
+#include "opus.h"
#include "settings.h"
#include "simpleide.h"
#include "tape.h"
@@ -80,6 +81,12 @@
confirm = plusd_disk_eject( PLUSD_DRIVE_2, 0 );
if( confirm ) return 1;
+ confirm = opus_disk_eject( OPUS_DRIVE_1, 0 );
+ if( confirm ) return 1;
+
+ confirm = opus_disk_eject( OPUS_DRIVE_2, 0 );
+ if( confirm ) return 1;
+
for( i = 0; i < 8; i++ ) {
confirm = if1_mdr_eject( i, 0 );
if( confirm ) return 1;
Modified: branches/fuse_corevideo/fuse/fusepb/controllers/FuseController.m
===================================================================
--- branches/fuse_corevideo/fuse/fusepb/controllers/FuseController.m 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/fuse/fusepb/controllers/FuseController.m 2009-09-07 11:22:22 UTC (rev 626)
@@ -1975,8 +1975,6 @@
if( ui_mouse_grabbed ) ui_mouse_grabbed = ui_mouse_release( 1 );
- confirm = UI_CONFIRM_SAVE_CANCEL;
-
result = NSRunAlertPanel(@"Confirm", theMessage, @"Save",
@"Don't Save", @"Cancel");
Modified: branches/fuse_corevideo/fuse/fusepb/controllers/PokeFinderController.m
===================================================================
--- branches/fuse_corevideo/fuse/fusepb/controllers/PokeFinderController.m 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/fuse/fusepb/controllers/PokeFinderController.m 2009-09-07 11:22:22 UTC (rev 626)
@@ -59,7 +59,7 @@
- (void)awakeFromNib
{
- NumberFormatter *searchForFormatter = [[NumberFormatter alloc] init];
+ NumberFormatter *searchForFormatter = [[[NumberFormatter alloc] init] autorelease];
[searchForFormatter setMinimum:[NSDecimalNumber zero]];
[searchForFormatter setMaximum:[NSDecimalNumber decimalNumberWithString:@"255"]];
@@ -72,7 +72,7 @@
- (void)matchListDoubleAction:(id)sender
{
- int error, row;
+ int row;
id record, value;
unsigned long page, offset;
@@ -86,10 +86,9 @@
value = [record valueForKey:@"offset_number"];
offset = [value unsignedLongValue];
- error =
- debugger_breakpoint_add_address( DEBUGGER_BREAKPOINT_TYPE_WRITE,
- page, offset, 0,
- DEBUGGER_BREAKPOINT_LIFE_PERMANENT, NULL);
+ (void)debugger_breakpoint_add_address( DEBUGGER_BREAKPOINT_TYPE_WRITE,
+ page, offset, 0,
+ DEBUGGER_BREAKPOINT_LIFE_PERMANENT, NULL);
}
- (void) dealloc
Modified: branches/fuse_corevideo/fuse/fusepb/controllers/PreferencesController.m
===================================================================
--- branches/fuse_corevideo/fuse/fusepb/controllers/PreferencesController.m 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/fuse/fusepb/controllers/PreferencesController.m 2009-09-07 11:22:22 UTC (rev 626)
@@ -69,16 +69,14 @@
[NSValueTransformer setValueTransformer:sNToITransformer
forName:@"ScalerNameToIdTransformer"];
- machineScalerIsEnabled = [[MachineScalerIsEnabled
- machineScalerIsEnabledWithInt:1]
- autorelease];
+ machineScalerIsEnabled = [MachineScalerIsEnabled
+ machineScalerIsEnabledWithInt:1];
[NSValueTransformer setValueTransformer:machineScalerIsEnabled
forName:@"MachineTimexIsEnabled"];
- machineScalerIsEnabled = [[MachineScalerIsEnabled
- machineScalerIsEnabledWithInt:0]
- autorelease];
+ machineScalerIsEnabled = [MachineScalerIsEnabled
+ machineScalerIsEnabledWithInt:0];
[NSValueTransformer setValueTransformer:machineScalerIsEnabled
forName:@"MachineTimexIsDisabled"];
Modified: branches/fuse_corevideo/fuse/fusepb/controllers/SaveBinaryController.m
===================================================================
--- branches/fuse_corevideo/fuse/fusepb/controllers/SaveBinaryController.m 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/fuse/fusepb/controllers/SaveBinaryController.m 2009-09-07 11:22:22 UTC (rev 626)
@@ -68,7 +68,7 @@
- (IBAction)apply:(id)sender
{
libspectrum_word s, l; size_t i;
- char *buffer;
+ libspectrum_byte *buffer;
int error;
Modified: branches/fuse_corevideo/fuse/fusepb/nibs/Preferences.nib/designable.nib
===================================================================
--- branches/fuse_corevideo/fuse/fusepb/nibs/Preferences.nib/designable.nib 2009-09-05 14:15:58 UTC (rev 625)
+++ branches/fuse_corevideo/fuse/fusepb/nibs/Preferences.nib/designable.nib 2009-09-07 11:22:22 UTC (rev 626)
@@ -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"/>
...
[truncated message content] |
