Thread: [Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[571] trunk/fuse/fusepb
Brought to you by:
fredm
Menu
▾
▴
fuse-for-macosx-commits
|
From: <fr...@us...> - 2008-12-14 20:15:29
|
Revision: 571
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=571&view=rev
Author: fredm
Date: 2008-12-14 20:15:22 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
Move to Mac OS X 10.5 SDK and "proper" Preferences window.
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/controllers/PreferencesController.h
trunk/fuse/fusepb/controllers/PreferencesController.m
trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Added Paths:
-----------
trunk/fuse/fusepb/resources/Graphics_Filter.png
trunk/fuse/fusepb/resources/Machine.png
trunk/fuse/fusepb/resources/Peripherals.png
trunk/fuse/fusepb/resources/RZX.png
trunk/fuse/fusepb/resources/Select_ROMs.png
trunk/fuse/fusepb/resources/Sound.png
trunk/fuse/fusepb/resources/qs2t_icon.png
Removed Paths:
-------------
trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib
trunk/fuse/fusepb/nibs/Preferences.nib/info.nib
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-12 12:30:50 UTC (rev 570)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-14 20:15:22 UTC (rev 571)
@@ -8,6 +8,13 @@
/* Begin PBXBuildFile section */
B604B21B0DC182BE00981CC7 /* FuseGenerator.qlgenerator in CopyFiles */ = {isa = PBXBuildFile; fileRef = B61EEB950D1A917D006FEA80 /* FuseGenerator.qlgenerator */; };
+ B61159BF0EEE99D50029FEA3 /* Graphics_Filter.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159BE0EEE99D50029FEA3 /* Graphics_Filter.png */; };
+ B61159C10EEE99E20029FEA3 /* Machine.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C00EEE99E20029FEA3 /* Machine.png */; };
+ B61159C30EEE99EE0029FEA3 /* Peripherals.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C20EEE99EE0029FEA3 /* Peripherals.png */; };
+ B61159C50EEE99FA0029FEA3 /* qs2t_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C40EEE99FA0029FEA3 /* qs2t_icon.png */; };
+ B61159C70EEE9A080029FEA3 /* RZX.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C60EEE9A080029FEA3 /* RZX.png */; };
+ B61159C90EEE9A140029FEA3 /* Select_ROMs.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C80EEE9A140029FEA3 /* Select_ROMs.png */; };
+ B61159CB0EEE9A1E0029FEA3 /* Sound.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159CA0EEE9A1E0029FEA3 /* Sound.png */; };
B615BFE80B4261E50082D535 /* HIDJoysticks.m in Sources */ = {isa = PBXBuildFile; fileRef = B615BFE60B4261E50082D535 /* HIDJoysticks.m */; };
B61F459309121DF100C8096C /* Fuse Help in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F905ED05CDA24300C2F10D /* Fuse Help */; };
B61F459409121DF100C8096C /* disk_plus3.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F2076596C700DE7E81 /* disk_plus3.szx */; };
@@ -310,6 +317,13 @@
B611190206A1FA12006D2711 /* JoystickConfigurationController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JoystickConfigurationController.h; path = controllers/JoystickConfigurationController.h; sourceTree = SOURCE_ROOT; };
B611190306A1FA12006D2711 /* JoystickConfigurationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = JoystickConfigurationController.m; path = controllers/JoystickConfigurationController.m; sourceTree = SOURCE_ROOT; };
B611196806A1FBB6006D2711 /* JoystickConfiguration.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = JoystickConfiguration.nib; path = nibs/JoystickConfiguration.nib; sourceTree = "<group>"; };
+ B61159BE0EEE99D50029FEA3 /* Graphics_Filter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Graphics_Filter.png; sourceTree = "<group>"; };
+ B61159C00EEE99E20029FEA3 /* Machine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Machine.png; sourceTree = "<group>"; };
+ B61159C20EEE99EE0029FEA3 /* Peripherals.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Peripherals.png; sourceTree = "<group>"; };
+ B61159C40EEE99FA0029FEA3 /* qs2t_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = qs2t_icon.png; sourceTree = "<group>"; };
+ B61159C60EEE9A080029FEA3 /* RZX.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RZX.png; sourceTree = "<group>"; };
+ B61159C80EEE9A140029FEA3 /* Select_ROMs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Select_ROMs.png; sourceTree = "<group>"; };
+ B61159CA0EEE9A1E0029FEA3 /* Sound.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Sound.png; sourceTree = "<group>"; };
B615BFE50B4261E50082D535 /* HIDJoysticks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = HIDJoysticks.h; path = content_arrays/HIDJoysticks.h; sourceTree = "<group>"; };
B615BFE60B4261E50082D535 /* HIDJoysticks.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = HIDJoysticks.m; path = content_arrays/HIDJoysticks.m; sourceTree = "<group>"; };
B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SavePanelAccessoryView.nib; path = nibs/SavePanelAccessoryView.nib; sourceTree = "<group>"; };
@@ -831,20 +845,27 @@
B6F0480E0952B597006D8005 /* dck.icns */,
B643BB8D0403A0FD00A864FD /* dsk.icns */,
F5F4333103903ED801E7A043 /* Fuse.icns */,
+ B61159BE0EEE99D50029FEA3 /* Graphics_Filter.png */,
B650986A09366C8F003AF1BF /* hdf.icns */,
+ B61159C00EEE99E20029FEA3 /* Machine.png */,
B6F048100952B5AD006D8005 /* mdr.icns */,
B6CADD6E0C48E1A3004BA954 /* microdrive_green.png */,
B6CADD6F0C48E1A3004BA954 /* microdrive_red.png */,
+ B61159C20EEE99EE0029FEA3 /* Peripherals.png */,
B6CADD700C48E1A3004BA954 /* plus3disk_green.png */,
B6CADD710C48E1A3004BA954 /* plus3disk_red.png */,
+ B61159C40EEE99FA0029FEA3 /* qs2t_icon.png */,
B639B7D00A6BB45600927E24 /* raw.icns */,
B650986B09366C8F003AF1BF /* rom.icns */,
B650986C09366C8F003AF1BF /* rzx.icns */,
+ B61159C60EEE9A080029FEA3 /* RZX.png */,
B6F048120952B5C1006D8005 /* scl.icns */,
B643BB900403A11B00A864FD /* scr.icns */,
+ B61159C80EEE9A140029FEA3 /* Select_ROMs.png */,
B6F048140952B5DA006D8005 /* slt.icns */,
B643BB910403A11B00A864FD /* sna.icns */,
B6F048160952B5EC006D8005 /* snp.icns */,
+ B61159CA0EEE9A1E0029FEA3 /* Sound.png */,
B6F048170952B5EC006D8005 /* sp.icns */,
B650987009366CA2003AF1BF /* szx.icns */,
B643BB920403A11B00A864FD /* tap.icns */,
@@ -1357,6 +1378,13 @@
B6CADD730C48E1A3004BA954 /* microdrive_red.png in Resources */,
B6CADD740C48E1A3004BA954 /* plus3disk_green.png in Resources */,
B6CADD750C48E1A3004BA954 /* plus3disk_red.png in Resources */,
+ B61159BF0EEE99D50029FEA3 /* Graphics_Filter.png in Resources */,
+ B61159C10EEE99E20029FEA3 /* Machine.png in Resources */,
+ B61159C30EEE99EE0029FEA3 /* Peripherals.png in Resources */,
+ B61159C50EEE99FA0029FEA3 /* qs2t_icon.png in Resources */,
+ B61159C70EEE9A080029FEA3 /* RZX.png in Resources */,
+ B61159C90EEE9A140029FEA3 /* Select_ROMs.png in Resources */,
+ B61159CB0EEE9A1E0029FEA3 /* Sound.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1639,7 +1667,7 @@
GCC_DYNAMIC_NO_PIC = YES;
GCC_VERSION = 4.0;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = YES;
@@ -1658,7 +1686,7 @@
GCC_DYNAMIC_NO_PIC = YES;
GCC_VERSION = 4.0;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
@@ -1676,7 +1704,7 @@
GCC_DYNAMIC_NO_PIC = YES;
GCC_VERSION = 4.0;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
Modified: trunk/fuse/fusepb/controllers/PreferencesController.h
===================================================================
--- trunk/fuse/fusepb/controllers/PreferencesController.h 2008-12-12 12:30:50 UTC (rev 570)
+++ trunk/fuse/fusepb/controllers/PreferencesController.h 2008-12-14 20:15:22 UTC (rev 571)
@@ -36,6 +36,16 @@
IBOutlet NSFormCell *rom3Filename;
IBOutlet NSArrayController *machineRomsController;
IBOutlet NSMatrix *massStorageType;
+ IBOutlet NSTabView *tabView;
+ IBOutlet NSToolbar *toolbar;
+ IBOutlet NSView *generalPrefsView;
+ IBOutlet NSView *soundPrefsView;
+ IBOutlet NSView *peripheralsPrefsView;
+ IBOutlet NSView *rzxPrefsView;
+ IBOutlet NSView *joysticksPrefsView;
+ IBOutlet NSView *romPrefsView;
+ IBOutlet NSView *machinePrefsView;
+ IBOutlet NSView *filterPrefsView;
JoystickConfigurationController *joystickConfigurationController;
@@ -56,6 +66,8 @@
- (IBAction)resetROMFile:(id)sender;
- (IBAction)resetUserDefaults:(id)sender;
- (IBAction)massStorageTypeClicked:(id)sender;
+- (IBAction)selectPrefPanel:(id)item;
+- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)bar;
- (void)setMassStorageType;
- (unsigned int)countOfMachineRoms;
Modified: trunk/fuse/fusepb/controllers/PreferencesController.m
===================================================================
--- trunk/fuse/fusepb/controllers/PreferencesController.m 2008-12-12 12:30:50 UTC (rev 570)
+++ trunk/fuse/fusepb/controllers/PreferencesController.m 2008-12-14 20:15:22 UTC (rev 571)
@@ -112,6 +112,14 @@
return self;
}
+- (void)awakeFromNib
+{
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+ NSToolbarItem *item = [[toolbar items] objectAtIndex:[defaults integerForKey:@"preferencestab"]];
+ [toolbar setSelectedItemIdentifier:[item itemIdentifier]];
+ [self selectPrefPanel:item];
+}
+
- (void)showWindow:(id)sender
{
[[DisplayOpenGLView instance] pause];
@@ -366,6 +374,70 @@
[currentValues setObject:[NSNumber numberWithBool:settings_current.plusd ? YES : NO] forKey:@"plusd"];
}
+- (IBAction)selectPrefPanel:(id)item
+{
+ NSString *sender;
+
+ if( item == nil ){ //set the pane to the default.
+ sender = @"General";
+ [toolbar setSelectedItemIdentifier:sender];
+ } else {
+ sender = [item label];
+ }
+
+ NSWindow *window = [self window];
+
+ // make a temp pointer.
+ NSView *prefsView = generalPrefsView;
+
+ // set the title to the name of the Preference Item.
+ [window setTitle:sender];
+
+ if( [sender isEqualToString:@"Sound"] ) {
+ prefsView = soundPrefsView;
+ } else if( [sender isEqualToString:@"Peripherals"] ) {
+ prefsView = peripheralsPrefsView;
+ } else if( [sender isEqualToString:@"Recording"] ) {
+ prefsView = rzxPrefsView;
+ } else if( [sender isEqualToString:@"Joysticks"] ) {
+ prefsView = joysticksPrefsView;
+ } else if( [sender isEqualToString:@"ROM"] ) {
+ prefsView = romPrefsView;
+ } else if( [sender isEqualToString:@"Machine"] ) {
+ prefsView = machinePrefsView;
+ } else if( [sender isEqualToString:@"Video"] ) {
+ prefsView = filterPrefsView;
+ }
+
+ // to stop flicker, we make a temp blank view.
+ NSView *tempView = [[NSView alloc] initWithFrame:[[window contentView] frame]];
+ [window setContentView:tempView];
+ [tempView release];
+
+ // mojo to get the right frame for the new window.
+ NSRect newFrame = [window frame];
+ newFrame.size.height = [prefsView frame].size.height +
+ ([window frame].size.height - [[window contentView] frame].size.height);
+ newFrame.origin.y += ([[window contentView] frame].size.height -
+ [prefsView frame].size.height);
+
+ // set the frame to newFrame and animate it.
+ [window setShowsResizeIndicator:YES];
+ [window setFrame:newFrame display:YES animate:YES];
+ // set the main content view to the new view we have picked through the if structure above.
+ [window setContentView:prefsView];
+
+ [[NSUserDefaults standardUserDefaults]
+ setObject:[NSNumber numberWithInteger:[item tag]] forKey:@"preferencestab"];
+}
+
+// NSToolbar delegate method
+- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)bar
+{
+ // Every toolbar icon is selectable
+ return [[bar items] valueForKey:@"itemIdentifier"];
+}
+
- (void)setMassStorageType
{
int value = 0;
Deleted: trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib
===================================================================
--- trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib 2008-12-12 12:30:50 UTC (rev 570)
+++ trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib 2008-12-14 20:15:22 UTC (rev 571)
@@ -1,37 +0,0 @@
-{
- IBClasses = (
- {
- CLASS = FirstResponder;
- LANGUAGE = ObjC;
- SUPERCLASS = NSObject;
- },
- {
- ACTIONS = {
- chooseFile = id;
- chooseROMFile = id;
- massStorageTypeClicked = id;
- resetROMFile = id;
- resetUserDefaults = id;
- setup = id;
- showWindow = id;
- };
- CLASS = PreferencesController;
- LANGUAGE = ObjC;
- OUTLETS = {
- machineRomsController = NSArrayController;
- massStorageType = NSMatrix;
- rom0Filename = NSFormCell;
- rom1Filename = NSFormCell;
- rom2Filename = NSFormCell;
- rom3Filename = NSFormCell;
- };
- SUPERCLASS = NSWindowController;
- },
- {
- CLASS = SDLJoystick;
- LANGUAGE = ObjC;
- SUPERCLASS = NSObject;
- }
- );
- IBVersion = 1;
-}
\ No newline at end of file
Deleted: trunk/fuse/fusepb/nibs/Preferences.nib/info.nib
===================================================================
--- trunk/fuse/fusepb/nibs/Preferences.nib/info.nib 2008-12-12 12:30:50 UTC (rev 570)
+++ trunk/fuse/fusepb/nibs/Preferences.nib/info.nib 2008-12-14 20:15:22 UTC (rev 571)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBDocumentLocation</key>
- <string>95 15 356 240 0 0 1280 778 </string>
- <key>IBFramework Version</key>
- <string>489.0</string>
- <key>IBGroupedObjects</key>
- <dict>
- <key>3</key>
- <array>
- <string>122</string>
- <string>127</string>
- <string>121</string>
- <string>124</string>
- </array>
- <key>4</key>
- <array>
- <string>993</string>
- <string>995</string>
- <string>992</string>
- <string>994</string>
- </array>
- </dict>
- <key>IBLastGroupID</key>
- <string>5</string>
- <key>IBOldestOS</key>
- <integer>3</integer>
- <key>IBOpenObjects</key>
- <array>
- <integer>5</integer>
- </array>
- <key>IBSystem Version</key>
- <string>9F2114</string>
- <key>IBUsesTextArchiving</key>
- <true/>
-</dict>
-</plist>
Modified: trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
===================================================================
--- trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2008-12-12 12:30:50 UTC (rev 570)
+++ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2008-12-14 20:15:22 UTC (rev 571)
@@ -1,27597 +1,1425 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>$archiver</key>
- <string>NSKeyedArchiver</string>
- <key>$objects</key>
- <array>
- <string>$null</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>1588</integer>
- </dict>
- <key>NSAccessibilityConnectors</key>
- <dict>
- <key>CF$UID</key>
- <integer>1585</integer>
- </dict>
- <key>NSAccessibilityOidsKeys</key>
- <dict>
- <key>CF$UID</key>
- <integer>1586</integer>
- </dict>
- <key>NSAccessibilityOidsValues</key>
- <dict>
- <key>CF$UID</key>
- <integer>1587</integer>
- </dict>
- <key>NSClassesKeys</key>
- <dict>
- <key>CF$UID</key>
- <integer>1270</integer>
- </dict>
- <key>NSClassesValues</key>
- <dict>
- <key>CF$UID</key>
- <integer>1271</integer>
- </dict>
- <key>NSConnections</key>
- <dict>
- <key>CF$UID</key>
- <integer>8</integer>
- </dict>
- <key>NSFontManager</key>
- <dict>
- <key>CF$UID</key>
- <integer>0</integer>
- </dict>
- <key>NSFramework</key>
- <dict>
- <key>CF$UID</key>
- <integer>5</integer>
- </dict>
- <key>NSNamesKeys</key>
- <dict>
- <key>CF$UID</key>
- <integer>1202</integer>
- </dict>
- <key>NSNamesValues</key>
- <dict>
- <key>CF$UID</key>
- <integer>1203</integer>
- </dict>
- <key>NSNextOid</key>
- <integer>1206</integer>
- <key>NSObjectsKeys</key>
- <dict>
- <key>CF$UID</key>
- <integer>1195</integer>
- </dict>
- <key>NSObjectsValues</key>
- <dict>
- <key>CF$UID</key>
- <integer>1201</integer>
- </dict>
- <key>NSOidsKeys</key>
- <dict>
- <key>CF$UID</key>
- <integer>1272</integer>
- </dict>
- <key>NSOidsValues</key>
- <dict>
- <key>CF$UID</key>
- <integer>1273</integer>
- </dict>
- <key>NSRoot</key>
- <dict>
- <key>CF$UID</key>
- <integer>2</integer>
- </dict>
- <key>NSVisibleWindows</key>
- <dict>
- <key>CF$UID</key>
- <integer>6</integer>
- </dict>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>4</integer>
- </dict>
- <key>NSClassName</key>
- <dict>
- <key>CF$UID</key>
- <integer>3</integer>
- </dict>
- </dict>
- <string>PreferencesController</string>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSCustomObject</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSCustomObject</string>
- </dict>
- <string>IBCocoaFramework</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>7</integer>
- </dict>
- <key>NS.objects</key>
- <array/>
- </dict>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSMutableSet</string>
- <string>NSSet</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSMutableSet</string>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>104</integer>
- </dict>
- <key>NS.objects</key>
- <array>
- <dict>
- <key>CF$UID</key>
- <integer>9</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>30</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>39</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>831</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>841</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>842</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>846</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>849</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>852</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>855</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>858</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>861</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>864</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>867</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>870</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>873</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>876</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>879</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>882</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>885</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>888</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>891</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>894</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>897</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>900</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>903</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>906</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>915</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>922</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>925</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>926</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>928</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>939</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>942</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>946</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>963</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>967</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>971</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>975</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>981</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>984</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>987</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>991</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>993</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>995</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>997</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>999</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1001</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1002</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1003</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1004</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1006</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1009</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1012</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1015</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1018</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1026</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1027</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1028</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1029</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1032</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1033</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1036</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1039</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1040</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1043</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1049</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1050</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1051</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1052</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1053</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1058</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1062</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1068</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1073</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1077</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1081</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1083</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1084</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1087</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1091</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1093</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1095</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1098</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1101</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1103</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1105</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1108</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1111</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1114</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1117</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1119</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1121</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1122</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1123</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1124</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1126</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1128</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1130</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1132</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1135</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1138</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1141</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1144</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1148</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1150</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1152</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1154</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1157</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1159</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1161</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1163</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1165</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1167</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1169</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1171</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1173</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1176</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1179</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1181</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1183</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1185</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1188</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>1191</integer>
- </dict>
- </array>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>29</integer>
- </dict>
- <key>NSDestination</key>
- <dict>
- <key>CF$UID</key>
- <integer>24</integer>
- </dict>
- <key>NSLabel</key>
- <dict>
- <key>CF$UID</key>
- <integer>28</integer>
- </dict>
- <key>NSSource</key>
- <dict>
- <key>CF$UID</key>
- <integer>10</integer>
- </dict>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>23</integer>
- </dict>
- <key>NSCell</key>
- <dict>
- <key>CF$UID</key>
- <integer>13</integer>
- </dict>
- <key>NSEnabled</key>
- <true/>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>12</integer>
- </dict>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>11</integer>
- </dict>
- <key>NSSuperview</key>
- <dict>
- <key>CF$UID</key>
- <integer>11</integer>
- </dict>
- <key>NSvFlags</key>
- <integer>256</integer>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>127</integer>
- </dict>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>205</integer>
- </dict>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>0</integer>
- </dict>
- <key>NSSubviews</key>
- <dict>
- <key>CF$UID</key>
- <integer>132</integer>
- </dict>
- </dict>
- <string>{{192, 167}, {105, 18}}</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>22</integer>
- </dict>
- <key>NSAlternateContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSAlternateImage</key>
- <dict>
- <key>CF$UID</key>
- <integer>18</integer>
- </dict>
- <key>NSButtonFlags</key>
- <integer>1211912703</integer>
- <key>NSButtonFlags2</key>
- <integer>2</integer>
- <key>NSCellFlags</key>
- <integer>67239424</integer>
- <key>NSCellFlags2</key>
- <integer>0</integer>
- <key>NSContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>14</integer>
- </dict>
- <key>NSControlView</key>
- <dict>
- <key>CF$UID</key>
- <integer>10</integer>
- </dict>
- <key>NSKeyEquivalent</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSPeriodicDelay</key>
- <integer>200</integer>
- <key>NSPeriodicInterval</key>
- <integer>25</integer>
- <key>NSSupport</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- </dict>
- <string>Use .slt traps</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>17</integer>
- </dict>
- <key>NSName</key>
- <dict>
- <key>CF$UID</key>
- <integer>16</integer>
- </dict>
- <key>NSSize</key>
- <real>13</real>
- <key>NSfFlags</key>
- <integer>1044</integer>
- </dict>
- <string>LucidaGrande</string>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSFont</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSFont</string>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>20</integer>
- </dict>
- <key>NSImageName</key>
- <dict>
- <key>CF$UID</key>
- <integer>19</integer>
- </dict>
- </dict>
- <string>NSSwitch</string>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSButtonImageSource</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSButtonImageSource</string>
- </dict>
- <string></string>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSButtonCell</string>
- <string>%NSButtonCell</string>
- <string>NSActionCell</string>
- <string>NSCell</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSButtonCell</string>
- </dict>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSButton</string>
- <string>NSControl</string>
- <string>NSView</string>
- <string>NSResponder</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSButton</string>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>23</integer>
- </dict>
- <key>NSCell</key>
- <dict>
- <key>CF$UID</key>
- <integer>26</integer>
- </dict>
- <key>NSEnabled</key>
- <true/>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>25</integer>
- </dict>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>11</integer>
- </dict>
- <key>NSSuperview</key>
- <dict>
- <key>CF$UID</key>
- <integer>11</integer>
- </dict>
- <key>NSvFlags</key>
- <integer>256</integer>
- </dict>
- <string>{{192, 187}, {151, 18}}</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>22</integer>
- </dict>
- <key>NSAlternateContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSAlternateImage</key>
- <dict>
- <key>CF$UID</key>
- <integer>18</integer>
- </dict>
- <key>NSButtonFlags</key>
- <integer>1211912703</integer>
- <key>NSButtonFlags2</key>
- <integer>2</integer>
- <key>NSCellFlags</key>
- <integer>67239424</integer>
- <key>NSCellFlags2</key>
- <integer>0</integer>
- <key>NSContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>27</integer>
- </dict>
- <key>NSControlView</key>
- <dict>
- <key>CF$UID</key>
- <integer>24</integer>
- </dict>
- <key>NSKeyEquivalent</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSPeriodicDelay</key>
- <integer>200</integer>
- <key>NSPeriodicInterval</key>
- <integer>25</integer>
- <key>NSSupport</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- </dict>
- <string>Allow writes to ROM</string>
- <string>nextKeyView</string>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSNibOutletConnector</string>
- <string>NSNibConnector</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSNibOutletConnector</string>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>29</integer>
- </dict>
- <key>NSDestination</key>
- <dict>
- <key>CF$UID</key>
- <integer>35</integer>
- </dict>
- <key>NSLabel</key>
- <dict>
- <key>CF$UID</key>
- <integer>28</integer>
- </dict>
- <key>NSSource</key>
- <dict>
- <key>CF$UID</key>
- <integer>31</integer>
- </dict>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>23</integer>
- </dict>
- <key>NSCell</key>
- <dict>
- <key>CF$UID</key>
- <integer>33</integer>
- </dict>
- <key>NSEnabled</key>
- <true/>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>32</integer>
- </dict>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>11</integer>
- </dict>
- <key>NSSuperview</key>
- <dict>
- <key>CF$UID</key>
- <integer>11</integer>
- </dict>
- <key>NSvFlags</key>
- <integer>256</integer>
- </dict>
- <string>{{18, 227}, {113, 18}}</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>22</integer>
- </dict>
- <key>NSAlternateContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSAlternateImage</key>
- <dict>
- <key>CF$UID</key>
- <integer>18</integer>
- </dict>
- <key>NSButtonFlags</key>
- <integer>1211912703</integer>
- <key>NSButtonFlags2</key>
- <integer>2</integer>
- <key>NSCellFlags</key>
- <integer>67239424</integer>
- <key>NSCellFlags2</key>
- <integer>0</integer>
- <key>NSContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>34</integer>
- </dict>
- <key>NSControlView</key>
- <dict>
- <key>CF$UID</key>
- <integer>31</integer>
- </dict>
- <key>NSKeyEquivalent</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSPeriodicDelay</key>
- <integer>200</integer>
- <key>NSPeriodicInterval</key>
- <integer>25</integer>
- <key>NSSupport</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- </dict>
- <string>Use tape traps</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>23</integer>
- </dict>
- <key>NSCell</key>
- <dict>
- <key>CF$UID</key>
- <integer>37</integer>
- </dict>
- <key>NSEnabled</key>
- <true/>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>36</integer>
- </dict>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>11</integer>
- </dict>
- <key>NSSuperview</key>
- <dict>
- <key>CF$UID</key>
- <integer>11</integer>
- </dict>
- <key>NSvFlags</key>
- <integer>256</integer>
- </dict>
- <string>{{18, 147}, {165, 18}}</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>22</integer>
- </dict>
- <key>NSAlternateContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSAlternateImage</key>
- <dict>
- <key>CF$UID</key>
- <integer>18</integer>
- </dict>
- <key>NSButtonFlags</key>
- <integer>1211912703</integer>
- <key>NSButtonFlags2</key>
- <integer>2</integer>
- <key>NSCellFlags</key>
- <integer>67239424</integer>
- <key>NSCellFlags2</key>
- <integer>0</integer>
- <key>NSContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>38</integer>
- </dict>
- <key>NSControlView</key>
- <dict>
- <key>CF$UID</key>
- <integer>35</integer>
- </dict>
- <key>NSKeyEquivalent</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSPeriodicDelay</key>
- <integer>200</integer>
- <key>NSPeriodicInterval</key>
- <integer>25</integer>
- <key>NSSupport</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- </dict>
- <string>Auto-load media</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>29</integer>
- </dict>
- <key>NSDestination</key>
- <dict>
- <key>CF$UID</key>
- <integer>40</integer>
- </dict>
- <key>NSLabel</key>
- <dict>
- <key>CF$UID</key>
- <integer>830</integer>
- </dict>
- <key>NSSource</key>
- <dict>
- <key>CF$UID</key>
- <integer>2</integer>
- </dict>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>829</integer>
- </dict>
- <key>NSMaxSize</key>
- <dict>
- <key>CF$UID</key>
- <integer>828</integer>
- </dict>
- <key>NSMinSize</key>
- <dict>
- <key>CF$UID</key>
- <integer>827</integer>
- </dict>
- <key>NSScreenRect</key>
- <dict>
- <key>CF$UID</key>
- <integer>826</integer>
- </dict>
- <key>NSViewClass</key>
- <dict>
- <key>CF$UID</key>
- <integer>44</integer>
- </dict>
- <key>NSWTFlags</key>
- <integer>1886912512</integer>
- <key>NSWindowBacking</key>
- <integer>2</integer>
- <key>NSWindowClass</key>
- <dict>
- <key>CF$UID</key>
- <integer>43</integer>
- </dict>
- <key>NSWindowRect</key>
- <dict>
- <key>CF$UID</key>
- <integer>41</integer>
- </dict>
- <key>NSWindowStyleMask</key>
- <integer>3</integer>
- <key>NSWindowTitle</key>
- <dict>
- <key>CF$UID</key>
- <integer>42</integer>
- </dict>
- <key>NSWindowView</key>
- <dict>
- <key>CF$UID</key>
- <integer>46</integer>
- </dict>
- </dict>
- <string>{{24, 182}, {634, 423}}</string>
- <string>Preferences</string>
- <string>NSPanel</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>45</integer>
- </dict>
- <key>NS.string</key>
- <string>View</string>
- </dict>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSMutableString</string>
- <string>NSString</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSMutableString</string>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>127</integer>
- </dict>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>825</integer>
- </dict>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>0</integer>
- </dict>
- <key>NSSubviews</key>
- <dict>
- <key>CF$UID</key>
- <integer>47</integer>
- </dict>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>104</integer>
- </dict>
- <key>NS.objects</key>
- <array>
- <dict>
- <key>CF$UID</key>
- <integer>48</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>787</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>820</integer>
- </dict>
- </array>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>786</integer>
- </dict>
- <key>NSAllowTruncatedLabels</key>
- <true/>
- <key>NSDrawsBackground</key>
- <true/>
- <key>NSFont</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>128</integer>
- </dict>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>46</integer>
- </dict>
- <key>NSSelectedTabViewItem</key>
- <dict>
- <key>CF$UID</key>
- <integer>419</integer>
- </dict>
- <key>NSSubviews</key>
- <dict>
- <key>CF$UID</key>
- <integer>49</integer>
- </dict>
- <key>NSSuperview</key>
- <dict>
- <key>CF$UID</key>
- <integer>46</integer>
- </dict>
- <key>NSTabViewItems</key>
- <dict>
- <key>CF$UID</key>
- <integer>129</integer>
- </dict>
- <key>NSTvFlags</key>
- <integer>4</integer>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>104</integer>
- </dict>
- <key>NS.objects</key>
- <array>
- <dict>
- <key>CF$UID</key>
- <integer>50</integer>
- </dict>
- </array>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>127</integer>
- </dict>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>126</integer>
- </dict>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>48</integer>
- </dict>
- <key>NSSubviews</key>
- <dict>
- <key>CF$UID</key>
- <integer>51</integer>
- </dict>
- <key>NSSuperview</key>
- <dict>
- <key>CF$UID</key>
- <integer>48</integer>
- </dict>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>104</integer>
- </dict>
- <key>NS.objects</key>
- <array>
- <dict>
- <key>CF$UID</key>
- <integer>52</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>56</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>60</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>118</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>122</integer>
- </dict>
- </array>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>23</integer>
- </dict>
- <key>NSCell</key>
- <dict>
- <key>CF$UID</key>
- <integer>54</integer>
- </dict>
- <key>NSEnabled</key>
- <true/>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>53</integer>
- </dict>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>50</integer>
- </dict>
- <key>NSSuperview</key>
- <dict>
- <key>CF$UID</key>
- <integer>50</integer>
- </dict>
- <key>NSvFlags</key>
- <integer>256</integer>
- </dict>
- <string>{{18, 245}, {145, 18}}</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>22</integer>
- </dict>
- <key>NSAlternateContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSAlternateImage</key>
- <dict>
- <key>CF$UID</key>
- <integer>18</integer>
- </dict>
- <key>NSButtonFlags</key>
- <integer>1211912703</integer>
- <key>NSButtonFlags2</key>
- <integer>2</integer>
- <key>NSCellFlags</key>
- <integer>67239424</integer>
- <key>NSCellFlags2</key>
- <integer>0</integer>
- <key>NSContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>55</integer>
- </dict>
- <key>NSControlView</key>
- <dict>
- <key>CF$UID</key>
- <integer>52</integer>
- </dict>
- <key>NSKeyEquivalent</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSPeriodicDelay</key>
- <integer>200</integer>
- <key>NSPeriodicInterval</key>
- <integer>25</integer>
- <key>NSSupport</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- </dict>
- <string>Competition mode</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>23</integer>
- </dict>
- <key>NSCell</key>
- <dict>
- <key>CF$UID</key>
- <integer>58</integer>
- </dict>
- <key>NSEnabled</key>
- <true/>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>57</integer>
- </dict>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>50</integer>
- </dict>
- <key>NSSuperview</key>
- <dict>
- <key>CF$UID</key>
- <integer>50</integer>
- </dict>
- <key>NSvFlags</key>
- <integer>256</integer>
- </dict>
- <string>{{18, 267}, {145, 18}}</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>22</integer>
- </dict>
- <key>NSAlternateContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSAlternateImage</key>
- <dict>
- <key>CF$UID</key>
- <integer>18</integer>
- </dict>
- <key>NSButtonFlags</key>
- <integer>1211912703</integer>
- <key>NSButtonFlags2</key>
- <integer>2</integer>
- <key>NSCellFlags</key>
- <integer>67239424</integer>
- <key>NSCellFlags2</key>
- <integer>0</integer>
- <key>NSContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>59</integer>
- </dict>
- <key>NSControlView</key>
- <dict>
- <key>CF$UID</key>
- <integer>56</integer>
- </dict>
- <key>NSKeyEquivalent</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSPeriodicDelay</key>
- <integer>200</integer>
- <key>NSPeriodicInterval</key>
- <integer>25</integer>
- <key>NSSupport</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- </dict>
- <string>Compress data</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>117</integer>
- </dict>
- <key>NSBackgroundColor</key>
- <dict>
- <key>CF$UID</key>
- <integer>111</integer>
- </dict>
- <key>NSCellBackgroundColor</key>
- <dict>
- <key>CF$UID</key>
- <integer>116</integer>
- </dict>
- <key>NSCellClass</key>
- <dict>
- <key>CF$UID</key>
- <integer>107</integer>
- </dict>
- <key>NSCellSize</key>
- <dict>
- <key>CF$UID</key>
- <integer>105</integer>
- </dict>
- <key>NSCells</key>
- <dict>
- <key>CF$UID</key>
- <integer>62</integer>
- </dict>
- <key>NSEnabled</key>
- <true/>
- <key>NSFont</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- <key>NSFrame</key>
- <dict>
- <key>CF$UID</key>
- <integer>61</integer>
- </dict>
- <key>NSIntercellSpacing</key>
- <dict>
- <key>CF$UID</key>
- <integer>106</integer>
- </dict>
- <key>NSMatrixFlags</key>
- <integer>67633152</integer>
- <key>NSNextResponder</key>
- <dict>
- <key>CF$UID</key>
- <integer>50</integer>
- </dict>
- <key>NSNumCols</key>
- <integer>1</integer>
- <key>NSNumRows</key>
- <integer>1</integer>
- <key>NSProtoCell</key>
- <dict>
- <key>CF$UID</key>
- <integer>108</integer>
- </dict>
- <key>NSSelectedCol</key>
- <integer>-1</integer>
- <key>NSSelectedRow</key>
- <integer>-1</integer>
- <key>NSSuperview</key>
- <dict>
- <key>CF$UID</key>
- <integer>50</integer>
- </dict>
- <key>NSvFlags</key>
- <integer>256</integer>
- </dict>
- <string>{{20, 217}, {256, 22}}</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>104</integer>
- </dict>
- <key>NS.objects</key>
- <array>
- <dict>
- <key>CF$UID</key>
- <integer>63</integer>
- </dict>
- </array>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>103</integer>
- </dict>
- <key>NSCellFlags</key>
- <integer>343014977</integer>
- <key>NSCellFlags2</key>
- <integer>-1941961728</integer>
- <key>NSContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>64</integer>
- </dict>
- <key>NSControlView</key>
- <dict>
- <key>CF$UID</key>
- <integer>60</integer>
- </dict>
- <key>NSFormatter</key>
- <dict>
- <key>CF$UID</key>
- <integer>65</integer>
- </dict>
- <key>NSSupport</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- <key>NSTitleCell</key>
- <dict>
- <key>CF$UID</key>
- <integer>100</integer>
- </dict>
- <key>NSTitleWidth</key>
- <real>121</real>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>45</integer>
- </dict>
- <key>NS.string</key>
- <string></string>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>99</integer>
- </dict>
- <key>NS.allowsfloats</key>
- <true/>
- <key>NS.attributes</key>
- <dict>
- <key>CF$UID</key>
- <integer>66</integer>
- </dict>
- <key>NS.decimal</key>
- <dict>
- <key>CF$UID</key>
- <integer>90</integer>
- </dict>
- <key>NS.hasthousands</key>
- <false/>
- <key>NS.localized</key>
- <false/>
- <key>NS.max</key>
- <dict>
- <key>CF$UID</key>
- <integer>98</integer>
- </dict>
- <key>NS.min</key>
- <dict>
- <key>CF$UID</key>
- <integer>79</integer>
- </dict>
- <key>NS.nan</key>
- <dict>
- <key>CF$UID</key>
- <integer>95</integer>
- </dict>
- <key>NS.negativeattrs</key>
- <dict>
- <key>CF$UID</key>
- <integer>0</integer>
- </dict>
- <key>NS.negativeformat</key>
- <dict>
- <key>CF$UID</key>
- <integer>93</integer>
- </dict>
- <key>NS.nil</key>
- <dict>
- <key>CF$UID</key>
- <integer>86</integer>
- </dict>
- <key>NS.positiveattrs</key>
- <dict>
- <key>CF$UID</key>
- <integer>0</integer>
- </dict>
- <key>NS.positiveformat</key>
- <dict>
- <key>CF$UID</key>
- <integer>81</integer>
- </dict>
- <key>NS.rounding</key>
- <dict>
- <key>CF$UID</key>
- <integer>0</integer>
- </dict>
- <key>NS.thousand</key>
- <dict>
- <key>CF$UID</key>
- <integer>94</integer>
- </dict>
- <key>NS.zero</key>
- <dict>
- <key>CF$UID</key>
- <integer>82</integer>
- </dict>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>97</integer>
- </dict>
- <key>NS.keys</key>
- <array>
- <dict>
- <key>CF$UID</key>
- <integer>67</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>68</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>69</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>70</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>71</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>72</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>73</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>74</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>75</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>76</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>77</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>78</integer>
- </dict>
- </array>
- <key>NS.objects</key>
- <array>
- <dict>
- <key>CF$UID</key>
- <integer>79</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>81</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>82</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>86</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>87</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>89</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>90</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>91</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>92</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>93</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>94</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>95</integer>
- </dict>
- </array>
- </dict>
- <string>minimum</string>
- <string>positiveFormat</string>
- <string>attributedStringForZero</string>
- <string>attributedStringForNil</string>
- <string>locale</string>
- <string>formatterBehavior</string>
- <string>decimalSeparator</string>
- <string>allowsFloats</string>
- <string>usesGroupingSeparator</string>
- <string>negativeFormat</string>
- <string>groupingSeparator</string>
- <string>attributedStringForNotANumber</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>80</integer>
- </dict>
- <key>NS.compact</key>
- <false/>
- <key>NS.exponent</key>
- <integer>0</integer>
- <key>NS.length</key>
- <integer>0</integer>
- <key>NS.mantissa</key>
- <data>
- AAAAAAAAAAAAAAAAAAAAAA==
- </data>
- <key>NS.mantissa.bo</key>
- <integer>1</integer>
- <key>NS.negative</key>
- <false/>
- </dict>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSDecimalNumberPlaceholder</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSDecimalNumberPlaceholder</string>
- </dict>
- <string>0</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>85</integer>
- </dict>
- <key>NSAttributes</key>
- <dict>
- <key>CF$UID</key>
- <integer>83</integer>
- </dict>
- <key>NSString</key>
- <dict>
- <key>CF$UID</key>
- <integer>81</integer>
- </dict>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>84</integer>
- </dict>
- <key>NS.keys</key>
- <array/>
- <key>NS.objects</key>
- <array/>
- </dict>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSDictionary</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSDictionary</string>
- </dict>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSAttributedString</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSAttributedString</string>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>85</integer>
- </dict>
- <key>NSString</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>88</integer>
- </dict>
- <key>NS.identifier</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- </dict>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSLocale</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSLocale</string>
- </dict>
- <integer>1000</integer>
- <string>.</string>
- <true/>
- <false/>
- <string>-0</string>
- <string>,</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>85</integer>
- </dict>
- <key>NSAttributes</key>
- <dict>
- <key>CF$UID</key>
- <integer>83</integer>
- </dict>
- <key>NSString</key>
- <dict>
- <key>CF$UID</key>
- <integer>96</integer>
- </dict>
- </dict>
- <string>NaN</string>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSMutableDictionary</string>
- <string>NSDictionary</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSMutableDictionary</string>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>80</integer>
- </dict>
- <key>NS.compact</key>
- <false/>
- <key>NS.exponent</key>
- <integer>0</integer>
- <key>NS.length</key>
- <integer>0</integer>
- <key>NS.mantissa</key>
- <data>
- AAAAAAAAAAAAAAAAAAAAAA==
- </data>
- <key>NS.mantissa.bo</key>
- <integer>1</integer>
- <key>NS.negative</key>
- <true/>
- </dict>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSNumberFormatter</string>
- <string>NSFormatter</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSNumberFormatter</string>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>102</integer>
- </dict>
- <key>NSCellFlags</key>
- <integer>67239424</integer>
- <key>NSCellFlags2</key>
- <integer>67108864</integer>
- <key>NSContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>101</integer>
- </dict>
- <key>NSSupport</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- </dict>
- <string>Competition code:</string>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSCell</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSCell</string>
- </dict>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSFormCell</string>
- <string>NSActionCell</string>
- <string>NSCell</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSFormCell</string>
- </dict>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSMutableArray</string>
- <string>NSArray</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSMutableArray</string>
- </dict>
- <string>{256, 22}</string>
- <string>{1, 8}</string>
- <string>NSActionCell</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>103</integer>
- </dict>
- <key>NSCellFlags</key>
- <integer>343014976</integer>
- <key>NSCellFlags2</key>
- <integer>205521920</integer>
- <key>NSContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <key>NSSupport</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- <key>NSTitleCell</key>
- <dict>
- <key>CF$UID</key>
- <integer>109</integer>
- </dict>
- <key>NSTitleWidth</key>
- <real>121</real>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>102</integer>
- </dict>
- <key>NSCellFlags</key>
- <integer>67239424</integer>
- <key>NSCellFlags2</key>
- <integer>67108864</integer>
- <key>NSContents</key>
- <dict>
- <key>CF$UID</key>
- <integer>110</integer>
- </dict>
- <key>NSSupport</key>
- <dict>
- <key>CF$UID</key>
- <integer>15</integer>
- </dict>
- </dict>
- <string>Field:</string>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>115</integer>
- </dict>
- <key>NSCatalogName</key>
- <dict>
- <key>CF$UID</key>
- <integer>112</integer>
- </dict>
- <key>NSColor</key>
- <dict>
- <key>CF$UID</key>
- <integer>114</integer>
- </dict>
- <key>NSColorName</key>
- <dict>
- <key>CF$UID</key>
- <in...
[truncated message content] |
|
From: <fr...@us...> - 2009-01-18 03:22:20
|
Revision: 592
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=592&view=rev
Author: fredm
Date: 2009-01-18 01:35:29 +0000 (Sun, 18 Jan 2009)
Log Message:
-----------
Change the keyboard viewer to a panel rather than a window so it doesn't block
Fuse from closing when quitting the emulator. Also make it resizable.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/KeyboardController.m
trunk/fuse/fusepb/nibs/Keyboard.nib/classes.nib
trunk/fuse/fusepb/nibs/Keyboard.nib/info.nib
trunk/fuse/fusepb/nibs/Keyboard.nib/keyedobjects.nib
Modified: trunk/fuse/fusepb/controllers/KeyboardController.m
===================================================================
--- trunk/fuse/fusepb/controllers/KeyboardController.m 2009-01-15 20:42:25 UTC (rev 591)
+++ trunk/fuse/fusepb/controllers/KeyboardController.m 2009-01-18 01:35:29 UTC (rev 592)
@@ -62,6 +62,12 @@
[super dealloc];
}
+-(void) awakeFromNib
+{
+ /* keep the window in the standard aspect ratio if the user resizes */
+ [[self window] setContentAspectRatio:NSMakeSize(541.0,201.0)];
+}
+
- (void)showWindow:(id)sender
{
[super showWindow:sender];
Modified: trunk/fuse/fusepb/nibs/Keyboard.nib/classes.nib
===================================================================
--- trunk/fuse/fusepb/nibs/Keyboard.nib/classes.nib 2009-01-15 20:42:25 UTC (rev 591)
+++ trunk/fuse/fusepb/nibs/Keyboard.nib/classes.nib 2009-01-18 01:35:29 UTC (rev 592)
@@ -1,12 +1,39 @@
-{
- IBClasses = (
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {
- CLASS = KeyboardController;
- LANGUAGE = ObjC;
- OUTLETS = {keyboardView = NSImageView; };
- SUPERCLASS = NSWindowController;
- }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>showCloseWindow</key>
+ <string>id</string>
+ <key>showWindow</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>KeyboardController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>keyboardView</key>
+ <string>NSImageView</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Modified: trunk/fuse/fusepb/nibs/Keyboard.nib/info.nib
===================================================================
--- trunk/fuse/fusepb/nibs/Keyboard.nib/info.nib 2009-01-15 20:42:25 UTC (rev 591)
+++ trunk/fuse/fusepb/nibs/Keyboard.nib/info.nib 2009-01-18 01:35:29 UTC (rev 592)
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>IBDocumentLocation</key>
- <string>153 73 356 240 0 0 1152 746 </string>
<key>IBFramework Version</key>
- <string>349.0</string>
+ <string>672</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../Fuse.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>5</integer>
+ <integer>15</integer>
</array>
<key>IBSystem Version</key>
- <string>7D24</string>
+ <string>9G55</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
Modified: trunk/fuse/fusepb/nibs/Keyboard.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2009-02-04 12:14:20
|
Revision: 594
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=594&view=rev
Author: fredm
Date: 2009-02-04 11:40:57 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
Add pause menu option.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
Modified: trunk/fuse/fusepb/controllers/FuseController.h
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.h 2009-01-18 01:44:51 UTC (rev 593)
+++ trunk/fuse/fusepb/controllers/FuseController.h 2009-02-04 11:40:57 UTC (rev 594)
@@ -66,6 +66,7 @@
IBOutlet NSMenuItem *simple8Bit;
IBOutlet NSMenuItem *zxatasp;
IBOutlet NSMenuItem *zxcf;
+ IBOutlet NSMenuItem *pause;
IBOutlet NSMenuItem *tapePlay;
IBOutlet NSMenuItem *tapeRecord;
IBOutlet NSMenu *recentSnaps;
@@ -115,6 +116,7 @@
- (IBAction)nmi:(id)sender;
- (IBAction)open:(id)sender;
- (IBAction)open_screen:(id)sender;
+- (IBAction)pause:(id)sender;
- (IBAction)profiler_start:(id)sender;
- (IBAction)profiler_stop:(id)sender;
- (IBAction)psg_start:(id)sender;
@@ -226,6 +228,7 @@
- (void)setDiskState:(NSNumber*)state;
- (void)setTapeState:(NSNumber*)state;
- (void)setMdrState:(NSNumber*)state;
+- (void)setPauseState;
- (void)showAlertPanel:(NSString*)message;
- (void)showCriticalAlertPanel:(NSString*)message;
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2009-01-18 01:44:51 UTC (rev 593)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2009-02-04 11:40:57 UTC (rev 594)
@@ -30,6 +30,7 @@
#include <string.h>
#include <ctype.h>
+#import "DebuggerController.h"
#import "FuseController.h"
#import "KeyboardController.h"
#import "LoadBinaryController.h"
@@ -42,6 +43,7 @@
#import "DisplayOpenGLView.h"
+#include "debugger/debugger.h"
#include "event.h"
#include "fuse.h"
#include "if1.h"
@@ -52,6 +54,7 @@
#include "settings_cocoa.h"
#include "snapshot.h"
#include "tape.h"
+#include "timer.h"
#include "ui.h"
#include "uidisplay.h"
#include "utils.h"
@@ -99,6 +102,9 @@
static int profileStop = 0;
static int playTape = 1;
+/* True if we were paused via the Machine/Pause menu item */
+static int paused = 0;
+
static NSMutableArray *allFileTypes = nil;
static NSMutableArray *dckFileTypes = nil;
static NSMutableArray *ideFileTypes = nil;
@@ -670,6 +676,31 @@
[[DisplayOpenGLView instance] unpause];
}
+- (IBAction)pause:(id)sender
+{
+ int error;
+
+ if( paused ) {
+ paused = 0;
+ ui_statusbar_update( UI_STATUSBAR_ITEM_PAUSED,
+ UI_STATUSBAR_STATE_INACTIVE );
+ timer_estimate_reset();
+ [[DisplayOpenGLView instance] unpause];
+ } else {
+ [[DisplayOpenGLView instance] pause];
+
+ /* Stop recording any competition mode RZX file */
+ if( rzx_recording && rzx_competition_mode ) {
+ ui_error( UI_ERROR_INFO, "Stopping competition mode RZX recording" );
+ error = rzx_stop_recording(); if( error ) return;
+ }
+
+ paused = 1;
+ ui_statusbar_update( UI_STATUSBAR_ITEM_PAUSED, UI_STATUSBAR_STATE_ACTIVE );
+ }
+ [self setPauseState];
+}
+
- (IBAction)profiler_start:(id)sender
{
[[DisplayOpenGLView instance] profileStart];
@@ -821,7 +852,14 @@
- (IBAction)cocoa_break:(id)sender
{
- [[DisplayOpenGLView instance] cocoaBreak];
+ if ( paused ) {
+ debugger_mode = DEBUGGER_MODE_HALTED;
+ paused = 0;
+ [[DebuggerController singleton] debugger_activate:nil];
+ } else {
+ [[DisplayOpenGLView instance] cocoaBreak];
+ }
+ [self setPauseState];
}
- (IBAction)showRollbackPane:(id)sender
@@ -1644,6 +1682,11 @@
{
}
+- (void)setPauseState
+{
+ [pause setTitle:paused ? @"Resume" : @"Pause"];
+}
+
- (void)showAlertPanel:(NSString*)message
{
NSRunAlertPanel(@"Fuse - Info", message, nil, nil, nil);
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib 2009-01-18 01:44:51 UTC (rev 593)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib 2009-02-04 11:40:57 UTC (rev 594)
@@ -1,125 +1,246 @@
-{
- IBClasses = (
- {
- ACTIONS = {
- fullscreen = id;
- zoom = id;
- };
- CLASS = DisplayOpenGLView;
- LANGUAGE = ObjC;
- SUPERCLASS = NSOpenGLView;
- },
- {
- CLASS = FirstResponder;
- LANGUAGE = ObjC;
- SUPERCLASS = NSObject;
- },
- {
- ACTIONS = {
- "cocoa_break" = id;
- "disk_eject_a" = id;
- "disk_eject_b" = id;
- "disk_eject_write_a" = id;
- "disk_eject_write_b" = id;
- "disk_new_a" = id;
- "disk_new_b" = id;
- "disk_open_a" = id;
- "disk_open_b" = id;
- "disk_write_protect_a" = id;
- "disk_write_protect_b" = id;
- "dock_eject" = id;
- "dock_open" = id;
- "export_screen" = id;
- fullscreen = id;
- "hard_reset" = id;
- help = id;
- hide = id;
- "ide_commit" = id;
- "ide_eject" = id;
- "ide_insert" = id;
- "if2_eject" = id;
- "if2_open" = id;
- "joystick_keyboard" = id;
- "mdr_eject" = id;
- "mdr_eject_write" = id;
- "mdr_insert" = id;
- "mdr_insert_new" = id;
- "mdr_writep" = id;
- nmi = id;
- open = id;
- openRecent = id;
- "open_screen" = id;
- "profiler_start" = id;
- "profiler_stop" = id;
- "psg_start" = id;
- "psg_stop" = id;
- quit = id;
- reset = id;
- resetUserDefaults = id;
- "rzx_insert_snap" = id;
- "rzx_play" = id;
- "rzx_rollback" = id;
- "rzx_start" = id;
- "rzx_start_snap" = id;
- "rzx_stop" = id;
- saveFileTypeClicked = id;
- "save_as" = id;
- "save_options" = id;
- "save_screen" = id;
- showKeyboardPane = id;
- showLoadBinaryPane = id;
- showMemoryBrowserPane = id;
- showPokeFinderPane = id;
- showPreferencesPane = id;
- showRollbackPane = id;
- showSaveBinaryPane = id;
- showTapeBrowserPane = id;
- "tape_clear" = id;
- "tape_open" = id;
- "tape_play" = id;
- "tape_record" = id;
- "tape_rewind" = id;
- "tape_write" = id;
- };
- CLASS = FuseController;
- LANGUAGE = ObjC;
- OUTLETS = {
- cart = NSMenuItem;
- disk = NSMenuItem;
- diskPlus3 = NSMenuItem;
- diskPlus3WpA = NSMenuItem;
- diskPlus3WpB = NSMenuItem;
- diskPlusD = NSMenuItem;
- diskPlusDWpA = NSMenuItem;
- diskPlusDWpB = NSMenuItem;
- diskTrDos = NSMenuItem;
- diskTrDosWpA = NSMenuItem;
- diskTrDosWpB = NSMenuItem;
- divide = NSMenuItem;
- dock = NSMenuItem;
- ide = NSMenuItem;
- if1 = NSMenuItem;
- if1Wp1 = NSMenuItem;
- if1Wp2 = NSMenuItem;
- if1Wp3 = NSMenuItem;
- if1Wp4 = NSMenuItem;
- if1Wp5 = NSMenuItem;
- if1Wp6 = NSMenuItem;
- if1Wp7 = NSMenuItem;
- if1Wp8 = NSMenuItem;
- if2 = NSMenuItem;
- recentSnaps = NSMenu;
- saveFileType = NSPopUpButton;
- savePanelAccessoryView = id;
- simple8Bit = NSMenuItem;
- tapePlay = NSMenuItem;
- tapeRecord = NSMenuItem;
- window = NSWindow;
- zxatasp = NSMenuItem;
- zxcf = NSMenuItem;
- };
- SUPERCLASS = NSObject;
- }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>fullscreen</key>
+ <string>id</string>
+ <key>zoom</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>DisplayOpenGLView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSOpenGLView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>cocoa_break</key>
+ <string>id</string>
+ <key>disk_eject_a</key>
+ <string>id</string>
+ <key>disk_eject_b</key>
+ <string>id</string>
+ <key>disk_eject_write_a</key>
+ <string>id</string>
+ <key>disk_eject_write_b</key>
+ <string>id</string>
+ <key>disk_new_a</key>
+ <string>id</string>
+ <key>disk_new_b</key>
+ <string>id</string>
+ <key>disk_open_a</key>
+ <string>id</string>
+ <key>disk_open_b</key>
+ <string>id</string>
+ <key>disk_write_protect_a</key>
+ <string>id</string>
+ <key>disk_write_protect_b</key>
+ <string>id</string>
+ <key>dock_eject</key>
+ <string>id</string>
+ <key>dock_open</key>
+ <string>id</string>
+ <key>export_screen</key>
+ <string>id</string>
+ <key>fullscreen</key>
+ <string>id</string>
+ <key>hard_reset</key>
+ <string>id</string>
+ <key>help</key>
+ <string>id</string>
+ <key>hide</key>
+ <string>id</string>
+ <key>ide_commit</key>
+ <string>id</string>
+ <key>ide_eject</key>
+ <string>id</string>
+ <key>ide_insert</key>
+ <string>id</string>
+ <key>if2_eject</key>
+ <string>id</string>
+ <key>if2_open</key>
+ <string>id</string>
+ <key>joystick_keyboard</key>
+ <string>id</string>
+ <key>mdr_eject</key>
+ <string>id</string>
+ <key>mdr_eject_write</key>
+ <string>id</string>
+ <key>mdr_insert</key>
+ <string>id</string>
+ <key>mdr_insert_new</key>
+ <string>id</string>
+ <key>mdr_writep</key>
+ <string>id</string>
+ <key>nmi</key>
+ <string>id</string>
+ <key>open</key>
+ <string>id</string>
+ <key>openRecent</key>
+ <string>id</string>
+ <key>open_screen</key>
+ <string>id</string>
+ <key>pause</key>
+ <string>id</string>
+ <key>profiler_start</key>
+ <string>id</string>
+ <key>profiler_stop</key>
+ <string>id</string>
+ <key>psg_start</key>
+ <string>id</string>
+ <key>psg_stop</key>
+ <string>id</string>
+ <key>quit</key>
+ <string>id</string>
+ <key>reset</key>
+ <string>id</string>
+ <key>resetUserDefaults</key>
+ <string>id</string>
+ <key>rzx_insert_snap</key>
+ <string>id</string>
+ <key>rzx_play</key>
+ <string>id</string>
+ <key>rzx_rollback</key>
+ <string>id</string>
+ <key>rzx_start</key>
+ <string>id</string>
+ <key>rzx_start_snap</key>
+ <string>id</string>
+ <key>rzx_stop</key>
+ <string>id</string>
+ <key>saveFileTypeClicked</key>
+ <string>id</string>
+ <key>save_as</key>
+ <string>id</string>
+ <key>save_options</key>
+ <string>id</string>
+ <key>save_screen</key>
+ <string>id</string>
+ <key>showKeyboardPane</key>
+ <string>id</string>
+ <key>showLoadBinaryPane</key>
+ <string>id</string>
+ <key>showMemoryBrowserPane</key>
+ <string>id</string>
+ <key>showPokeFinderPane</key>
+ <string>id</string>
+ <key>showPreferencesPane</key>
+ <string>id</string>
+ <key>showRollbackPane</key>
+ <string>id</string>
+ <key>showSaveBinaryPane</key>
+ <string>id</string>
+ <key>showTapeBrowserPane</key>
+ <string>id</string>
+ <key>tape_clear</key>
+ <string>id</string>
+ <key>tape_open</key>
+ <string>id</string>
+ <key>tape_play</key>
+ <string>id</string>
+ <key>tape_record</key>
+ <string>id</string>
+ <key>tape_rewind</key>
+ <string>id</string>
+ <key>tape_write</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>FuseController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>cart</key>
+ <string>NSMenuItem</string>
+ <key>disk</key>
+ <string>NSMenuItem</string>
+ <key>diskPlus3</key>
+ <string>NSMenuItem</string>
+ <key>diskPlus3WpA</key>
+ <string>NSMenuItem</string>
+ <key>diskPlus3WpB</key>
+ <string>NSMenuItem</string>
+ <key>diskPlusD</key>
+ <string>NSMenuItem</string>
+ <key>diskPlusDWpA</key>
+ <string>NSMenuItem</string>
+ <key>diskPlusDWpB</key>
+ <string>NSMenuItem</string>
+ <key>diskTrDos</key>
+ <string>NSMenuItem</string>
+ <key>diskTrDosWpA</key>
+ <string>NSMenuItem</string>
+ <key>diskTrDosWpB</key>
+ <string>NSMenuItem</string>
+ <key>divide</key>
+ <string>NSMenuItem</string>
+ <key>dock</key>
+ <string>NSMenuItem</string>
+ <key>ide</key>
+ <string>NSMenuItem</string>
+ <key>if1</key>
+ <string>NSMenuItem</string>
+ <key>if1Wp1</key>
+ <string>NSMenuItem</string>
+ <key>if1Wp2</key>
+ <string>NSMenuItem</string>
+ <key>if1Wp3</key>
+ <string>NSMenuItem</string>
+ <key>if1Wp4</key>
+ <string>NSMenuItem</string>
+ <key>if1Wp5</key>
+ <string>NSMenuItem</string>
+ <key>if1Wp6</key>
+ <string>NSMenuItem</string>
+ <key>if1Wp7</key>
+ <string>NSMenuItem</string>
+ <key>if1Wp8</key>
+ <string>NSMenuItem</string>
+ <key>if2</key>
+ <string>NSMenuItem</string>
+ <key>pause</key>
+ <string>NSMenuItem</string>
+ <key>recentSnaps</key>
+ <string>NSMenu</string>
+ <key>saveFileType</key>
+ <string>NSPopUpButton</string>
+ <key>savePanelAccessoryView</key>
+ <string>id</string>
+ <key>simple8Bit</key>
+ <string>NSMenuItem</string>
+ <key>tapePlay</key>
+ <string>NSMenuItem</string>
+ <key>tapeRecord</key>
+ <string>NSMenuItem</string>
+ <key>window</key>
+ <string>NSWindow</string>
+ <key>zxatasp</key>
+ <string>NSMenuItem</string>
+ <key>zxcf</key>
+ <string>NSMenuItem</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib 2009-01-18 01:44:51 UTC (rev 593)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib 2009-02-04 11:40:57 UTC (rev 594)
@@ -2,21 +2,20 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>IBDocumentLocation</key>
- <string>998 637 356 240 0 0 1440 878 </string>
- <key>IBEditorPositions</key>
- <dict>
- <key>29</key>
- <string>201 691 392 44 0 0 1440 878 </string>
- </dict>
<key>IBFramework Version</key>
- <string>489.0</string>
+ <string>672</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../Fuse.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
<integer>877</integer>
- <integer>29</integer>
+ <integer>323</integer>
</array>
<key>IBSystem Version</key>
- <string>9C7010</string>
+ <string>9G55</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2009-06-13 13:22:56
|
Revision: 596
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=596&view=rev
Author: fredm
Date: 2009-06-13 13:22:52 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
Fix mass storage preference setting.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/PreferencesController.m
trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib
trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
Modified: trunk/fuse/fusepb/controllers/PreferencesController.m
===================================================================
--- trunk/fuse/fusepb/controllers/PreferencesController.m 2009-03-15 11:34:01 UTC (rev 595)
+++ trunk/fuse/fusepb/controllers/PreferencesController.m 2009-06-13 13:22:52 UTC (rev 596)
@@ -336,6 +336,7 @@
settings_current.zxcf_active = 0;
settings_current.divide_enabled = 0;
settings_current.plusd = 0;
+ settings_current.beta128 = 0;
// Read mass storage type box and set text boxes appropriately
switch( [[massStorageType selectedCell] tag] ) {
@@ -372,6 +373,9 @@
[currentValues setObject:[NSNumber numberWithBool:settings_current.zxcf_active ? YES : NO] forKey:@"zxcf"];
[currentValues setObject:[NSNumber numberWithBool:settings_current.divide_enabled ? YES : NO] forKey:@"divide"];
[currentValues setObject:[NSNumber numberWithBool:settings_current.plusd ? YES : NO] forKey:@"plusd"];
+ [currentValues setObject:[NSNumber numberWithBool:settings_current.beta128 ? YES : NO] forKey:@"beta128"];
+
+ [currentValues synchronize];
}
- (IBAction)selectPrefPanel:(id)item
Modified: trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib
===================================================================
--- trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib 2009-03-15 11:34:01 UTC (rev 595)
+++ trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib 2009-06-13 13:22:52 UTC (rev 596)
@@ -2,15 +2,14 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9G55</string>
+ <string key="IBDocument.SystemVersion">9J61</string>
<string key="IBDocument.InterfaceBuilderVersion">672</string>
- <string key="IBDocument.AppKitVersion">949.43</string>
+ <string key="IBDocument.AppKitVersion">949.46</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="6"/>
- <integer value="1634"/>
- <integer value="1686"/>
+ <integer value="1434"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -498,7 +497,7 @@
<string>-#,##0.00</string>
<integer value="3" id="11"/>
<string>#,##0%</string>
- <integer value="1" id="5"/>
+ <integer value="1"/>
</object>
</object>
<string key="NS.positiveformat">#,##0%</string>
@@ -924,7 +923,7 @@
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="649138232">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1012,7 +1011,7 @@
<object class="NSMutableArray" key="NSCells">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButtonCell" id="949804708">
- <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">None</string>
<reference key="NSSupport" ref="447006373"/>
@@ -1316,7 +1315,7 @@
<int key="NSPeriodicInterval">75</int>
</object>
<object class="NSButtonCell" id="1012887743">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">+D</string>
<reference key="NSSupport" ref="447006373"/>
@@ -1348,7 +1347,7 @@
</object>
<string key="NSCellSize">{138, 18}</string>
<string key="NSIntercellSpacing">{4, 2}</string>
- <int key="NSMatrixFlags">1076363264</int>
+ <int key="NSMatrixFlags">1076371456</int>
<string key="NSCellClass">NSActionCell</string>
<object class="NSButtonCell" key="NSProtoCell" id="339918975">
<int key="NSCellFlags">67239424</int>
@@ -1467,7 +1466,8 @@
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
- <reference key="NSSelectedCell" ref="949804708"/>
+ <int key="NSSelectedRow">6</int>
+ <reference key="NSSelectedCell" ref="1012887743"/>
<reference key="NSBackgroundColor" ref="519317542"/>
<reference key="NSCellBackgroundColor" ref="70288484"/>
<reference key="NSFont" ref="447006373"/>
@@ -1857,6 +1857,7 @@
</object>
</object>
<string key="NSFrameSize">{627, 357}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="76952719">
@@ -2610,7 +2611,7 @@
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="754180095">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2895,7 +2896,6 @@
</object>
<string key="NSFrame">{{1, 17}, {135, 285}}</string>
<reference key="NSSuperview" ref="566011316"/>
- <reference key="NSNextKeyView" ref="943696205"/>
<reference key="NSDocView" ref="943696205"/>
<object class="NSColor" key="NSBGColor" id="737258101">
<int key="NSColorSpace">6</int>
@@ -2933,7 +2933,6 @@
</object>
<string key="NSFrame">{{1, 0}, {135, 17}}</string>
<reference key="NSSuperview" ref="566011316"/>
- <reference key="NSNextKeyView" ref="553095130"/>
<reference key="NSDocView" ref="553095130"/>
<reference key="NSBGColor" ref="737258101"/>
<int key="NScvFlags">4</int>
@@ -2942,7 +2941,6 @@
</object>
<string key="NSFrame">{{-149, 171}, {137, 303}}</string>
<reference key="NSSuperview" ref="754180095"/>
- <reference key="NSNextKeyView" ref="282183276"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="21276403"/>
<reference key="NSHScroller" ref="566456437"/>
@@ -3309,7 +3307,6 @@
</object>
<string key="NSFrame">{{1, 17}, {135, 285}}</string>
<reference key="NSSuperview" ref="213294653"/>
- <reference key="NSNextKeyView" ref="968324611"/>
<reference key="NSDocView" ref="968324611"/>
<reference key="NSBGColor" ref="737258101"/>
<int key="NScvFlags">4</int>
@@ -3342,7 +3339,6 @@
</object>
<string key="NSFrame">{{1, 0}, {135, 17}}</string>
<reference key="NSSuperview" ref="213294653"/>
- <reference key="NSNextKeyView" ref="124993651"/>
<reference key="NSDocView" ref="124993651"/>
<reference key="NSBGColor" ref="737258101"/>
<int key="NScvFlags">4</int>
@@ -3351,7 +3347,6 @@
</object>
<string key="NSFrame">{{20, 20}, {137, 303}}</string>
<reference key="NSSuperview" ref="754180095"/>
- <reference key="NSNextKeyView" ref="213905161"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="206422628"/>
<reference key="NSHScroller" ref="805562937"/>
@@ -3460,11 +3455,10 @@
</object>
</object>
<string key="NSFrameSize">{627, 343}</string>
- <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="453171511">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -4003,7 +3997,6 @@
</object>
</object>
<string key="NSFrameSize">{627, 338}</string>
- <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="462167203">
@@ -4977,14 +4970,6 @@
<int key="connectionID">1431</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">massStorageTypeClicked:</string>
- <reference key="source" ref="363526684"/>
- <reference key="destination" ref="264588948"/>
- </object>
- <int key="connectionID">1473</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: values.zxataspupload</string>
<reference key="source" ref="239128066"/>
@@ -6480,13 +6465,77 @@
<string key="NSKeyPath">arrangedObjects.machine.machineName</string>
<object class="NSDictionary" key="NSOptions">
<string key="NS.key.0">NSConditionallySetsEditable</string>
- <reference key="NS.object.0" ref="5"/>
+ <reference key="NS.object.0" ref="9"/>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1822</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">massStorageTypeClicked:</string>
+ <reference key="source" ref="363526684"/>
+ <reference key="destination" ref="949804708"/>
+ </object>
+ <int key="connectionID">1823</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">massStorageTypeClicked:</string>
+ <reference key="source" ref="363526684"/>
+ <reference key="destination" ref="1035080357"/>
+ </object>
+ <int key="connectionID">1824</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">massStorageTypeClicked:</string>
+ <reference key="source" ref="363526684"/>
+ <reference key="destination" ref="225396391"/>
+ </object>
+ <int key="connectionID">1825</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">massStorageTypeClicked:</string>
+ <reference key="source" ref="363526684"/>
+ <reference key="destination" ref="264588948"/>
+ </object>
+ <int key="connectionID">1826</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">massStorageTypeClicked:</string>
+ <reference key="source" ref="363526684"/>
+ <reference key="destination" ref="644631450"/>
+ </object>
+ <int key="connectionID">1827</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">massStorageTypeClicked:</string>
+ <reference key="source" ref="363526684"/>
+ <reference key="destination" ref="501269470"/>
+ </object>
+ <int key="connectionID">1828</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">massStorageTypeClicked:</string>
+ <reference key="source" ref="363526684"/>
+ <reference key="destination" ref="1012887743"/>
+ </object>
+ <int key="connectionID">1829</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">massStorageTypeClicked:</string>
+ <reference key="source" ref="363526684"/>
+ <reference key="destination" ref="1030817909"/>
+ </object>
+ <int key="connectionID">1830</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -9254,7 +9303,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1822</int>
+ <int key="maxID">1830</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Modified: trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
===================================================================
--- trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2009-03-15 11:34:01 UTC (rev 595)
+++ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2009-06-13 13:22:52 UTC (rev 596)
@@ -1,294 +1,452 @@
bplist00\xD4 |
|
From: <fr...@us...> - 2009-07-05 08:47:37
|
Revision: 603
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=603&view=rev
Author: fredm
Date: 2009-07-05 08:47:36 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Collapse Media menu hierarchy, just have Tape, Disk A, Disk B, Master, Slave,
Microdrive 1 and 2 etc.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
Modified: trunk/fuse/fusepb/controllers/FuseController.h
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.h 2009-06-30 12:40:55 UTC (rev 602)
+++ trunk/fuse/fusepb/controllers/FuseController.h 2009-07-05 08:47:36 UTC (rev 603)
@@ -39,44 +39,20 @@
@interface FuseController : NSObject
{
- IBOutlet NSMenuItem *cart;
- IBOutlet NSMenuItem *dock;
- IBOutlet NSMenuItem *if1;
+ IBOutlet NSMenuItem *cartridge;
+ IBOutlet NSMenuItem *mdr1;
+ IBOutlet NSMenuItem *mdr2;
IBOutlet NSMenuItem *if1Wp1;
IBOutlet NSMenuItem *if1Wp2;
- IBOutlet NSMenuItem *if1Wp3;
- IBOutlet NSMenuItem *if1Wp4;
- IBOutlet NSMenuItem *if1Wp5;
- IBOutlet NSMenuItem *if1Wp6;
- IBOutlet NSMenuItem *if1Wp7;
- IBOutlet NSMenuItem *if1Wp8;
- IBOutlet NSMenuItem *if2;
- IBOutlet NSMenuItem *disk;
- IBOutlet NSMenuItem *diskPlus3;
- IBOutlet NSMenuItem *diskPlus3FlipA;
- IBOutlet NSMenuItem *diskPlus3WpA;
- IBOutlet NSMenuItem *diskPlus3B;
- IBOutlet NSMenuItem *diskPlus3FlipB;
- IBOutlet NSMenuItem *diskPlus3WpB;
- IBOutlet NSMenuItem *diskTrDos;
- IBOutlet NSMenuItem *diskTrDosA;
- IBOutlet NSMenuItem *diskTrDosWpA;
- IBOutlet NSMenuItem *diskTrDosFlipA;
- IBOutlet NSMenuItem *diskTrDosB;
- IBOutlet NSMenuItem *diskTrDosWpB;
- IBOutlet NSMenuItem *diskTrDosFlipB;
- IBOutlet NSMenuItem *diskPlusD;
- IBOutlet NSMenuItem *diskPlusDA;
- IBOutlet NSMenuItem *diskPlusDWpA;
- IBOutlet NSMenuItem *diskPlusDFlipA;
- IBOutlet NSMenuItem *diskPlusDB;
- IBOutlet NSMenuItem *diskPlusDWpB;
- IBOutlet NSMenuItem *diskPlusDFlipB;
- IBOutlet NSMenuItem *ide;
- IBOutlet NSMenuItem *divide;
+ IBOutlet NSMenuItem *diskA;
+ IBOutlet NSMenuItem *diskB;
+ IBOutlet NSMenuItem *diskFlipA;
+ IBOutlet NSMenuItem *diskWpA;
+ IBOutlet NSMenuItem *diskFlipB;
+ IBOutlet NSMenuItem *diskWpB;
+ IBOutlet NSMenuItem *ideMaster;
+ IBOutlet NSMenuItem *ideSlave;
IBOutlet NSMenuItem *simple8Bit;
- IBOutlet NSMenuItem *zxatasp;
- IBOutlet NSMenuItem *zxcf;
IBOutlet NSMenuItem *pause;
IBOutlet NSMenuItem *tapePlay;
IBOutlet NSMenuItem *tapeRecord;
@@ -112,6 +88,8 @@
- (IBAction)disk_flip_b:(id)sender;
- (IBAction)dock_eject:(id)sender;
- (IBAction)dock_open:(id)sender;
+- (IBAction)cart_eject:(id)sender;
+- (IBAction)cart_open:(id)sender;
- (IBAction)export_screen:(id)sender;
- (IBAction)fullscreen:(id)sender;
- (IBAction)hard_reset:(id)sender;
@@ -179,6 +157,10 @@
- (void)ui_menu_activate_media_cartridge_if2:(NSNumber*)active;
- (void)ui_menu_activate_media_cartridge_if2_eject:(NSNumber*)active;
- (void)ui_menu_activate_media_disk:(NSNumber*)active;
+- (void)ui_menu_activate_media_disk_a_flip;
+- (void)ui_menu_activate_media_disk_a_wp_set;
+- (void)ui_menu_activate_media_disk_b_flip;
+- (void)ui_menu_activate_media_disk_b_wp_set;
- (void)ui_menu_activate_media_disk_plus3:(NSNumber*)active;
- (void)ui_menu_activate_media_disk_plus3_a_eject:(NSNumber*)active;
- (void)ui_menu_activate_media_disk_plus3_a_flip:(NSNumber*)active;
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2009-06-30 12:40:55 UTC (rev 602)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2009-07-05 08:47:36 UTC (rev 603)
@@ -75,6 +75,18 @@
static int diskTrdosEjectB = 0;
static int diskPlusDEjectA = 0;
static int diskPlusDEjectB = 0;
+static BOOL diskPlus3FlipA = NO;
+static BOOL diskPlus3FlipB = NO;
+static BOOL diskTrDosFlipA = NO;
+static BOOL diskTrDosFlipB = NO;
+static BOOL diskPlusDFlipA = NO;
+static BOOL diskPlusDFlipB = NO;
+static BOOL diskPlus3WpA = NO;
+static BOOL diskPlus3WpB = NO;
+static BOOL diskTrDosWpA = NO;
+static BOOL diskTrDosWpB = NO;
+static BOOL diskPlusDWpA = NO;
+static BOOL diskPlusDWpB = NO;
static int record = 1;
static int recordFromSnapshot = 1;
static int play = 1;
@@ -311,6 +323,59 @@
[self newDisk:SPECPLUS3_DRIVE_B];
}
+- (IBAction)cart_eject:(id)sender
+{
+ [[DisplayOpenGLView instance] pause];
+
+ if ( libspectrum_machine_capabilities( machine_current->machine ) &
+ LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_DOCK ) {
+ [[DisplayOpenGLView instance] dckEject];
+ } else {
+ [[DisplayOpenGLView instance] if2Eject];
+ }
+
+ [[DisplayOpenGLView instance] unpause];
+}
+
+- (IBAction)cart_open:(id)sender
+{
+ int error;
+ char *filename = NULL;
+ NSArray *fileTypes;
+ NSString *message;
+
+ [[DisplayOpenGLView instance] pause];
+
+ if ( libspectrum_machine_capabilities( machine_current->machine ) &
+ LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_DOCK ) {
+ message = @"Insert Timex dock cartridge";
+ fileTypes = dckFileTypes;
+ } else {
+ message = @"Insert Interface II cartridge";
+ fileTypes = romFileTypes;
+ }
+
+ filename = cocoaui_openpanel_get_filename( message, fileTypes );
+
+ if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
+
+ if ( libspectrum_machine_capabilities( machine_current->machine ) &
+ LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_DOCK ) {
+ error = [[DisplayOpenGLView instance] dckInsert:filename];
+ } else {
+ error = [[DisplayOpenGLView instance] if2Insert:filename];
+ }
+
+ if(error) goto error;
+
+ [self addRecentSnapshot:filename];
+
+error:
+ free( filename );
+
+ [[DisplayOpenGLView instance] unpause];
+}
+
- (IBAction)dock_open:(id)sender
{
int error;
@@ -377,6 +442,7 @@
{
int error=0;
char *filename = NULL;
+ libspectrum_ide_unit unit;
[[DisplayOpenGLView instance] pause];
@@ -384,14 +450,16 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
- switch( [sender tag] ) {
- case 41: error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
- case 42: error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
- case 43: error = [[DisplayOpenGLView instance] zxataspInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
- case 44: error = [[DisplayOpenGLView instance] zxataspInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
- case 45: error = [[DisplayOpenGLView instance] zxcfInsert:filename]; break;
- case 46: error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
- case 47: error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
+ unit = [sender tag] == 41 ? LIBSPECTRUM_IDE_MASTER : LIBSPECTRUM_IDE_SLAVE;
+
+ if( settings_current.divide_enabled ) {
+ error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:unit];
+ } else if( settings_current.simpleide_active ) {
+ error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:unit];
+ } else if( settings_current.zxatasp_active ) {
+ error = [[DisplayOpenGLView instance] zxataspInsert:filename inUnit:unit];
+ } else if( settings_current.zxcf_active ) {
+ error = [[DisplayOpenGLView instance] zxcfInsert:filename];
}
if(error) goto error;
@@ -406,16 +474,20 @@
- (IBAction)ide_commit:(id)sender
{
+ libspectrum_ide_unit unit;
+
[[DisplayOpenGLView instance] pause];
- switch( [sender tag] ) {
- case 51: [[DisplayOpenGLView instance] simpleideCommit:LIBSPECTRUM_IDE_MASTER]; break;
- case 52: [[DisplayOpenGLView instance] simpleideCommit:LIBSPECTRUM_IDE_SLAVE]; break;
- case 53: [[DisplayOpenGLView instance] zxataspCommit:LIBSPECTRUM_IDE_MASTER]; break;
- case 54: [[DisplayOpenGLView instance] zxataspCommit:LIBSPECTRUM_IDE_SLAVE]; break;
- case 55: [[DisplayOpenGLView instance] zxcfCommit]; break;
- case 56: [[DisplayOpenGLView instance] divideCommit:LIBSPECTRUM_IDE_MASTER]; break;
- case 57: [[DisplayOpenGLView instance] divideCommit:LIBSPECTRUM_IDE_SLAVE]; break;
+ unit = [sender tag] == 51 ? LIBSPECTRUM_IDE_MASTER : LIBSPECTRUM_IDE_SLAVE;
+
+ if( settings_current.divide_enabled ) {
+ [[DisplayOpenGLView instance] divideCommit:unit];
+ } else if( settings_current.simpleide_active ) {
+ [[DisplayOpenGLView instance] simpleideCommit:unit];
+ } else if( settings_current.zxatasp_active ) {
+ [[DisplayOpenGLView instance] zxataspCommit:unit];
+ } else if( settings_current.zxcf_active ) {
+ [[DisplayOpenGLView instance] zxcfCommit];
}
[[DisplayOpenGLView instance] unpause];
@@ -423,14 +495,18 @@
- (IBAction)ide_eject:(id)sender
{
- switch( [sender tag] ) {
- case 61: [[DisplayOpenGLView instance] simpleideEject:LIBSPECTRUM_IDE_MASTER]; break;
- case 62: [[DisplayOpenGLView instance] simpleideEject:LIBSPECTRUM_IDE_SLAVE]; break;
- case 63: [[DisplayOpenGLView instance] zxataspEject:LIBSPECTRUM_IDE_MASTER]; break;
- case 64: [[DisplayOpenGLView instance] zxataspEject:LIBSPECTRUM_IDE_SLAVE]; break;
- case 65: [[DisplayOpenGLView instance] zxcfEject]; break;
- case 66: [[DisplayOpenGLView instance] divideEject:LIBSPECTRUM_IDE_MASTER]; break;
- case 67: [[DisplayOpenGLView instance] divideEject:LIBSPECTRUM_IDE_SLAVE]; break;
+ libspectrum_ide_unit unit;
+
+ unit = [sender tag] == 61 ? LIBSPECTRUM_IDE_MASTER : LIBSPECTRUM_IDE_SLAVE;
+
+ if( settings_current.divide_enabled ) {
+ [[DisplayOpenGLView instance] divideEject:unit];
+ } else if( settings_current.simpleide_active ) {
+ [[DisplayOpenGLView instance] simpleideEject:unit];
+ } else if( settings_current.zxatasp_active ) {
+ [[DisplayOpenGLView instance] zxataspEject:unit];
+ } else if( settings_current.zxcf_active ) {
+ [[DisplayOpenGLView instance] zxcfEject];
}
}
@@ -1026,23 +1102,22 @@
*-----------------------------------------------------------------------------*/
- (void) releaseKey:(int)keyCode
{
- NSEvent *event1;
- NSPoint point;
+ NSEvent *event1;
+ NSPoint point;
- event1 = [NSEvent keyEventWithType:NSKeyUp location:point modifierFlags:0
- timestamp:0 windowNumber:0 context:nil characters:@" "
- charactersIgnoringModifiers:@" " isARepeat:NO keyCode:keyCode];
- [NSApp postEvent:event1 atStart:NO];
+ event1 = [NSEvent keyEventWithType:NSKeyUp location:point modifierFlags:0
+ timestamp:0 windowNumber:0 context:nil characters:@" "
+ charactersIgnoringModifiers:@" " isARepeat:NO keyCode:keyCode];
+ [NSApp postEvent:event1 atStart:NO];
}
- (void)ui_menu_activate_media_cartridge:(NSNumber*)active
{
- [cart setEnabled:[active boolValue]];
+ [cartridge setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_cartridge_dock:(NSNumber*)active
{
- [dock setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_cartridge_dock_eject:(NSNumber*)active
@@ -1052,7 +1127,6 @@
- (void)ui_menu_activate_media_cartridge_if2:(NSNumber*)active
{
- [if2 setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_cartridge_if2_eject:(NSNumber*)active
@@ -1062,12 +1136,12 @@
- (void)ui_menu_activate_media_disk:(NSNumber*)active
{
- [disk setEnabled:[active boolValue]];
+ [diskA setEnabled:[active boolValue]];
+ [diskB setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_disk_plus3:(NSNumber*)active
{
- [diskPlus3 setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_disk_plus3_a_eject:(NSNumber*)active
@@ -1075,19 +1149,86 @@
diskPlus3EjectA = [active boolValue];
}
+- (void)ui_menu_activate_media_disk_a_flip
+{
+ bool newValue = NO;
+
+ if( !machine_current ) {
+ } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
+ newValue = diskPlus3FlipA;
+ } else if( periph_beta128_active ) {
+ newValue = diskTrDosFlipA;
+ } else {
+ newValue = diskPlusDFlipA;
+ }
+
+ [diskFlipA setState:!newValue];
+}
+
+- (void)ui_menu_activate_media_disk_b_flip
+{
+ bool newValue = NO;
+
+ if( !machine_current ) {
+ } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
+ newValue = diskPlus3FlipB;
+ } else if( periph_beta128_active ) {
+ newValue = diskTrDosFlipB;
+ } else {
+ newValue = diskPlusDFlipB;
+ }
+
+ [diskFlipB setState:!newValue];
+}
+
+- (void)ui_menu_activate_media_disk_a_wp_set
+{
+ bool newValue = NO;
+
+ if( !machine_current ) {
+ } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
+ newValue = diskPlus3WpA;
+ } else if( periph_beta128_active ) {
+ newValue = diskTrDosWpA;
+ } else {
+ newValue = diskPlusDWpA;
+ }
+
+ [diskWpA setState:newValue];
+}
+
+- (void)ui_menu_activate_media_disk_b_wp_set
+{
+ bool newValue = NO;
+
+ if( !machine_current ) {
+ } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
+ newValue = diskPlus3WpB;
+ } else if( periph_beta128_active ) {
+ newValue = diskTrDosWpB;
+ } else {
+ newValue = diskPlusDWpB;
+ }
+
+ [diskWpB setState:newValue];
+}
+
- (void)ui_menu_activate_media_disk_plus3_a_flip:(NSNumber*)active
{
- [diskPlus3FlipA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskPlus3FlipA = [active boolValue];
+
+ [self ui_menu_activate_media_disk_a_flip];
}
- (void)ui_menu_activate_media_disk_plus3_a_wp_set:(NSNumber*)active
{
- [diskPlus3WpA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskPlus3WpA = [active boolValue];
+
+ [self ui_menu_activate_media_disk_a_wp_set];
}
- (void)ui_menu_activate_media_disk_plus3_b:(NSNumber*)active
{
- [diskPlus3B setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_disk_plus3_b_eject:(NSNumber*)active
@@ -1097,22 +1238,24 @@
- (void)ui_menu_activate_media_disk_plus3_b_flip:(NSNumber*)active
{
- [diskPlus3FlipB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskPlus3FlipB = [active boolValue];
+
+ [self ui_menu_activate_media_disk_b_flip];
}
- (void)ui_menu_activate_media_disk_plus3_b_wp_set:(NSNumber*)active
{
- [diskPlus3WpB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskPlus3WpB = [active boolValue];
+
+ [self ui_menu_activate_media_disk_b_wp_set];
}
- (void)ui_menu_activate_media_disk_beta:(NSNumber*)active
{
- [diskTrDos setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_disk_beta_a:(NSNumber*)active
{
- [diskTrDosA setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_disk_beta_a_eject:(NSNumber*)active
@@ -1122,17 +1265,19 @@
- (void)ui_menu_activate_media_disk_beta_a_flip:(NSNumber*)active
{
- [diskTrDosFlipA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskTrDosFlipA = [active boolValue];
+ [self ui_menu_activate_media_disk_a_flip];
}
- (void)ui_menu_activate_media_disk_beta_a_wp_set:(NSNumber*)active
{
- [diskTrDosWpA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskTrDosWpA = [active boolValue];
+
+ [self ui_menu_activate_media_disk_a_wp_set];
}
- (void)ui_menu_activate_media_disk_beta_b:(NSNumber*)active
{
- [diskTrDosB setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_disk_beta_b_eject:(NSNumber*)active
@@ -1142,22 +1287,24 @@
- (void)ui_menu_activate_media_disk_beta_b_flip:(NSNumber*)active
{
- [diskTrDosFlipB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskTrDosFlipB = [active boolValue];
+
+ [self ui_menu_activate_media_disk_b_flip];
}
- (void)ui_menu_activate_media_disk_beta_b_wp_set:(NSNumber*)active
{
- [diskTrDosWpB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskTrDosWpB = [active boolValue];
+
+ [self ui_menu_activate_media_disk_b_wp_set];
}
- (void)ui_menu_activate_media_disk_plusd:(NSNumber*)active
{
- [diskPlusD setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_disk_plusd_a:(NSNumber*)active
{
- [diskPlusDA setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_disk_plusd_a_eject:(NSNumber*)active
@@ -1167,17 +1314,20 @@
- (void)ui_menu_activate_media_disk_plusd_a_flip:(NSNumber*)active
{
- [diskPlusDFlipA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskPlusDFlipA = [active boolValue];
+
+ [self ui_menu_activate_media_disk_a_flip];
}
- (void)ui_menu_activate_media_plusd_a_wp_set:(NSNumber*)active
{
- [diskPlusDWpA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskPlusDWpA = [active boolValue];
+
+ [self ui_menu_activate_media_disk_a_wp_set];
}
- (void)ui_menu_activate_media_disk_plusd_b:(NSNumber*)active
{
- [diskPlusDB setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_disk_plusd_b_eject:(NSNumber*)active
@@ -1187,22 +1337,26 @@
- (void)ui_menu_activate_media_disk_plusd_b_flip:(NSNumber*)active
{
- [diskPlusDFlipB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskPlusDFlipB = [active boolValue];
+
+ [self ui_menu_activate_media_disk_b_flip];
}
- (void)ui_menu_activate_media_plusd_b_wp_set:(NSNumber*)active
{
- [diskPlusDWpB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+ diskPlusDWpB = [active boolValue];
+
+ [self ui_menu_activate_media_disk_b_wp_set];
}
- (void)ui_menu_activate_media_ide:(NSNumber*)active
{
- [ide setEnabled:[active boolValue]];
+ [ideMaster setEnabled:[active boolValue]];
+ [ideSlave setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_ide_divide:(NSNumber*)active
{
- [divide setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_ide_divide_master_eject:(NSNumber*)active
@@ -1217,7 +1371,6 @@
- (void)ui_menu_activate_media_ide_simple8bit:(NSNumber*)active
{
- [simple8Bit setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_ide_simple8bit_master_eject:(NSNumber*)active
@@ -1232,7 +1385,6 @@
- (void)ui_menu_activate_media_ide_zxatasp:(NSNumber*)active
{
- [zxatasp setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_ide_zxatasp_master_eject:(NSNumber*)active
@@ -1247,7 +1399,6 @@
- (void)ui_menu_activate_media_ide_zxcf:(NSNumber*)active
{
- [zxcf setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_ide_zxcf_eject:(NSNumber*)active
@@ -1257,7 +1408,8 @@
- (void)ui_menu_activate_media_if1:(NSNumber*)active
{
- [if1 setEnabled:[active boolValue]];
+ [mdr1 setEnabled:[active boolValue]];
+ [mdr2 setEnabled:[active boolValue]];
}
- (void)ui_menu_activate_media_if1_m1_eject:(NSNumber*)active
@@ -1287,7 +1439,6 @@
- (void)ui_menu_activate_media_if1_m3_wp_set:(NSNumber*)active
{
- [if1Wp3 setState:[active boolValue] == YES ? NSOffState : NSOnState];
}
- (void)ui_menu_activate_media_if1_m4_eject:(NSNumber*)active
@@ -1297,7 +1448,6 @@
- (void)ui_menu_activate_media_if1_m4_wp_set:(NSNumber*)active
{
- [if1Wp4 setState:[active boolValue] == YES ? NSOffState : NSOnState];
}
- (void)ui_menu_activate_media_if1_m5_eject:(NSNumber*)active
@@ -1307,7 +1457,6 @@
- (void)ui_menu_activate_media_if1_m5_wp_set:(NSNumber*)active
{
- [if1Wp5 setState:[active boolValue] == YES ? NSOffState : NSOnState];
}
- (void)ui_menu_activate_media_if1_m6_eject:(NSNumber*)active
@@ -1317,7 +1466,6 @@
- (void)ui_menu_activate_media_if1_m6_wp_set:(NSNumber*)active
{
- [if1Wp6 setState:[active boolValue] == YES ? NSOffState : NSOnState];
}
- (void)ui_menu_activate_media_if1_m7_eject:(NSNumber*)active
@@ -1327,7 +1475,6 @@
- (void)ui_menu_activate_media_if1_m7_wp_set:(NSNumber*)active
{
- [if1Wp7 setState:[active boolValue] == YES ? NSOffState : NSOnState];
}
- (void)ui_menu_activate_media_if1_m8_eject:(NSNumber*)active
@@ -1337,7 +1484,6 @@
- (void)ui_menu_activate_media_if1_m8_wp_set:(NSNumber*)active
{
- [if1Wp8 setState:[active boolValue] == YES ? NSOffState : NSOnState];
}
- (void)ui_menu_activate_recording:(NSNumber*)active
@@ -1382,42 +1528,6 @@
case 3:
return stopPsg == 0 ? NO : YES;
break;
- case 4:
- case 10:
- case 28:
- case 40:
- return diskPlus3EjectA == 0 ? NO : YES;
- break;
- case 5:
- case 11:
- case 29:
- case 41:
- return diskPlus3EjectB == 0 ? NO : YES;
- break;
- case 13:
- case 14:
- case 27:
- case 42:
- return diskTrdosEjectA == 0 ? NO : YES;
- break;
- case 15:
- case 16:
- case 26:
- case 43:
- return diskTrdosEjectB == 0 ? NO : YES;
- break;
- case 20:
- case 21:
- case 24:
- case 44:
- return diskPlusDEjectA == 0 ? NO : YES;
- break;
- case 22:
- case 23:
- case 25:
- case 45:
- return diskPlusDEjectB == 0 ? NO : YES;
- break;
case 6:
return record == 0 ? NO : YES;
break;
@@ -1523,6 +1633,18 @@
case 144:
return if1M8Eject == 0 ? NO : YES;
break;
+ case 150:
+ case 151:
+ case 152:
+ case 153:
+ return diskPlus3EjectA || diskTrdosEjectA || diskPlusDEjectA ? YES : NO;
+ break;
+ case 160:
+ case 161:
+ case 162:
+ case 163:
+ return diskPlus3EjectB || diskTrdosEjectB || diskPlusDEjectB ? YES : NO;
+ break;
default:
return YES;
}
@@ -2272,7 +2394,6 @@
break;
case UI_MENU_ITEM_MEDIA_DISK_PLUS3:
- method = @selector(ui_menu_activate_media_disk_plus3:);
break;
case UI_MENU_ITEM_MEDIA_DISK_PLUS3_A_EJECT:
@@ -2288,7 +2409,6 @@
break;
case UI_MENU_ITEM_MEDIA_DISK_PLUS3_B:
- method = @selector(ui_menu_activate_media_disk_plus3_b:);
break;
case UI_MENU_ITEM_MEDIA_DISK_PLUS3_B_EJECT:
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib 2009-06-30 12:40:55 UTC (rev 602)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib 2009-07-05 08:47:36 UTC (rev 603)
@@ -30,6 +30,10 @@
<dict>
<key>ACTIONS</key>
<dict>
+ <key>cart_eject</key>
+ <string>id</string>
+ <key>cart_open</key>
+ <string>id</string>
<key>cocoa_break</key>
<string>id</string>
<key>disk_eject_a</key>
@@ -171,76 +175,32 @@
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
- <key>cart</key>
+ <key>cartridge</key>
<string>NSMenuItem</string>
- <key>disk</key>
+ <key>diskA</key>
<string>NSMenuItem</string>
- <key>diskPlus3</key>
+ <key>diskB</key>
<string>NSMenuItem</string>
- <key>diskPlus3B</key>
+ <key>diskFlipA</key>
<string>NSMenuItem</string>
- <key>diskPlus3FlipA</key>
+ <key>diskFlipB</key>
<string>NSMenuItem</string>
- <key>diskPlus3FlipB</key>
+ <key>diskWpA</key>
<string>NSMenuItem</string>
- <key>diskPlus3WpA</key>
+ <key>diskWpB</key>
<string>NSMenuItem</string>
- <key>diskPlus3WpB</key>
+ <key>ideMaster</key>
<string>NSMenuItem</string>
- <key>diskPlusD</key>
+ <key>ideSlave</key>
<string>NSMenuItem</string>
- <key>diskPlusDA</key>
- <string>NSMenuItem</string>
- <key>diskPlusDB</key>
- <string>NSMenuItem</string>
- <key>diskPlusDFlipA</key>
- <string>NSMenuItem</string>
- <key>diskPlusDFlipB</key>
- <string>NSMenuItem</string>
- <key>diskPlusDWpA</key>
- <string>NSMenuItem</string>
- <key>diskPlusDWpB</key>
- <string>NSMenuItem</string>
- <key>diskTrDos</key>
- <string>NSMenuItem</string>
- <key>diskTrDosA</key>
- <string>NSMenuItem</string>
- <key>diskTrDosB</key>
- <string>NSMenuItem</string>
- <key>diskTrDosFlipA</key>
- <string>NSMenuItem</string>
- <key>diskTrDosFlipB</key>
- <string>NSMenuItem</string>
- <key>diskTrDosWpA</key>
- <string>NSMenuItem</string>
- <key>diskTrDosWpB</key>
- <string>NSMenuItem</string>
- <key>divide</key>
- <string>NSMenuItem</string>
- <key>dock</key>
- <string>NSMenuItem</string>
- <key>ide</key>
- <string>NSMenuItem</string>
- <key>if1</key>
- <string>NSMenuItem</string>
<key>if1Wp1</key>
<string>NSMenuItem</string>
<key>if1Wp2</key>
<string>NSMenuItem</string>
- <key>if1Wp3</key>
+ <key>mdr1</key>
<string>NSMenuItem</string>
- <key>if1Wp4</key>
+ <key>mdr2</key>
<string>NSMenuItem</string>
- <key>if1Wp5</key>
- <string>NSMenuItem</string>
- <key>if1Wp6</key>
- <string>NSMenuItem</string>
- <key>if1Wp7</key>
- <string>NSMenuItem</string>
- <key>if1Wp8</key>
- <string>NSMenuItem</string>
- <key>if2</key>
- <string>NSMenuItem</string>
<key>pause</key>
<string>NSMenuItem</string>
<key>recentSnaps</key>
@@ -257,10 +217,6 @@
<string>NSMenuItem</string>
<key>window</key>
<string>NSWindow</string>
- <key>zxatasp</key>
- <string>NSMenuItem</string>
- <key>zxcf</key>
- <string>NSMenuItem</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib 2009-06-30 12:40:55 UTC (rev 602)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib 2009-07-05 08:47:36 UTC (rev 603)
@@ -11,7 +11,7 @@
<key>IBOpenObjects</key>
<array>
<integer>877</integer>
- <integer>695</integer>
+ <integer>527</integer>
</array>
<key>IBSystem Version</key>
<string>9J61</string>
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2009-07-05 12:10:30
|
Revision: 604
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=604&view=rev
Author: fredm
Date: 2009-07-05 12:10:29 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Update version strings and changelog for beta 20090705.
Modified Paths:
--------------
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2009-07-05 08:47:36 UTC (rev 603)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2009-07-05 12:10:29 UTC (rev 604)
@@ -476,11 +476,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.10.0</string>
+ <string>20090605</string>
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>0.10.0</string>
+ <string>20090605</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2009-07-05 08:47:36 UTC (rev 603)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2009-07-05 12:10:29 UTC (rev 604)
@@ -14,89 +14,82 @@
name="What's New In Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 0.10.0 of the Fuse emulator." --></font><br>
<div class="refsect1" xml:lang="en" lang="en">
<h2><font face="Lucida Grande,Helvetica,Arial">What's new in Fuse
-For Mac OS X 0.10.0</font></h2>
+For Mac OS X Beta 20090605</font></h2>
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">New
features:</font></li>
<li
style="list-style-type: none; list-style-image: none; list-style-position: outside;">
<ul>
- <li><font face="Lucida Grande,Helvetica,Arial">New upd765 FDC
-emulation; all known +3 DSK images now work (Gergely Szasz; thanks to
-Simon Owen for expert technical advice).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Loading
-acceleration (Philip Kendall).<br>
+ <li><font face="Lucida Grande,Helvetica,Arial">Add support for
+flipping disk images in single sided drives (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Add support for
+automatically merging both both disk images where they are in separate
+files named with the text [Ss]ide[ _][abAB12] (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Switch to using
+Blip_Buffer (by Shay Green) for improved beeper and AY output (Fredrick
+Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Enable Beta 128
+interface in 48K and TC2048 machines (thanks, Omikron) (Fredrick
+Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Add emulation of
+the Fuller Audio Box (Stuart Brady & Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Allow sound to run
+from 2% speed up (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Add emulation of
+the Melodik and similar 48K-compatible AY interfaces that use the 128K
+sound ports (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Add support for
+Pentagon 1024SL v2.2 16 colour mode (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">New Preferences
+window (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Allow beeper and
+AY volumes to be set individually (Fredrick Meunier).<br>
</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Automatic saves
-while using RZX recording (Philip Kendall).</font></li>
- </ul>
- </li>
- <li><font face="Lucida Grande,Helvetica,Arial">Emulation core
-improvements:</font></li>
- <li
- style="list-style-type: none; list-style-image: none; list-style-position: outside;">
- <ul>
- <li><font face="Lucida Grande,Helvetica,Arial">New late timings
-option to emulate machines with 1 tstate later timings (Philip Kendall).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Reading from the
-128K's memory control port causes that byte to be written back to the
-port (Philip Kendall; thanks, Marat Fayzullin).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Reading the AY
-data port on the +2A/+3 is the same as reading the register port
-(Philip Kendall; thanks, Mark Woodmass).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">NMI causes Z80 to
-unHALT (Philip Kendall; thanks, Simon Owen).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Emulate C, H and
-P/V flags on repeated IO instructions (Philip Kendall).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">IDE improvements
-to allow DivIDE to support FATware (Philip Kendall; thanks,
-http://www.dusky.sk/zxs/).<br>
+ <li><font face="Lucida Grande,Helvetica,Arial">Collapse Media
+menu hierarchy, to just have Tape, Disk A, Disk B, Master, Slave,
+Microdrive 1 and 2 etc. (Fredrick Meunier).<br>
</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Add Pause menu
+option (</font><font face="Lucida Grande,Helvetica,Arial">Fredrick
+Meunier).</font><br>
+ <font face="Lucida Grande,Helvetica,Arial"><br>
+ </font></li>
</ul>
</li>
- <li><font face="Lucida Grande,Helvetica,Arial">Debugger improvements:</font></li>
- <ul>
- <li><font face="Lucida Grande,Helvetica,Arial">Debugger events to
-allow the debugger to stop when various Spectrum-level events happen
-(Philip Kendall).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Make time
-breakpoints work properly when more than one is present (Philip
-Kendall).</font></li>
- </ul>
<li><font face="Lucida Grande,Helvetica,Arial">Miscellaneous
improvements:</font></li>
<ul>
- <li><font face="Lucida Grande,Helvetica,Arial">Loader detection now
-works with the Digital Integration loader (Philip Kendall).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Updated HQ2X and
-HQ3x
-scalers (Gergely Szasz).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Revert Pentagon 128
-to being the "base" machine without extra ROMs (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Updated +3e ROMs
-(Fredrick Meunier; thanks, Garry Lancaster).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Allow DivIDE, custom
-ROMs, Kempston mouse status and Simple 8-bit IDE interface to be saved
-in snapshots (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Better (but probably
-not perfect) TS2068 contention (Philip Kendall).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">128K SNA files are
-now treated as being for the Pentagon 128 rather than the Spectrum 128
+ <li><font face="Lucida Grande,Helvetica,Arial">Preformat new disks
+on +3 to allow the format command on +3 to work (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Support non-standard
+TRD images with 41-83 tracks per side (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Allow user to swap
+Kempston mouse buttons as some combinations of physical hardware and
+Spectrum software make it hard to use the standard mapping e.g. right
+clicking and moving the cursor on Mac notebooks (thanks, Andrew Owen)
(Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">SNA files now
-written out correctly (Philip Kendall).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Handle MDR write
-protection flag correctly (Philip Kendall).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Allow MDR images
-with bad checksums to load (the error will be handled by the IF1 ROM)
-(Gergely Szasz).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Don't switch machine
-on autoloading a Timex dock cart if we can already support them in the
-current machine (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Fix loading of
-DOCK/EXROM information from Timex snapshots (Fredrick Meunier).</font></li>
- <ul>
- </ul>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fixes for speed
+estimation (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix border colour in
+Timex HiRes screenshots (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix loading Warajevo
+TAPs of raw samples (e.g. BRUCELEE.TAP) (</font><font
+ face="Lucida Grande,Helvetica,Arial">Fredrick Meunier</font><font
+ face="Lucida Grande,Helvetica,Arial">).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Correct loading Beta
+128 disks from disk open dialog (</font><font
+ face="Lucida Grande,Helvetica,Arial">Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix mass storage
+preference setting (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix bug where having
+the tape browser or keyboard viewer open </font><font
+ face="Lucida Grande,Helvetica,Arial">prevented</font><font
+ face="Lucida Grande,Helvetica,Arial"> Fuse from quitting (Fredrick
+Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Make the keyboard
+viewer resizable (Fredrick Meunier).<br>
+ </font></li>
</ul>
<li><font face="Lucida Grande,Helvetica,Arial">Various other minor
bugfixes.</font></li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2009-09-05 14:16:06
|
Revision: 625
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=625&view=rev
Author: fredm
Date: 2009-09-05 14:15:58 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
Switch from using nibs to xibs.
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/fuse/fusepb/xibs/
trunk/fuse/fusepb/xibs/Debugger.xib
trunk/fuse/fusepb/xibs/JoystickConfiguration.xib
trunk/fuse/fusepb/xibs/Keyboard.xib
trunk/fuse/fusepb/xibs/LoadBinary.xib
trunk/fuse/fusepb/xibs/MainMenu.xib
trunk/fuse/fusepb/xibs/MemoryBrowser.xib
trunk/fuse/fusepb/xibs/PokeFinder.xib
trunk/fuse/fusepb/xibs/Preferences.xib
trunk/fuse/fusepb/xibs/Rollback.xib
trunk/fuse/fusepb/xibs/SaveBinary.xib
trunk/fuse/fusepb/xibs/SavePanelAccessoryView.xib
trunk/fuse/fusepb/xibs/TapeBrowser.xib
Removed Paths:
-------------
trunk/fuse/fusepb/nibs/
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2009-09-05 13:37:56 UTC (rev 624)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2009-09-05 14:15:58 UTC (rev 625)
@@ -31,17 +31,6 @@
B61F45A209121DF100C8096C /* spectrum.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F541C04303963A9F01C2A5B9 /* spectrum.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 */; };
- B61F460209121DF100C8096C /* JoystickConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = B611196806A1FBB6006D2711 /* JoystickConfiguration.nib */; };
- B61F460309121DF100C8096C /* Keyboard.nib in Resources */ = {isa = PBXBuildFile; fileRef = F56B6A5C03A621E901CA65B5 /* Keyboard.nib */; };
- B61F460409121DF100C8096C /* LoadBinary.nib in Resources */ = {isa = PBXBuildFile; fileRef = B6F74F9404B855930059D51C /* LoadBinary.nib */; };
- B61F460509121DF100C8096C /* MemoryBrowser.nib in Resources */ = {isa = PBXBuildFile; fileRef = B6D2993105B06AD200C2AA14 /* MemoryBrowser.nib */; };
- B61F460609121DF100C8096C /* PokeFinder.nib in Resources */ = {isa = PBXBuildFile; fileRef = B62F3BB4059F5B5900A7009A /* PokeFinder.nib */; };
- B61F460709121DF100C8096C /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = B6BA6F0207B1E04200E44C8D /* Preferences.nib */; };
- B61F460809121DF100C8096C /* Rollback.nib in Resources */ = {isa = PBXBuildFile; fileRef = B600ADA3077237920030FD05 /* Rollback.nib */; };
- B61F460909121DF100C8096C /* SaveBinary.nib in Resources */ = {isa = PBXBuildFile; fileRef = B6F74F9A04B85B4F0059D51C /* SaveBinary.nib */; };
- B61F460A09121DF100C8096C /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = F5598546038920E401A804BA /* MainMenu.nib */; };
- B61F460B09121DF100C8096C /* TapeBrowser.nib in Resources */ = {isa = PBXBuildFile; fileRef = F59B5587039F8DB601A804BA /* TapeBrowser.nib */; };
B61F460C09121DF100C8096C /* 48.rom in Resources */ = {isa = PBXBuildFile; fileRef = F559854C0389212301A804BA /* 48.rom */; };
B61F460D09121DF100C8096C /* 128-0.rom in Resources */ = {isa = PBXBuildFile; fileRef = F559854D0389212301A804BA /* 128-0.rom */; };
B61F460E09121DF100C8096C /* 128-1.rom in Resources */ = {isa = PBXBuildFile; fileRef = F559854E0389212301A804BA /* 128-1.rom */; };
@@ -80,7 +69,6 @@
B61F463109121DF100C8096C /* tzx.icns in Resources */ = {isa = PBXBuildFile; fileRef = B643BB980403A13600A864FD /* tzx.icns */; };
B61F463209121DF100C8096C /* z80.icns in Resources */ = {isa = PBXBuildFile; fileRef = B6676DB0040C348F00B2BFEF /* z80.icns */; };
B61F463309121DF100C8096C /* blank.icns in Resources */ = {isa = PBXBuildFile; fileRef = B6AF242A04156EE700F48F48 /* blank.icns */; };
- B61F463709121DF100C8096C /* SavePanelAccessoryView.nib in Resources */ = {isa = PBXBuildFile; fileRef = B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */; };
B61F463909121DF100C8096C /* z80_ops.c in Sources */ = {isa = PBXBuildFile; fileRef = F55985B20389224001A804BA /* z80_ops.c */; };
B61F463A09121DF100C8096C /* z80.c in Sources */ = {isa = PBXBuildFile; fileRef = F55985B30389224001A804BA /* z80.c */; };
B61F463B09121DF100C8096C /* ay.c in Sources */ = {isa = PBXBuildFile; fileRef = F55985CF038922A801A804BA /* ay.c */; };
@@ -195,6 +183,18 @@
B65352F20B8CF6CC0083F942 /* SDL_sysjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B65352BE0B89B8AA0083F942 /* SDL_sysjoystick.c */; };
B65353150B8FF3D20083F942 /* SDL_joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B65353140B8FF3D20083F942 /* SDL_joystick.c */; };
B653532B0B902CB20083F942 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B653532A0B902CB20083F942 /* IOKit.framework */; };
+ B665EE031052A29F00FCFED8 /* Debugger.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE021052A29F00FCFED8 /* Debugger.xib */; };
+ B665EE081052A34700FCFED8 /* JoystickConfiguration.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE071052A34700FCFED8 /* JoystickConfiguration.xib */; };
+ B665EE0B1052A39000FCFED8 /* Keyboard.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE0A1052A39000FCFED8 /* Keyboard.xib */; };
+ B665EE101052A3BD00FCFED8 /* LoadBinary.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE0F1052A3BD00FCFED8 /* LoadBinary.xib */; };
+ B665EE131052A3DC00FCFED8 /* MemoryBrowser.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE121052A3DC00FCFED8 /* MemoryBrowser.xib */; };
+ B665EE161052A40000FCFED8 /* PokeFinder.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE151052A40000FCFED8 /* PokeFinder.xib */; };
+ B665EE191052A41F00FCFED8 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE181052A41F00FCFED8 /* Preferences.xib */; };
+ B665EE1C1052A43900FCFED8 /* Rollback.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE1B1052A43900FCFED8 /* Rollback.xib */; };
+ B665EE1F1052A45200FCFED8 /* SaveBinary.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE1E1052A45200FCFED8 /* SaveBinary.xib */; };
+ B665EE221052A4F200FCFED8 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE211052A4F200FCFED8 /* MainMenu.xib */; };
+ B665EE251052A51B00FCFED8 /* TapeBrowser.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE241052A51B00FCFED8 /* TapeBrowser.xib */; };
+ B665EE281052A53C00FCFED8 /* SavePanelAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B665EE271052A53C00FCFED8 /* SavePanelAccessoryView.xib */; };
B665FD490DD25D8900D21C79 /* upd_fdc.c in Sources */ = {isa = PBXBuildFile; fileRef = B665FD470DD25D8900D21C79 /* upd_fdc.c */; };
B665FD4A0DD25D8900D21C79 /* upd_fdc.h in Headers */ = {isa = PBXBuildFile; fileRef = B665FD480DD25D8900D21C79 /* upd_fdc.h */; };
B66E04720CEDBAF400A647DC /* pentagon512.c in Sources */ = {isa = PBXBuildFile; fileRef = B66E04710CEDBAF400A647DC /* pentagon512.c */; };
@@ -314,7 +314,6 @@
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
- B600ADA3077237920030FD05 /* Rollback.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Rollback.nib; path = nibs/Rollback.nib; sourceTree = SOURCE_ROOT; };
B6018479065A586900B0BE59 /* zxatasp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zxatasp.c; sourceTree = "<group>"; };
B601847A065A586900B0BE59 /* zxatasp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zxatasp.h; sourceTree = "<group>"; };
B601847B065A586900B0BE59 /* zxcf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zxcf.c; sourceTree = "<group>"; };
@@ -324,7 +323,6 @@
B60B11F7059BC7E70048B64B /* machine.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = machine.c; path = ../machine.c; sourceTree = SOURCE_ROOT; };
B611190206A1FA12006D2711 /* JoystickConfigurationController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JoystickConfigurationController.h; path = controllers/JoystickConfigurationController.h; sourceTree = SOURCE_ROOT; };
B611190306A1FA12006D2711 /* JoystickConfigurationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = JoystickConfigurationController.m; path = controllers/JoystickConfigurationController.m; sourceTree = SOURCE_ROOT; };
- B611196806A1FBB6006D2711 /* JoystickConfiguration.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = JoystickConfiguration.nib; path = nibs/JoystickConfiguration.nib; sourceTree = "<group>"; };
B61159BE0EEE99D50029FEA3 /* Graphics_Filter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Graphics_Filter.png; sourceTree = "<group>"; };
B61159C00EEE99E20029FEA3 /* Machine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Machine.png; sourceTree = "<group>"; };
B61159C20EEE99EE0029FEA3 /* Peripherals.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Peripherals.png; sourceTree = "<group>"; };
@@ -334,7 +332,6 @@
B61159CA0EEE9A1E0029FEA3 /* Sound.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Sound.png; sourceTree = "<group>"; };
B615BFE50B4261E50082D535 /* HIDJoysticks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = HIDJoysticks.h; path = content_arrays/HIDJoysticks.h; sourceTree = "<group>"; };
B615BFE60B4261E50082D535 /* HIDJoysticks.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = HIDJoysticks.m; path = content_arrays/HIDJoysticks.m; sourceTree = "<group>"; };
- B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SavePanelAccessoryView.nib; path = nibs/SavePanelAccessoryView.nib; sourceTree = "<group>"; };
B61EEB950D1A917D006FEA80 /* FuseGenerator.qlgenerator */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.bundle"; name = FuseGenerator.qlgenerator; path = ../../FuseGenerator/build/Release/FuseGenerator.qlgenerator; sourceTree = SOURCE_ROOT; };
B61F46A909121DF100C8096C /* Info-Fuse.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Fuse.plist"; sourceTree = "<group>"; };
B61F46AA09121DF200C8096C /* Fuse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Fuse.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -344,8 +341,6 @@
B62B19E00DD31DF500D42AAF /* scalers16.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = scalers16.c; path = scaler/scalers16.c; sourceTree = SOURCE_ROOT; };
B62B1A270DD6655800D42AAF /* fuse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = fuse.c; sourceTree = "<group>"; };
B62B1A290DD667EC00D42AAF /* main.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
- B62E1BC303E298B200A80002 /* Debugger.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Debugger.nib; path = nibs/Debugger.nib; sourceTree = SOURCE_ROOT; };
- B62F3BB4059F5B5900A7009A /* PokeFinder.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = PokeFinder.nib; path = nibs/PokeFinder.nib; sourceTree = "<group>"; };
B62F3BCE059F5BF300A7009A /* PokeFinderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PokeFinderController.h; path = controllers/PokeFinderController.h; sourceTree = "<group>"; };
B62F3BCF059F5BF300A7009A /* PokeFinderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PokeFinderController.m; path = controllers/PokeFinderController.m; sourceTree = "<group>"; };
B631B9FD10257CA400BE1EE1 /* opus.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opus.c; sourceTree = "<group>"; };
@@ -418,6 +413,18 @@
B66050F90606AB0B00247454 /* scorpion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = scorpion.h; path = ../machines/scorpion.h; sourceTree = SOURCE_ROOT; };
B66051080606ABDC00247454 /* input.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = input.c; path = ../input.c; sourceTree = SOURCE_ROOT; };
B66051090606ABDC00247454 /* input.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = input.h; path = ../input.h; sourceTree = SOURCE_ROOT; };
+ B665EE021052A29F00FCFED8 /* Debugger.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Debugger.xib; sourceTree = "<group>"; };
+ B665EE071052A34700FCFED8 /* JoystickConfiguration.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = JoystickConfiguration.xib; sourceTree = "<group>"; };
+ B665EE0A1052A39000FCFED8 /* Keyboard.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Keyboard.xib; sourceTree = "<group>"; };
+ B665EE0F1052A3BD00FCFED8 /* LoadBinary.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LoadBinary.xib; sourceTree = "<group>"; };
+ B665EE121052A3DC00FCFED8 /* MemoryBrowser.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MemoryBrowser.xib; sourceTree = "<group>"; };
+ B665EE151052A40000FCFED8 /* PokeFinder.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PokeFinder.xib; sourceTree = "<group>"; };
+ B665EE181052A41F00FCFED8 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
+ B665EE1B1052A43900FCFED8 /* Rollback.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Rollback.xib; sourceTree = "<group>"; };
+ B665EE1E1052A45200FCFED8 /* SaveBinary.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SaveBinary.xib; sourceTree = "<group>"; };
+ B665EE211052A4F200FCFED8 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
+ B665EE241052A51B00FCFED8 /* TapeBrowser.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TapeBrowser.xib; sourceTree = "<group>"; };
+ B665EE271052A53C00FCFED8 /* SavePanelAccessoryView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SavePanelAccessoryView.xib; sourceTree = "<group>"; };
B665FD470DD25D8900D21C79 /* upd_fdc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = upd_fdc.c; sourceTree = "<group>"; };
B665FD480DD25D8900D21C79 /* upd_fdc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = upd_fdc.h; sourceTree = "<group>"; };
B6676DB0040C348F00B2BFEF /* z80.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = z80.icns; path = resources/z80.icns; sourceTree = SOURCE_ROOT; };
@@ -486,7 +493,6 @@
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>"; };
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; };
B6C57E0005ECA05B0056F1D0 /* periph.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = periph.c; path = ../periph.c; sourceTree = SOURCE_ROOT; };
B6C57E0105ECA05B0056F1D0 /* periph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = periph.h; path = ../periph.h; sourceTree = SOURCE_ROOT; };
@@ -535,7 +541,6 @@
B6CE7FCC0B28FBD600EB65B3 /* DisplayOpenGLView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DisplayOpenGLView.m; sourceTree = "<group>"; };
B6D2989105B061CB00C2AA14 /* MemoryBrowserController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MemoryBrowserController.h; path = controllers/MemoryBrowserController.h; sourceTree = "<group>"; };
B6D2989205B061CB00C2AA14 /* MemoryBrowserController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MemoryBrowserController.m; path = controllers/MemoryBrowserController.m; sourceTree = "<group>"; };
- B6D2993105B06AD200C2AA14 /* MemoryBrowser.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = MemoryBrowser.nib; path = nibs/MemoryBrowser.nib; sourceTree = "<group>"; };
B6DDE5280D64D96E00D6F905 /* pentagon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pentagon.h; path = machines/pentagon.h; sourceTree = "<group>"; };
B6DDE53B0D67963600D6F905 /* ui.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ui.c; sourceTree = "<group>"; };
B6E0252B0B38AFE500E23A0F /* keysyms.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = keysyms.m; sourceTree = "<group>"; };
@@ -562,10 +567,8 @@
B6F060AB078FB63A00CD5D95 /* tc2068.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = tc2068.h; path = ../machines/tc2068.h; sourceTree = SOURCE_ROOT; };
B6F06100078FC2C900CD5D95 /* sfifo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sfifo.c; path = ../sound/sfifo.c; sourceTree = SOURCE_ROOT; };
B6F06101078FC2C900CD5D95 /* sfifo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sfifo.h; path = ../sound/sfifo.h; sourceTree = SOURCE_ROOT; };
- B6F74F9404B855930059D51C /* LoadBinary.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = LoadBinary.nib; path = nibs/LoadBinary.nib; sourceTree = "<group>"; };
B6F74F9604B855D40059D51C /* LoadBinaryController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LoadBinaryController.h; path = controllers/LoadBinaryController.h; sourceTree = "<group>"; };
B6F74F9704B855D40059D51C /* LoadBinaryController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = LoadBinaryController.m; path = controllers/LoadBinaryController.m; sourceTree = "<group>"; };
- B6F74F9A04B85B4F0059D51C /* SaveBinary.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SaveBinary.nib; path = nibs/SaveBinary.nib; sourceTree = "<group>"; };
B6F74F9C04B85B660059D51C /* SaveBinaryController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SaveBinaryController.h; path = controllers/SaveBinaryController.h; sourceTree = "<group>"; };
B6F74F9D04B85B660059D51C /* SaveBinaryController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SaveBinaryController.m; path = controllers/SaveBinaryController.m; sourceTree = "<group>"; };
B6F905ED05CDA24300C2F10D /* Fuse Help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Fuse Help"; path = "resources/Fuse Help"; sourceTree = SOURCE_ROOT; };
@@ -579,7 +582,6 @@
F541C04303963A9F01C2A5B9 /* spectrum.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = spectrum.framework; path = ../../libspectrum/build/Deployment/spectrum.framework; sourceTree = SOURCE_ROOT; };
F541FB5E03B0B33401FF8235 /* scaler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = scaler.h; path = ../ui/scaler/scaler.h; sourceTree = SOURCE_ROOT; };
F54670EB03A3F3E70143EC2C /* settings.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = settings.m; sourceTree = SOURCE_ROOT; };
- F5598546038920E401A804BA /* MainMenu.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = MainMenu.nib; path = nibs/MainMenu.nib; sourceTree = "<group>"; };
F559854C0389212301A804BA /* 48.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = 48.rom; path = ../roms/48.rom; sourceTree = SOURCE_ROOT; };
F559854D0389212301A804BA /* 128-0.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "128-0.rom"; path = "../roms/128-0.rom"; sourceTree = SOURCE_ROOT; };
F559854E0389212301A804BA /* 128-1.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "128-1.rom"; path = "../roms/128-1.rom"; sourceTree = SOURCE_ROOT; };
@@ -635,11 +637,9 @@
F559862C0389235F01A804BA /* tape.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = tape.h; path = ../tape.h; sourceTree = SOURCE_ROOT; };
F559862D0389235F01A804BA /* tc2048.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = tc2048.c; path = ../machines/tc2048.c; sourceTree = SOURCE_ROOT; };
F559863C0389238101A804BA /* uidisplay.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = uidisplay.c; path = ../uidisplay.c; sourceTree = SOURCE_ROOT; };
- F56B6A5C03A621E901CA65B5 /* Keyboard.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Keyboard.nib; path = nibs/Keyboard.nib; sourceTree = "<group>"; };
F56B6A5E03A6273801CA65B5 /* KeyboardController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = KeyboardController.h; path = controllers/KeyboardController.h; sourceTree = SOURCE_ROOT; };
F56B6A5F03A6273801CA65B5 /* KeyboardController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = KeyboardController.m; path = controllers/KeyboardController.m; sourceTree = SOURCE_ROOT; };
F56B6A6203A628A901CA65B5 /* 48k.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 48k.png; path = resources/48k.png; sourceTree = "<group>"; };
- F59B5587039F8DB601A804BA /* TapeBrowser.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = TapeBrowser.nib; path = nibs/TapeBrowser.nib; sourceTree = "<group>"; };
F59B558F039FD8F901A804BA /* TapeBrowserController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TapeBrowserController.h; path = controllers/TapeBrowserController.h; sourceTree = SOURCE_ROOT; };
F59B5590039FD8F901A804BA /* TapeBrowserController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TapeBrowserController.m; path = controllers/TapeBrowserController.m; sourceTree = SOURCE_ROOT; };
F5F291060396932B01730B00 /* Credits.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = Credits.html; sourceTree = "<group>"; };
@@ -756,10 +756,10 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
+ B665EE051052A2D100FCFED8 /* xibs */,
B61EEB950D1A917D006FEA80 /* FuseGenerator.qlgenerator */,
B64FEA96084F8EC300879389 /* FuseImporter.mdimporter */,
B6F905ED05CDA24300C2F10D /* Fuse Help */,
- B6D81CAF0813561B00558C18 /* NIB Files */,
B643BB8C0403A0D300A864FD /* resources */,
F559854B0389210301A804BA /* snaps */,
F559854A038920FD01A804BA /* roms */,
@@ -918,6 +918,25 @@
path = ide;
sourceTree = "<group>";
};
+ B665EE051052A2D100FCFED8 /* xibs */ = {
+ isa = PBXGroup;
+ children = (
+ B665EE021052A29F00FCFED8 /* Debugger.xib */,
+ B665EE071052A34700FCFED8 /* JoystickConfiguration.xib */,
+ B665EE0A1052A39000FCFED8 /* Keyboard.xib */,
+ B665EE0F1052A3BD00FCFED8 /* LoadBinary.xib */,
+ B665EE121052A3DC00FCFED8 /* MemoryBrowser.xib */,
+ B665EE151052A40000FCFED8 /* PokeFinder.xib */,
+ B665EE181052A41F00FCFED8 /* Preferences.xib */,
+ B665EE1B1052A43900FCFED8 /* Rollback.xib */,
+ B665EE1E1052A45200FCFED8 /* SaveBinary.xib */,
+ B665EE211052A4F200FCFED8 /* MainMenu.xib */,
+ B665EE241052A51B00FCFED8 /* TapeBrowser.xib */,
+ B665EE271052A53C00FCFED8 /* SavePanelAccessoryView.xib */,
+ );
+ path = xibs;
+ sourceTree = "<group>";
+ };
B678E3E20608FAA600678A33 /* sound */ = {
isa = PBXGroup;
children = (
@@ -1060,25 +1079,6 @@
path = views;
sourceTree = "<group>";
};
- B6D81CAF0813561B00558C18 /* NIB Files */ = {
- isa = PBXGroup;
- children = (
- B62E1BC303E298B200A80002 /* Debugger.nib */,
- B611196806A1FBB6006D2711 /* JoystickConfiguration.nib */,
- F56B6A5C03A621E901CA65B5 /* Keyboard.nib */,
- B6F74F9404B855930059D51C /* LoadBinary.nib */,
- B6D2993105B06AD200C2AA14 /* MemoryBrowser.nib */,
- B62F3BB4059F5B5900A7009A /* PokeFinder.nib */,
- B6BA6F0207B1E04200E44C8D /* Preferences.nib */,
- B600ADA3077237920030FD05 /* Rollback.nib */,
- B6F74F9A04B85B4F0059D51C /* SaveBinary.nib */,
- F5598546038920E401A804BA /* MainMenu.nib */,
- F59B5587039F8DB601A804BA /* TapeBrowser.nib */,
- B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */,
- );
- name = "NIB Files";
- sourceTree = "<group>";
- };
B6DD457908134943008E9F7E /* Content Arrays */ = {
isa = PBXGroup;
children = (
@@ -1334,18 +1334,6 @@
files = (
B61F45FF09121DF100C8096C /* InfoPlist.strings in Resources */,
B61F460009121DF100C8096C /* Credits.html in Resources */,
- B61F460109121DF100C8096C /* Debugger.nib in Resources */,
- B61F460209121DF100C8096C /* JoystickConfiguration.nib in Resources */,
- B61F460309121DF100C8096C /* Keyboard.nib in Resources */,
- B61F460409121DF100C8096C /* LoadBinary.nib in Resources */,
- B61F460509121DF100C8096C /* MemoryBrowser.nib in Resources */,
- B61F460609121DF100C8096C /* PokeFinder.nib in Resources */,
- B61F460709121DF100C8096C /* Preferences.nib in Resources */,
- B61F460809121DF100C8096C /* Rollback.nib in Resources */,
- B61F460909121DF100C8096C /* SaveBinary.nib in Resources */,
- B61F463709121DF100C8096C /* SavePanelAccessoryView.nib in Resources */,
- B61F460A09121DF100C8096C /* MainMenu.nib in Resources */,
- B61F460B09121DF100C8096C /* TapeBrowser.nib in Resources */,
B61F460D09121DF100C8096C /* 128-0.rom in Resources */,
B61F460E09121DF100C8096C /* 128-1.rom in Resources */,
B61F460F09121DF100C8096C /* 128p-0.rom in Resources */,
@@ -1413,6 +1401,18 @@
B61159C90EEE9A140029FEA3 /* Select_ROMs.png in Resources */,
B61159CB0EEE9A1E0029FEA3 /* Sound.png in Resources */,
B631BA0F1025878600BE1EE1 /* opus.rom in Resources */,
+ B665EE031052A29F00FCFED8 /* Debugger.xib in Resources */,
+ B665EE081052A34700FCFED8 /* JoystickConfiguration.xib in Resources */,
+ B665EE0B1052A39000FCFED8 /* Keyboard.xib in Resources */,
+ B665EE101052A3BD00FCFED8 /* LoadBinary.xib in Resources */,
+ B665EE131052A3DC00FCFED8 /* MemoryBrowser.xib in Resources */,
+ B665EE161052A40000FCFED8 /* PokeFinder.xib in Resources */,
+ B665EE191052A41F00FCFED8 /* Preferences.xib in Resources */,
+ B665EE1C1052A43900FCFED8 /* Rollback.xib in Resources */,
+ B665EE1F1052A45200FCFED8 /* SaveBinary.xib in Resources */,
+ B665EE221052A4F200FCFED8 /* MainMenu.xib in Resources */,
+ B665EE251052A51B00FCFED8 /* TapeBrowser.xib in Resources */,
+ B665EE281052A53C00FCFED8 /* SavePanelAccessoryView.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: trunk/fuse/fusepb/xibs/Debugger.xib
===================================================================
--- trunk/fuse/fusepb/xibs/Debugger.xib (rev 0)
+++ trunk/fuse/fusepb/xibs/Debugger.xib 2009-09-05 14:15:58 UTC (rev 625)
@@ -0,0 +1,3688 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+ <data>
+ <int key="IBDocument.SystemTarget">1060</int>
+ <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>
+ <array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <integer value="5"/>
+ </array>
+ <array key="IBDocument.PluginDependencies">
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ </array>
+ <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+ <array class="NSMutableArray" key="IBDocument.RootObjects" id="498926979">
+ <object class="NSCustomObject" id="316183168">
+ <string key="NSClassName">DebuggerController</string>
+ </object>
+ <object class="NSCustomObject" id="839462725">
+ <string key="NSClassName">FirstResponder</string>
+ </object>
+ <object class="NSCustomObject" id="1035351794">
+ <string key="NSClassName">NSApplication</string>
+ </object>
+ <object class="NSWindowTemplate" id="930661414">
+ <int key="NSWindowStyleMask">3</int>
+ <int key="NSWindowBacking">2</int>
+ <string key="NSWindowRect">{{41, 128}, {788, 596}}</string>
+ <int key="NSWTFlags">-260571136</int>
+ <string key="NSWindowTitle">Debugger</string>
+ <string key="NSWindowClass">NSPanel</string>
+ <object class="NSMutableString" key="NSViewClass">
+ <characters key="NS.bytes">View</characters>
+ </object>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSWindowContentMinSize">{213, 107}</string>
+ <object class="NSView" key="NSWindowView" id="233491278">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">256</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSScrollView" id="78101936">
+ <reference key="NSNextResponder" ref="233491278"/>
+ <int key="NSvFlags">274</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSClipView" id="781146691">
+ <reference key="NSNextResponder" ref="78101936"/>
+ <int key="NSvFlags">2304</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSTableView" id="613070571">
+ <reference key="NSNextResponder" ref="781146691"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrameSize">{165, 348}</string>
+ <reference key="NSSuperview" ref="781146691"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTableHeaderView" key="NSHeaderView" id="633630688">
+ <reference key="NSNextResponder" ref="716506965"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrameSize">{165, 17}</string>
+ <reference key="NSSuperview" ref="716506965"/>
+ <reference key="NSTableView" ref="613070571"/>
+ </object>
+ <object class="_NSCornerView" key="NSCornerView" id="391632127">
+ <reference key="NSNextResponder" ref="78101936"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-26, 0}, {16, 17}}</string>
+ <reference key="NSSuperview" ref="78101936"/>
+ </object>
+ <array class="NSMutableArray" key="NSTableColumns">
+ <object class="NSTableColumn" id="747841639">
+ <string key="NSIdentifier">address</string>
+ <double key="NSWidth">51</double>
+ <double key="NSMinWidth">40</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Address</string>
+ <object class="NSFont" key="NSSupport" id="500630716">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="NSBackgroundColor" id="291063777">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="27500870">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">headerTextColor</string>
+ <object class="NSColor" key="NSColor" id="669404927">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="144077294">
+ <int key="NSCellFlags">338820672</int>
+ <int key="NSCellFlags2">1024</int>
+ <object class="NSFont" key="NSSupport" id="895397819">
+ <string key="NSName">Monaco</string>
+ <double key="NSSize">12</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="NSControlView" ref="613070571"/>
+ <object class="NSColor" key="NSBackgroundColor" id="282309020">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="773964941">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlTextColor</string>
+ <reference key="NSColor" ref="669404927"/>
+ </object>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="613070571"/>
+ </object>
+ <object class="NSTableColumn" id="499536533">
+ <string key="NSIdentifier">instruction</string>
+ <double key="NSWidth">107.55599975585938</double>
+ <double key="NSMinWidth">65.555999755859375</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Instruction</string>
+ <reference key="NSSupport" ref="500630716"/>
+ <reference key="NSBackgroundColor" ref="291063777"/>
+ <reference key="NSTextColor" ref="27500870"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="81904068">
+ <int key="NSCellFlags">338820672</int>
+ <int key="NSCellFlags2">1024</int>
+ <reference key="NSSupport" ref="895397819"/>
+ <reference key="NSControlView" ref="613070571"/>
+ <reference key="NSBackgroundColor" ref="282309020"/>
+ <reference key="NSTextColor" ref="773964941"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="613070571"/>
+ </object>
+ </array>
+ <double key="NSIntercellSpacingWidth">3</double>
+ <double key="NSIntercellSpacingHeight">2</double>
+ <reference key="NSBackgroundColor" ref="282309020"/>
+ <object class="NSColor" key="NSGridColor" id="656669572">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">gridColor</string>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ </object>
+ <double key="NSRowHeight">15</double>
+ <int key="NSTvFlags">-1027604480</int>
+ <reference key="NSDelegate"/>
+ <reference key="NSDataSource"/>
+ <int key="NSGridStyleMask">1</int>
+ <int key="NSColumnAutoresizingStyle">4</int>
+ <int key="NSDraggingSourceMaskForLocal">15</int>
+ <int key="NSDraggingSourceMaskForNonLocal">0</int>
+ <bool key="NSAllowsTypeSelect">YES</bool>
+ <int key="NSTableViewDraggingDestinationStyle">0</int>
+ </object>
+ </array>
+ <string key="NSFrame">{{1, 17}, {165, 348}}</string>
+ <reference key="NSSuperview" ref="78101936"/>
+ <reference key="NSNextKeyView" ref="613070571"/>
+ <reference key="NSDocView" ref="613070571"/>
+ <object class="NSColor" key="NSBGColor" id="998664178">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlBackgroundColor</string>
+ <object class="NSColor" key="NSColor" id="360720273">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
+ <int key="NScvFlags">4</int>
+ </object>
+ <object class="NSScroller" id="156151064">
+ <reference key="NSNextResponder" ref="78101936"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-30, 17}, {15, 316}}</string>
+ <reference key="NSSuperview" ref="78101936"/>
+ <reference key="NSTarget" ref="78101936"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSPercent">0.99473685026168823</double>
+ </object>
+ <object class="NSScroller" id="278599292">
+ <reference key="NSNextResponder" ref="78101936"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {150, 15}}</string>
+ <reference key="NSSuperview" ref="78101936"/>
+ <int key="NSsFlags">1</int>
+ <reference key="NSTarget" ref="78101936"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSPercent">0.99230766296386719</double>
+ </object>
+ <object class="NSClipView" id="716506965">
+ <reference key="NSNextResponder" ref="78101936"/>
+ <int key="NSvFlags">2304</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <reference ref="633630688"/>
+ </array>
+ <string key="NSFrame">{{1, 0}, {165, 17}}</string>
+ <reference key="NSSuperview" ref="78101936"/>
+ <reference key="NSNextKeyView" ref="633630688"/>
+ <reference key="NSDocView" ref="633630688"/>
+ <reference key="NSBGColor" ref="998664178"/>
+ <int key="NScvFlags">4</int>
+ </object>
+ <reference ref="391632127"/>
+ </array>
+ <string key="NSFrame">{{258, 188}, {167, 366}}</string>
+ <reference key="NSSuperview" ref="233491278"/>
+ <reference key="NSNextKeyView" ref="781146691"/>
+ <int key="NSsFlags">530</int>
+ <reference key="NSVScroller" ref="156151064"/>
+ <reference key="NSHScroller" ref="278599292"/>
+ <reference key="NSContentView" ref="781146691"/>
+ <reference key="NSHeaderClipView" ref="716506965"/>
+ <reference key="NSCornerView" ref="391632127"/>
+ <bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
+ </object>
+ <object class="NSTextField" id="375303057">
+ <reference key="NSNextResponder" ref="233491278"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{185, 188}, {65, 20}}</string>
+ <reference key="NSSuperview" ref="233491278"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="1063810329">
+ <int key="NSCellFlags">-2072904127</int>
+ <int key="NSCellFlags2">4195328</int>
+ <string key="NSContents"/>
+ <object class="NSFont" key="NSSupport" id="234635903">
+ <string key="NSName">Monaco</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="NSControlView" ref="375303057"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <object class="NSColor" key="NSBackgroundColor" id="418975486">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textBackgroundColor</string>
+ <reference key="NSColor" ref="282309020"/>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="1005353692">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textColor</string>
+ <reference key="NSColor" ref="669404927"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSTextField" id="633875962">
+ <reference key="NSNextResponder" ref="233491278"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{187, 207}, {60, 16}}</string>
+ <reference key="NSSuperview" ref="233491278"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="213989840">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">4194304</int>
+ <string type="base64-UTF8" key="NSContents">U1o1SDNQTkMKA</string>
+ <reference key="NSSupport" ref="234635903"/>
+ <reference key="NSControlView" ref="633875962"/>
+ <object class="NSColor" key="NSBackgroundColor" id="359607598">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlColor</string>
+ <reference key="NSColor" ref="360720273"/>
+ </object>
+ <reference key="NSTextColor" ref="773964941"/>
+ </object>
+ </object>
+ <object class="NSTextField" id="543701996">
+ <reference key="NSNextResponder" ref="233491278"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{20, 60}, {659, 22}}</string>
+ <reference key="NSSuperview" ref="233491278"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="215574654">
+ <int key="NSCellFlags">-1804468671</int>
+ <int key="NSCellFlags2">1024</int>
+ <string key="NSContents"/>
+ <object class="NSFont" key="NSSupport">
+ <string key="NSName">Monaco</string>
+ <double key="NSSize">13</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="NSControlView" ref="543701996"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <reference key="NSBackgroundColor" ref="418975486"/>
+ <reference key="NSTextColor" ref="1005353692"/>
+ </object>
+ </object>
+ <object class="NSButton" id="169765289">
+ <reference key="NSNextResponder" ref="233491278"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{681, 52}, {93, 32}}</string>
+ <reference key="NSSuperview" ref="233491278"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="733809501">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">137887744</int>
+ <string key="NSContents">Evaluate</string>
+ <object class="NSFont" key="NSSupport" id="149379105">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">13</double>
+ <int key="NSfFlags">1044</int>
+ </object>
+ <reference key="NSControlView" ref="169765289"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">1</int>
+ <object class="NSFont" key="NSAlternateImage" id="223253359">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">13</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <string key="NSAlternateContents"/>
+ <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="885608672">
+ <reference key="NSNextResponder" ref="233491278"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{14, 12}, {110, 32}}</string>
+ <reference key="NSSuperview" ref="233491278"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="705682210">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">137887744</int>
+ <string key="NSContents">Single Step</string>
+ <reference key="NSSupport" ref="149379105"/>
+ <reference key="NSControlView" ref="885608672"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">1</int>
+ <reference key="NSAlternateImage" ref="223253359"/>
+ <object class="NSMutableString" key="NSAlternateContents">
+ <characters key="NS.bytes"/>
+ </object>
+ <object class="NSMutableString" key="NSKeyEquivalent">
+ <characters key="NS.bytes"/>
+ </object>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="748179110">
+ <reference key="NSNextResponder" ref="233491278"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{124, 12}, {98, 32}}</string>
+ <reference key="NSSuperview" ref="233491278"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="59264271">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">137887744</int>
+ <string key="NSContents">Continue</string>
+ <reference key="NSSupport" ref="149379105"/>
+ <reference key="NSControlView" ref="748179110"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">1</int>
+ <reference key="NSAlternateImage" ref="223253359"/>
+ <object class="NSMutableString" key="NSAlternateContents">
+ <characters key="NS.bytes"/>
+ </object>
+ <object class="NSMutableString" key="NSKeyEquivalent">
+ <characters key="NS.bytes"/>
+ </object>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="558783023">
+ <reference key="NSNextResponder" ref="233491278"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{222, 12}, {84, 32}}</string>
+ <reference key="NSSuperview" ref="233491278"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="763191847">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">137887744</int>
+ <string key="NSContents">Break</string>
+ <reference key="NSSupport" ref="149379105"/>
+ <reference key="NSControlView" ref="558783023"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">1</int>
+ <reference key="NSAlternateImage" ref="223253359"/>
+ <object class="NSMutableString" key="NSAlternateContents">
+ <characters key="NS.bytes"/>
+ </object>
+ <object class="NSMutableString" key="NSKeyEquivalent">
+ <characters key="NS.bytes"/>
+ </object>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSScrollView" id="456741639">
+ <reference key="NSNextResponder" ref="233491278"/>
+ <int key="NSvFlags">256</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSClipView" id="826280046">
+ <reference key="NSNextResponder" ref="456741639"/>
+ <int key="NSvFlags">2304</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSTableView" id="99504781">
+ <reference key="NSNextResponder" ref="826280046"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrameSize">{746, 74}</string>
+ <reference key="NSSuperview" ref="826280046"/>
+ <int key="NSTag">2</int>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTableHeaderView" key="NSHeaderView" id="963087691">
+ <reference key="NSNextResponder" ref="266185891"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrameSize">{746, 17}</string>
+ <reference key="NSSuperview" ref="266185891"/>
+ <reference key="NSTableView" ref="99504781"/>
+ </object>
+ <object class="_NSCornerView" key="NSCornerView" id="421788493">
+ <reference key="NSNextResponder" ref="456741639"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-26, 0}, {16, 17}}</string>
+ <reference key="NSSuperview" ref="456741639"/>
+ </object>
+ <array class="NSMutableArray" key="NSTableColumns">
+ <object class="NSTableColumn" id="653002644">
+ <string key="NSIdentifier">id</string>
+ <double key="NSWidth">40</double>
+ <double key="NSMinWidth">40</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">ID</string>
+ <reference key="NSSupport" ref="500630716"/>
+ <object class="NSColor" key="NSBackgroundColor" id="365606795">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+ </object>
+ <reference key="NSTextColor" ref="27500870"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="41023422">
+ <int key="NSCellFlags">338820672</int>
+ <int key="NSCellFlags2">1024</int>
+ <reference key="NSSupport" ref="895397819"/>
+ <reference key="NSControlView" ref="99504781"/>
+ <reference key="NSBackgroundColor" ref="282309020"/>
+ <reference key="NSTextColor" ref="773964941"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="99504781"/>
+ </object>
+ <object class="NSTableColumn" id="898263077">
+ <string key="NSIdentifier">type</string>
+ <double key="NSWidth">79</double>
+ <double key="NSMinWidth">40</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Type</string>
+ <reference key="NSSupport" ref="500630716"/>
+ <reference key="NSBackgroundColor" ref="365606795"/>
+ <reference key="NSTextColor" ref="27500870"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="43065045">
+ <int key="NSCellFlags">338820672</int>
+ <int key="NSCellFlags2">1024</int>
+ <reference key="NSSupport" ref="895397819"/>
+ <reference key="NSControlView" ref="99504781"/>
+ <reference key="NSBackgroundColor" ref="282309020"/>
+ <reference key="NSTextColor" ref="773964941"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="99504781"/>
+ </object>
+ <object class="NSTableColumn" id="963822215">
+ <string key="NSIdentifier">value</string>
+ <double key="NSWidth">64</double>
+ <double key="NSMinWidth">10</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Value</string>
+ <reference key="NSSupport" ref="500630716"/>
+ <object class="NSColor" key="NSBackgroundColor" id="935589818">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">headerColor</string>
+ <reference key="NSColor" ref="282309020"/>
+ </object>
+ <reference key="NSTextColor" ref="27500870"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="600129512">
+ <int key="NSCellFlags">338820672</int>
+ <int key="NSCellFlags2">1024</int>
+ <object class="NSFont" key="NSSupport" id="600134497">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">12</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="NSControlView" ref="99504781"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <reference key="NSBackgroundColor" ref="998664178"/>
+ <reference key="NSTextColor" ref="773964941"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="99504781"/>
+ </object>
+ <object class="NSTableColumn" id="279203501">
+ <string key="NSIdentifier">ignore</string>
+ <double key="NSWidth">67</double>
+ <double key="NSMinWidth">10</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Ignore</string>
+ <reference key="NSSupport" ref="500630716"/>
+ <reference key="NSBackgroundColor" ref="935589818"/>
+ <reference key="NSTextColor" ref="27500870"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="37966189">
+ <int key="NSCellFlags">338820672</int>
+ <int key="NSCellFlags2">1024</int>
+ <reference key="NSSupport" ref="600134497"/>
+ <reference key="NSControlView" ref="99504781"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <reference key="NSBackgroundColor" ref="998664178"/>
+ <reference key="NSTextColor" ref="773964941"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="99504781"/>
+ </object>
+ <object class="NSTableColumn" id="259522712">
+ <string key="NSIdentifier">life</string>
+ <double key="NSWidth">114.21697998046875</double>
+ <double key="NSMinWidth">23.216999053955078</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Life</string>
+ <reference key="NSSupport" ref="500630716"/>
+ <reference key="NSBackgroundColor" ref="935589818"/>
+ <reference key="NSTextColor" ref="27500870"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="614495871">
+ <int key="NSCellFlags">338820672</int>
+ <int key="NSCellFlags2">1024</int>
+ <reference key="NSSupport" ref="600134497"/>
+ <reference key="NSControlView" ref="99504781"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <reference key="NSBackgroundColor" ref="998664178"/>
+ <reference key="NSTextColor" ref="773964941"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="99504781"/>
+ </object>
+ <object class="NSTableColumn" id="820739807">
+ <string key="NSIdentifier">condition</string>
+ <double key="NSWidth">364.17401123046875</double>
+ <double key="NSMinWidth">10</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Condition</string>
+ <object class="NSFont" key="NSSupport" id="26">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">3100</int>
+ </object>
+ <reference key="NSBackgroundColor" ref="935589818"/>
+ <reference key="NSTextColor" ref="27500870"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="163835329">
+ <int key="NSCellFlags">338820672</int>
+ <int key="NSCellFlags2">1024</int>
+ <reference key="NSSupport" ref="895397819"/>
+ <reference key="NSControlView" ref="99504781"/>
+ <reference key="NSBackgroundColor" ref="998664178"/>
+ <reference key="NSTextColor" ref="773964941"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <bool key="NSIsEditable">YES</bool>
+ <reference key="NSTableView" ref="99504781"/>
+ </object>
+ </array>
+ <double key="NSIntercellSpacingWidth">3</double>
+ <double key="NSIntercellSpacingHeig...
[truncated message content] |
|
From: <fr...@us...> - 2010-01-16 09:34:12
|
Revision: 632
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=632&view=rev
Author: fredm
Date: 2010-01-16 09:34:06 +0000 (Sat, 16 Jan 2010)
Log Message:
-----------
Remove RZX compression option as it is obscure and of marginal use for
non-developers.
Modified Paths:
--------------
trunk/fuse/fusepb/resources/Fuse Help/html/rzx.html
trunk/fuse/fusepb/xibs/Preferences.xib
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/rzx.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/rzx.html 2009-12-11 11:11:15 UTC (rev 631)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/rzx.html 2010-01-16 09:34:06 UTC (rev 632)
@@ -47,18 +47,6 @@
</tr>
<tr>
<td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Compress
-data</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If this option is
-selected, any RZX files written by Fuse will be compressed. This is
-generally a good thing as it makes the files significantly smaller,
-and you probably want to turn it off only if you're debugging the
-RZX files or there's some other program which doesn't support
-compressed RZX files.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
face="Lucida Grande,Helvetica,Arial"><em>Always
embed
snapshot</em></font></span></td>
Modified: trunk/fuse/fusepb/xibs/Preferences.xib
===================================================================
--- trunk/fuse/fusepb/xibs/Preferences.xib 2009-12-11 11:11:15 UTC (rev 631)
+++ trunk/fuse/fusepb/xibs/Preferences.xib 2010-01-16 09:34:06 UTC (rev 632)
@@ -2,19 +2,20 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <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>
+ <string key="IBDocument.SystemVersion">10C540</string>
+ <string key="IBDocument.InterfaceBuilderVersion">740</string>
+ <string key="IBDocument.AppKitVersion">1038.25</string>
+ <string key="IBDocument.HIToolboxVersion">458.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>
+ <string key="NS.object.0">740</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1347"/>
<integer value="1446"/>
<integer value="6"/>
+ <integer value="1488"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2445,35 +2446,14 @@
<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="785777834">
- <reference key="NSNextResponder" ref="76952719"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{183, 90}, {145, 18}}</string>
- <reference key="NSSuperview" ref="76952719"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="825652056">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Compress data</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="785777834"/>
- <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="742175854">
<reference key="NSNextResponder" ref="76952719"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{183, 70}, {175, 18}}</string>
+ <string key="NSFrame">{{183, 90}, {175, 18}}</string>
<reference key="NSSuperview" ref="76952719"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="167661398">
@@ -2514,6 +2494,7 @@
</object>
</object>
<string key="NSFrameSize">{627, 146}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="206600598">
@@ -5623,22 +5604,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
- <string key="label">value: values.compressrzx</string>
- <reference key="source" ref="785777834"/>
- <reference key="destination" ref="979455873"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="785777834"/>
- <reference key="NSDestination" ref="979455873"/>
- <string key="NSLabel">value: values.compressrzx</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">values.compressrzx</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">1502</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
<string key="label">value: values.embedsnapshot</string>
<reference key="source" ref="742175854"/>
<reference key="destination" ref="979455873"/>
@@ -7852,7 +7817,6 @@
<reference key="object" ref="76952719"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="785777834"/>
<reference ref="889648036"/>
<reference ref="742175854"/>
</object>
@@ -7869,15 +7833,6 @@
<reference key="parent" ref="76952719"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">1492</int>
- <reference key="object" ref="785777834"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="825652056"/>
- </object>
- <reference key="parent" ref="76952719"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">1493</int>
<reference key="object" ref="889648036"/>
<object class="NSMutableArray" key="children">
@@ -7892,11 +7847,6 @@
<reference key="parent" ref="889648036"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">1495</int>
- <reference key="object" ref="825652056"/>
- <reference key="parent" ref="785777834"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">1500</int>
<reference key="object" ref="167661398"/>
<reference key="parent" ref="742175854"/>
@@ -9312,12 +9262,9 @@
<string>1488.editorWindowContentRectSynchronizationRect</string>
<string>1489.IBPluginDependency</string>
<string>1489.ImportedFromIB2</string>
- <string>1492.IBPluginDependency</string>
- <string>1492.ImportedFromIB2</string>
<string>1493.IBPluginDependency</string>
<string>1493.ImportedFromIB2</string>
<string>1494.IBPluginDependency</string>
- <string>1495.IBPluginDependency</string>
<string>1500.IBPluginDependency</string>
<string>1506.IBEditorWindowLastContentRect</string>
<string>1506.IBPluginDependency</string>
@@ -9800,10 +9747,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{16, 109}, {627, 319}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2010-04-06 11:24:44
|
Revision: 635
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=635&view=rev
Author: fredm
Date: 2010-04-06 11:24:38 +0000 (Tue, 06 Apr 2010)
Log Message:
-----------
prevents problems with pressing one "special" key and releasing another
(because more than one were pressed or shift was released before the key itself)
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
Added Paths:
-----------
trunk/fuse/fusepb/keystate.c
trunk/fuse/fusepb/keystate.h
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2010-04-05 13:34:11 UTC (rev 634)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2010-04-06 11:24:38 UTC (rev 635)
@@ -158,6 +158,8 @@
B631BA0F1025878600BE1EE1 /* opus.rom in Resources */ = {isa = PBXBuildFile; fileRef = B631BA0E1025878600BE1EE1 /* opus.rom */; };
B63225EC0C66BA1300BB081B /* osname.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225EB0C66BA1300BB081B /* osname.c */; };
B63225EE0C66BA3700BB081B /* paths.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225ED0C66BA3700BB081B /* paths.c */; };
+ B635EAE7116A0FE500A166F2 /* keystate.c in Sources */ = {isa = PBXBuildFile; fileRef = B635EAE5116A0FE500A166F2 /* keystate.c */; };
+ B635EAE8116A0FE500A166F2 /* keystate.h in Headers */ = {isa = PBXBuildFile; fileRef = B635EAE6116A0FE500A166F2 /* keystate.h */; };
B6374FA50F178298003CE6E2 /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = B6374FA40F178298003CE6E2 /* timer.c */; };
B639B7680A6BAFCF00927E24 /* csw.icns in Resources */ = {isa = PBXBuildFile; fileRef = B639B7670A6BAFCF00927E24 /* csw.icns */; };
B639B7D10A6BB45600927E24 /* raw.icns in Resources */ = {isa = PBXBuildFile; fileRef = B639B7D00A6BB45600927E24 /* raw.icns */; };
@@ -422,6 +424,8 @@
B63225F30C66BA7400BB081B /* timer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = "<group>"; };
B632C6AE03E5368700A864FD /* DebuggerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerController.h; path = controllers/DebuggerController.h; sourceTree = "<group>"; };
B632C6AF03E5368700A864FD /* DebuggerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerController.m; path = controllers/DebuggerController.m; sourceTree = "<group>"; };
+ B635EAE5116A0FE500A166F2 /* keystate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keystate.c; sourceTree = SOURCE_ROOT; };
+ B635EAE6116A0FE500A166F2 /* keystate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keystate.h; sourceTree = SOURCE_ROOT; };
B6374FA40F178298003CE6E2 /* timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timer.c; path = timer/timer.c; sourceTree = SOURCE_ROOT; };
B6379299060AA0D300246736 /* se-0.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "se-0.rom"; path = "../roms/se-0.rom"; sourceTree = SOURCE_ROOT; };
B637929A060AA0D300246736 /* se-1.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "se-1.rom"; path = "../roms/se-1.rom"; sourceTree = SOURCE_ROOT; };
@@ -1154,6 +1158,8 @@
B6CE7E8A0B28027000EB65B3 /* cocoa */ = {
isa = PBXGroup;
children = (
+ B635EAE5116A0FE500A166F2 /* keystate.c */,
+ B635EAE6116A0FE500A166F2 /* keystate.h */,
B6042DBD0BBE2606000CC959 /* SDL_joystick */,
B6CE7F3B0B2830A300EB65B3 /* cocoadisplay.h */,
B6B99F890B5F798700EE408F /* cocoadisplay.m */,
@@ -1441,6 +1447,7 @@
B631BA0010257CA400BE1EE1 /* opus.h in Headers */,
B6DCBBD3114FA0E700DC9A11 /* internals.h in Headers */,
B6DCBBEF114FA0E700DC9A11 /* tape_block.h in Headers */,
+ B635EAE8116A0FE500A166F2 /* keystate.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1756,6 +1763,7 @@
B6DCBC11114FA0E700DC9A11 /* z80em.c in Sources */,
B6DCBC12114FA0E700DC9A11 /* zlib.c in Sources */,
B6DCBC13114FA0E700DC9A11 /* zxs.c in Sources */,
+ B635EAE7116A0FE500A166F2 /* keystate.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: trunk/fuse/fusepb/keystate.c
===================================================================
--- trunk/fuse/fusepb/keystate.c (rev 0)
+++ trunk/fuse/fusepb/keystate.c 2010-04-06 11:24:38 UTC (rev 635)
@@ -0,0 +1,160 @@
+/* keystate.c: keyboard input state machine - prevents problems with pressing
+ one "special" key and releasing another (because more than one
+ were pressed or shift was released before the key)
+ Copyright (c) 2010 Fredrick Meunier
+
+ $Id$
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: fr...@sp...
+
+*/
+
+#include <stdio.h>
+
+#include "input.h"
+#include "keyboard.h"
+#include "keystate.h"
+
+enum states {
+ NONE,
+ NORMAL,
+ SPECIAL,
+ MAX_STATES
+} current_state = NONE;
+
+static void action_sNONE_ePRESS_NORMAL( input_key );
+static void action_sNONE_ePRESS_SPECIAL( input_key );
+static void action_sNORMAL_ePRESS_NORMAL( input_key );
+static void action_sNORMAL_eRELEASE_NORMAL( input_key );
+static void action_sSPECIAL_ePRESS_NORMAL( input_key );
+static void action_sSPECIAL_ePRESS_SPECIAL( input_key );
+static void action_sSPECIAL_eRELEASE_SPECIAL( input_key );
+static void action_ignore( input_key );
+
+void (*const state_table[MAX_STATES][MAX_EVENTS]) (input_key keysym) = {
+
+ { action_sNONE_ePRESS_NORMAL, action_ignore, action_sNONE_ePRESS_SPECIAL,
+ action_ignore }, /* procedures for state NONE */
+
+ { action_sNORMAL_ePRESS_NORMAL, action_sNORMAL_eRELEASE_NORMAL,
+ action_ignore, action_ignore }, /* procedures for state NORMAL */
+
+ { action_sSPECIAL_ePRESS_NORMAL, action_ignore,
+ action_sSPECIAL_ePRESS_SPECIAL,
+ action_sSPECIAL_eRELEASE_SPECIAL }, /* procedures for state SPECIAL */
+
+};
+
+static input_key current_special;
+static int normal_count = 0;
+
+void
+press_key( input_key keysym )
+{
+ input_event_t fuse_event;
+ fuse_event.type = INPUT_EVENT_KEYPRESS;
+ //fuse_event.types.key.native_key = fuse_keysym;
+ fuse_event.types.key.spectrum_key = keysym;
+ input_event( &fuse_event );
+}
+
+void
+release_key( input_key keysym )
+{
+ input_event_t fuse_event;
+ fuse_event.type = INPUT_EVENT_KEYRELEASE;
+ //fuse_event.types.key.native_key = fuse_keysym;
+ fuse_event.types.key.spectrum_key = keysym;
+ input_event( &fuse_event );
+}
+
+void action_ignore( input_key keysym ) {}
+
+void
+action_sNONE_ePRESS_NORMAL( input_key keysym )
+{
+ normal_count++;
+ press_key(keysym);
+ current_state = NORMAL;
+}
+
+void
+action_sNONE_ePRESS_SPECIAL( input_key keysym )
+{
+ current_special = keysym;
+ /* override caps and symbol shifts if the user is pressing a special key that
+ * may require specific settings of these
+ */
+ keyboard_release( KEYBOARD_Caps );
+ keyboard_release( KEYBOARD_Symbol );
+ press_key(keysym);
+ current_state = SPECIAL;
+}
+
+void
+action_sNORMAL_ePRESS_NORMAL( input_key keysym )
+{
+ normal_count++;
+ // track depth, increment no of pressed NORMALs
+ press_key(keysym);
+}
+
+void
+action_sNORMAL_eRELEASE_NORMAL( input_key keysym )
+{
+ normal_count--;
+ // track depth, if depth is 0 switch back to NONE
+ if( !normal_count ) current_state = NONE;
+ release_key(keysym);
+}
+
+void
+action_sSPECIAL_ePRESS_NORMAL( input_key keysym )
+{
+ normal_count++;
+ release_key(current_special);
+ current_state = NORMAL;
+}
+
+void
+action_sSPECIAL_ePRESS_SPECIAL( input_key keysym )
+{
+ // release old special key, press new one
+ release_key(current_special);
+ current_special = keysym;
+ press_key(current_special);
+}
+
+void
+action_sSPECIAL_eRELEASE_SPECIAL( input_key keysym )
+{
+ current_state = NONE;
+ release_key(current_special);
+}
+
+void
+process_keyevent( enum events event, input_key keysym )
+{
+ if(((event >=0) && (event < MAX_EVENTS)) &&
+ ((current_state >= 0) && (current_state < MAX_STATES))) {
+ state_table[current_state][event]( keysym ); /* call the action procedure */
+ } else {
+ /* invalid event/state - shouldn't happen, just ignore for now */
+ }
+}
Added: trunk/fuse/fusepb/keystate.h
===================================================================
--- trunk/fuse/fusepb/keystate.h (rev 0)
+++ trunk/fuse/fusepb/keystate.h 2010-04-06 11:24:38 UTC (rev 635)
@@ -0,0 +1,41 @@
+/* keystate.h: keyboard input state machine - prevents problems with pressing
+ one "special" key and releasing another (because more than one
+ were pressed or shift was released before the key)
+ Copyright (c) 2010 Fredrick Meunier
+
+ $Id$
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: fr...@sp...
+
+*/
+
+#ifndef KEYSTATE_H
+#define KEYSTATE_H
+
+enum events {
+ PRESS_NORMAL,
+ RELEASE_NORMAL,
+ PRESS_SPECIAL,
+ RELEASE_SPECIAL,
+ MAX_EVENTS
+};
+
+void process_keyevent( enum events event, input_key keysym );
+
+#endif /* #ifndef KEYSTATE_H */
Modified: trunk/fuse/fusepb/models/Emulator.h
===================================================================
--- trunk/fuse/fusepb/models/Emulator.h 2010-04-05 13:34:11 UTC (rev 634)
+++ trunk/fuse/fusepb/models/Emulator.h 2010-04-06 11:24:38 UTC (rev 635)
@@ -18,7 +18,6 @@
Author contact information:
E-mail: fr...@sp...
- Postal address: 3/66 Roslyn Gardens, Ruscutters Bay, NSW 2011, Australia
*/
@@ -47,10 +46,6 @@
BOOL shiftDown;
BOOL commandDown;
- int cocoakeyboard_caps_shift_pressed;
- int cocoakeyboard_symbol_shift_pressed;
- input_key unicode_keysym;
-
DisplayOpenGLView *proxy_view;
}
+(Emulator *) instance;
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2010-04-05 13:34:11 UTC (rev 634)
+++ trunk/fuse/fusepb/models/Emulator.m 2010-04-06 11:24:38 UTC (rev 635)
@@ -18,7 +18,6 @@
Author contact information:
E-mail: fr...@sp...
- Postal address: 3/66 Roslyn Gardens, Ruscutters Bay, NSW 2011, Australia
*/
@@ -34,6 +33,7 @@
#include "if1.h"
#include "if2.h"
#include "keyboard.h"
+#include "keystate.h"
#include "machine.h"
#include "menu.h"
#include "profile.h"
@@ -128,10 +128,6 @@
shiftDown = NO;
commandDown = NO;
- cocoakeyboard_caps_shift_pressed = 0;
- cocoakeyboard_symbol_shift_pressed = 0;
- unicode_keysym = INPUT_KEY_NONE;
-
time = CFAbsoluteTimeGetCurrent(); /* set emulation time start time */
return self;
@@ -746,42 +742,70 @@
return ptr ? *ptr : INPUT_KEY_NONE;
}
+// Things that will be implemented as multiple key presses in the emulation
+// core
+-(BOOL) isSpecial:(input_key)type
+{
+ switch( type ) {
+ case INPUT_KEY_Up:
+ case INPUT_KEY_Down:
+ case INPUT_KEY_Left:
+ case INPUT_KEY_Right:
+ case INPUT_KEY_BackSpace:
+ case INPUT_KEY_minus:
+ case INPUT_KEY_underscore:
+ case INPUT_KEY_equal:
+ case INPUT_KEY_plus:
+ case INPUT_KEY_semicolon:
+ case INPUT_KEY_colon:
+ case INPUT_KEY_apostrophe:
+ case INPUT_KEY_quotedbl:
+ case INPUT_KEY_numbersign:
+ case INPUT_KEY_comma:
+ case INPUT_KEY_less:
+ case INPUT_KEY_period:
+ case INPUT_KEY_greater:
+ case INPUT_KEY_slash:
+ case INPUT_KEY_question:
+ case INPUT_KEY_exclamation:
+ case INPUT_KEY_at:
+ case INPUT_KEY_dollar:
+ case INPUT_KEY_percent:
+ case INPUT_KEY_ampersand:
+ case INPUT_KEY_lbracket:
+ case INPUT_KEY_rbracket:
+ case INPUT_KEY_carat:
+ case INPUT_KEY_star:
+ return YES;
+ break;
+ default:
+ return NO;
+ }
+}
+
-(void) keyChange:(NSEvent *)theEvent type:(input_event_type)type
{
+ if( [theEvent isARepeat] == YES ) return;
unsigned short keyCode = [theEvent keyCode];
NSString *characters = [theEvent charactersIgnoringModifiers];
if( NO == commandDown && [characters length] ) {
input_key fuse_keysym;
- input_event_t fuse_event;
+ enum events event_type;
fuse_keysym = keysyms_remap( keyCode );
if( fuse_keysym == INPUT_KEY_NONE ) {
fuse_keysym = [self otherKeysymsRemap:[characters characterAtIndex:0]
inHash:unicode_keysyms_hash];
- if( fuse_keysym != INPUT_KEY_NONE ) {
- unicode_keysym = fuse_keysym;
- /* record current values of caps and symbol shift. We will temoprarily
- * override these for the duration of the unicoded simulated keypresses
- */
- if( ( cocoakeyboard_caps_shift_pressed = keyboard_state( KEYBOARD_Caps ) ) )
- {
- keyboard_release( KEYBOARD_Caps );
- }
- if( ( cocoakeyboard_symbol_shift_pressed =
- keyboard_state( KEYBOARD_Symbol ) ) ) {
- keyboard_release( KEYBOARD_Symbol );
- }
- }
}
- fuse_event.type = type;
- if( unicode_keysym == INPUT_KEY_NONE )
- fuse_event.types.key.native_key = fuse_keysym;
- else
- fuse_event.types.key.native_key = unicode_keysym;
- fuse_event.types.key.spectrum_key = fuse_keysym;
+ if( [self isSpecial:fuse_keysym] == YES ) {
+ event_type = type == INPUT_EVENT_KEYPRESS ? PRESS_SPECIAL :
+ RELEASE_SPECIAL;
+ } else {
+ event_type = type == INPUT_EVENT_KEYPRESS ? PRESS_NORMAL : RELEASE_NORMAL;
+ }
- input_event( &fuse_event );
+ process_keyevent( event_type, fuse_keysym );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2010-09-28 11:58:26
|
Revision: 647
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=647&view=rev
Author: fredm
Date: 2010-09-28 11:58:20 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Use @property and friends for accessors where possible.
Modified Paths:
--------------
trunk/fuse/fusepb/content_arrays/CAMachines.h
trunk/fuse/fusepb/content_arrays/CAMachines.m
trunk/fuse/fusepb/content_arrays/HIDJoysticks.h
trunk/fuse/fusepb/content_arrays/HIDJoysticks.m
trunk/fuse/fusepb/content_arrays/Joysticks.h
trunk/fuse/fusepb/content_arrays/Joysticks.m
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/controllers/TapeBrowserController.h
trunk/fuse/fusepb/controllers/TapeBrowserController.m
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/views/Texture.h
trunk/fuse/fusepb/views/Texture.m
Modified: trunk/fuse/fusepb/content_arrays/CAMachines.h
===================================================================
--- trunk/fuse/fusepb/content_arrays/CAMachines.h 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/content_arrays/CAMachines.h 2010-09-28 11:58:20 UTC (rev 647)
@@ -36,10 +36,8 @@
+ (id)machineWithName:(NSString *)aTitle andType:(int)aValue;
+ (Machine *)machineForName:(NSString *)theName;
+ (Machine *)machineForType:(int)theType;
-- (int)machineType;
-- (void)setMachineType:(int)aValue;
-- (NSString *)machineName;
-- (void)setMachineName:(NSString *)aName;
+@property (copy,getter=machineName,setter=setMachineName) NSString *name;
+@property (getter=machineType,setter=setMachineType:) int type;
- (id)copyWithZone:(NSZone *)zone;
- (id)valueForUndefinedKey:(NSString *)key;
Modified: trunk/fuse/fusepb/content_arrays/CAMachines.m
===================================================================
--- trunk/fuse/fusepb/content_arrays/CAMachines.m 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/content_arrays/CAMachines.m 2010-09-28 11:58:20 UTC (rev 647)
@@ -120,30 +120,9 @@
// Accessors
-- (NSString *)machineName
-{
- return name;
-}
+@synthesize name;
+@synthesize type;
-- (void)setMachineName:(NSString *)aName
-{
- if (name != aName) {
- [name release];
- name = [aName copy];
- }
- return;
-}
-
-- (int)machineType
-{
- return type;
-}
-
-- (void)setMachineType:(int)aValue
-{
- type = aValue;
-}
-
- (void)dealloc
{
[self setMachineName:nil];
Modified: trunk/fuse/fusepb/content_arrays/HIDJoysticks.h
===================================================================
--- trunk/fuse/fusepb/content_arrays/HIDJoysticks.h 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/content_arrays/HIDJoysticks.h 2010-09-28 11:58:20 UTC (rev 647)
@@ -36,10 +36,8 @@
+ (id)joystickWithName:(NSString *)aTitle andType:(int)aValue;
+ (HIDJoystick *)joystickForName:(NSString *)theName;
+ (HIDJoystick *)joystickForType:(int)theType;
-- (int)joystickType;
-- (void)setJoystickType:(int)aValue;
-- (NSString *)joystickName;
-- (void)setJoystickName:(NSString *)aName;
+@property (retain,getter=joystickName,setter=setJoystickName:) NSString *name;
+@property (getter=joystickType,setter=setJoystickType:) int type;
- (id)copyWithZone:(NSZone *)zone;
- (id)valueForUndefinedKey:(NSString *)key;
Modified: trunk/fuse/fusepb/content_arrays/HIDJoysticks.m
===================================================================
--- trunk/fuse/fusepb/content_arrays/HIDJoysticks.m 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/content_arrays/HIDJoysticks.m 2010-09-28 11:58:20 UTC (rev 647)
@@ -124,30 +124,9 @@
// Accessors
-- (NSString *)joystickName
-{
- return name;
-}
+@synthesize name;
+@synthesize type;
-- (void)setJoystickName:(NSString *)aName
-{
- if (name != aName) {
- [name release];
- name = [aName copy];
- }
- return;
-}
-
-- (int)joystickType
-{
- return type;
-}
-
-- (void)setJoystickType:(int)aValue
-{
- type = aValue;
-}
-
- (void)dealloc
{
[self setJoystickName:nil];
Modified: trunk/fuse/fusepb/content_arrays/Joysticks.h
===================================================================
--- trunk/fuse/fusepb/content_arrays/Joysticks.h 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/content_arrays/Joysticks.h 2010-09-28 11:58:20 UTC (rev 647)
@@ -36,10 +36,8 @@
+ (id)joystickWithName:(NSString *)aTitle andType:(int)aValue;
+ (Joystick *)joystickForName:(NSString *)theName;
+ (Joystick *)joystickForType:(int)theType;
-- (int)joystickType;
-- (void)setJoystickType:(int)aValue;
-- (NSString *)joystickName;
-- (void)setJoystickName:(NSString *)aName;
+@property (retain,getter=joystickName,setter=setJoystickName:) NSString *name;
+@property (getter=joystickType,setter=setJoystickType:) int type;
- (id)copyWithZone:(NSZone *)zone;
- (id)valueForUndefinedKey:(NSString *)key;
Modified: trunk/fuse/fusepb/content_arrays/Joysticks.m
===================================================================
--- trunk/fuse/fusepb/content_arrays/Joysticks.m 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/content_arrays/Joysticks.m 2010-09-28 11:58:20 UTC (rev 647)
@@ -120,30 +120,9 @@
// Accessors
-- (NSString *)joystickName
-{
- return name;
-}
+@synthesize name;
+@synthesize type;
-- (void)setJoystickName:(NSString *)aName
-{
- if (name != aName) {
- [name release];
- name = [aName copy];
- }
- return;
-}
-
-- (int)joystickType
-{
- return type;
-}
-
-- (void)setJoystickType:(int)aValue
-{
- type = aValue;
-}
-
- (void)dealloc
{
[self setJoystickName:nil];
Modified: trunk/fuse/fusepb/controllers/FuseController.h
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.h 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/controllers/FuseController.h 2010-09-28 11:58:20 UTC (rev 647)
@@ -146,7 +146,7 @@
- (IBAction)saveFileTypeClicked:(id)sender;
- savePanelAccessoryView;
-- (NSPopUpButton*) saveFileType;
+@property (getter=saveFileType,readonly) NSPopUpButton* saveFileType;
- (void)releaseCmdKeys:(NSString *)character:(int)keyCode;
- (void)releaseKey:(int)keyCode;
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2010-09-28 11:58:20 UTC (rev 647)
@@ -1046,10 +1046,7 @@
return savePanelAccessoryView;
}
-- (NSPopUpButton*) saveFileType
-{
- return saveFileType;
-}
+@synthesize saveFileType;
- (IBAction)resetUserDefaults:(id)sender
{
Modified: trunk/fuse/fusepb/controllers/TapeBrowserController.h
===================================================================
--- trunk/fuse/fusepb/controllers/TapeBrowserController.h 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/controllers/TapeBrowserController.h 2010-09-28 11:58:20 UTC (rev 647)
@@ -49,7 +49,6 @@
- (void)tableViewSelectionDidChange:(NSNotification *)aNotification;
-- (NSArrayController *)tapeController;
-- (NSArrayController *)infoController;
-
+@property (retain,getter=tapeController,readonly) NSArrayController *tapeController;
+@property (retain,getter=infoController,readonly) NSArrayController *infoController;
@end
Modified: trunk/fuse/fusepb/controllers/TapeBrowserController.m
===================================================================
--- trunk/fuse/fusepb/controllers/TapeBrowserController.m 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/controllers/TapeBrowserController.m 2010-09-28 11:58:20 UTC (rev 647)
@@ -129,16 +129,8 @@
initialising = [value boolValue];
}
-- (NSArrayController *)tapeController
-{
- return [[tapeController retain] autorelease];
-}
-
-- (NSArrayController *)infoController
-{
- return [[infoController retain] autorelease];
-}
-
+@synthesize tapeController;
+@synthesize infoController;
@end
static void
Modified: trunk/fuse/fusepb/models/Emulator.h
===================================================================
--- trunk/fuse/fusepb/models/Emulator.h 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/models/Emulator.h 2010-09-28 11:58:20 UTC (rev 647)
@@ -53,8 +53,6 @@
-(void) connectWithPorts:(NSArray *)portArray;
-(void) stop;
--(BOOL) isEmulating;
-
-(void) startEmulationTimer;
-(void) stopEmulationTimer;
@@ -191,4 +189,5 @@
-(void) debuggerActivate;
+@property (getter=isEmulating,readonly) BOOL isEmulating;
@end
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/models/Emulator.m 2010-09-28 11:58:20 UTC (rev 647)
@@ -620,10 +620,7 @@
return divide_eject( unit );
}
--(BOOL) isEmulating
-{
- return isEmulating;
-}
+@synthesize isEmulating;
-(void) startEmulationTimer
{
Modified: trunk/fuse/fusepb/views/Texture.h
===================================================================
--- trunk/fuse/fusepb/views/Texture.h 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/views/Texture.h 2010-09-28 11:58:20 UTC (rev 647)
@@ -40,7 +40,7 @@
-(void) dealloc;
-(Cocoa_Texture*) getTexture;
--(GLuint) getTextureId;
+@property (getter=getTextureId,readonly) GLuint textureId;
-(void) uploadIconTexture;
Modified: trunk/fuse/fusepb/views/Texture.m
===================================================================
--- trunk/fuse/fusepb/views/Texture.m 2010-09-24 12:32:35 UTC (rev 646)
+++ trunk/fuse/fusepb/views/Texture.m 2010-09-28 11:58:20 UTC (rev 647)
@@ -93,10 +93,7 @@
return &texture;
}
--(GLuint) getTextureId
-{
- return textureId;
-}
+@synthesize textureId;
-(void) uploadIconTexture;
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2010-10-16 09:47:13
|
Revision: 653
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=653&view=rev
Author: fredm
Date: 2010-10-16 09:47:07 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
We don't link and C++ code in any more, so main can move back to Objective-C instead
of Objective-C++.
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/fuse/fusepb/main.m
Removed Paths:
-------------
trunk/fuse/fusepb/main.mm
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2010-10-16 09:43:30 UTC (rev 652)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2010-10-16 09:47:07 UTC (rev 653)
@@ -151,7 +151,7 @@
B629532E114FB265007808E0 /* libspectrum.h.in in Resources */ = {isa = PBXBuildFile; fileRef = B6DCBB7A114FA0E700DC9A11 /* libspectrum.h.in */; };
B62B19E10DD31DF500D42AAF /* scalers16.c in Sources */ = {isa = PBXBuildFile; fileRef = B62B19E00DD31DF500D42AAF /* scalers16.c */; };
B62B1A280DD6655800D42AAF /* fuse.c in Sources */ = {isa = PBXBuildFile; fileRef = B62B1A270DD6655800D42AAF /* fuse.c */; };
- B62B1A2A0DD667EC00D42AAF /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = B62B1A290DD667EC00D42AAF /* main.mm */; };
+ B62B1A2A0DD667EC00D42AAF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B62B1A290DD667EC00D42AAF /* main.m */; };
B631B9FF10257CA400BE1EE1 /* opus.c in Sources */ = {isa = PBXBuildFile; fileRef = B631B9FD10257CA400BE1EE1 /* opus.c */; };
B631BA0010257CA400BE1EE1 /* opus.h in Headers */ = {isa = PBXBuildFile; fileRef = B631B9FE10257CA400BE1EE1 /* opus.h */; };
B631BA0F1025878600BE1EE1 /* opus.rom in Resources */ = {isa = PBXBuildFile; fileRef = B631BA0E1025878600BE1EE1 /* opus.rom */; };
@@ -418,7 +418,7 @@
B6251C3D0C2EB24500BD5543 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
B62B19E00DD31DF500D42AAF /* scalers16.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = scalers16.c; path = scaler/scalers16.c; sourceTree = SOURCE_ROOT; };
B62B1A270DD6655800D42AAF /* fuse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = fuse.c; sourceTree = "<group>"; };
- B62B1A290DD667EC00D42AAF /* main.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
+ B62B1A290DD667EC00D42AAF /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
B62F3BCE059F5BF300A7009A /* PokeFinderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PokeFinderController.h; path = controllers/PokeFinderController.h; sourceTree = "<group>"; };
B62F3BCF059F5BF300A7009A /* PokeFinderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PokeFinderController.m; path = controllers/PokeFinderController.m; sourceTree = "<group>"; };
B631B9FD10257CA400BE1EE1 /* opus.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opus.c; sourceTree = "<group>"; };
@@ -801,7 +801,7 @@
B66EA7840401075300A864FD /* FuseMenus.m */,
B6A7F0E904C9A11D001025EB /* NumberFormatter.h */,
B6A7F0EA04C9A11D001025EB /* NumberFormatter.m */,
- B62B1A290DD667EC00D42AAF /* main.mm */,
+ B62B1A290DD667EC00D42AAF /* main.m */,
);
name = Classes;
sourceTree = "<group>";
@@ -1737,7 +1737,7 @@
B665FD490DD25D8900D21C79 /* upd_fdc.c in Sources */,
B62B19E10DD31DF500D42AAF /* scalers16.c in Sources */,
B62B1A280DD6655800D42AAF /* fuse.c in Sources */,
- B62B1A2A0DD667EC00D42AAF /* main.mm in Sources */,
+ B62B1A2A0DD667EC00D42AAF /* main.m in Sources */,
B684A19A0E93A88200A5B097 /* mempool.c in Sources */,
B684A19E0E93A8CD00A5B097 /* event.c in Sources */,
B684A1A00E93A8D700A5B097 /* variable.c in Sources */,
Copied: trunk/fuse/fusepb/main.m (from rev 649, trunk/fuse/fusepb/main.mm)
===================================================================
--- trunk/fuse/fusepb/main.m (rev 0)
+++ trunk/fuse/fusepb/main.m 2010-10-16 09:47:07 UTC (rev 653)
@@ -0,0 +1,68 @@
+/* main.m: The Free Unix Spectrum Emulator
+ Copyright (c) 2006-2010 Fredrick Meunier
+
+ $Id: fuse.c,v 1.130 2006/07/28 15:06:14 fredm Exp $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Author contact information:
+
+ E-mail: pak...@sr...
+ Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+
+*/
+
+#import <Cocoa/Cocoa.h>
+
+#include <stdlib.h>
+
+#include "fuse.h"
+#include "main.h"
+#include "settings.h"
+
+int ac;
+char **av;
+
+int main(int argc, char *argv[])
+{
+ int retval, i;
+
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+ int error = settings_defaults( &settings_current );
+ if( error ) return error;
+
+ /* This is passed if we are launched by double-clicking */
+ if ( argc >= 2 && strncmp( argv[1], "-psn", 4 ) == 0 ) {
+ ac = 1;
+ } else {
+ ac = argc;
+ }
+ av = (char**) malloc( sizeof(*av) * (ac+1) );
+ for( i = 0; i < ac; i++ )
+ av[i] = argv[i];
+ av[i] = NULL;
+
+ if( settings_current.show_help ||
+ settings_current.show_version ) return 0;
+
+ retval = NSApplicationMain( argc, (const char**)argv );
+
+ fuse_end();
+
+ [pool release];
+
+ return retval;
+}
Deleted: trunk/fuse/fusepb/main.mm
===================================================================
--- trunk/fuse/fusepb/main.mm 2010-10-16 09:43:30 UTC (rev 652)
+++ trunk/fuse/fusepb/main.mm 2010-10-16 09:47:07 UTC (rev 653)
@@ -1,70 +0,0 @@
-/* main.mm: The Free Unix Spectrum Emulator
- Copyright (c) 2006-2009 Fredrick Meunier
-
- $Id: fuse.c,v 1.130 2006/07/28 15:06:14 fredm Exp $
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- Author contact information:
-
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
-
-*/
-
-#import <Cocoa/Cocoa.h>
-
-#include <stdlib.h>
-
-extern "C" {
-#include "fuse.h"
-#include "main.h"
-#include "settings.h"
-}
-
-int ac;
-char **av;
-
-int main(int argc, char *argv[])
-{
- int retval, i;
-
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- int error = settings_defaults( &settings_current );
- if( error ) return error;
-
- /* This is passed if we are launched by double-clicking */
- if ( argc >= 2 && strncmp( argv[1], "-psn", 4 ) == 0 ) {
- ac = 1;
- } else {
- ac = argc;
- }
- av = (char**) malloc( sizeof(*av) * (ac+1) );
- for( i = 0; i < ac; i++ )
- av[i] = argv[i];
- av[i] = NULL;
-
- if( settings_current.show_help ||
- settings_current.show_version ) return 0;
-
- retval = NSApplicationMain( argc, (const char**)argv );
-
- fuse_end();
-
- [pool release];
-
- return retval;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2012-12-21 21:54:58
|
Revision: 721
http://sourceforge.net/p/fuse-for-macosx/code/721
Author: fredm
Date: 2012-12-21 21:54:56 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Build against 10.7 SDK for wider support.
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/controllers/TapeBrowserController.m
trunk/fuse/fusepb/transformers/MachineScalerIsEnabled.m
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2012-12-08 11:50:59 UTC (rev 720)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2012-12-21 21:54:56 UTC (rev 721)
@@ -1894,6 +1894,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+ SDKROOT = macosx10.7;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1935,6 +1936,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+ SDKROOT = macosx10.7;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1975,6 +1977,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+ SDKROOT = macosx10.7;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
Modified: trunk/fuse/fusepb/controllers/TapeBrowserController.m
===================================================================
--- trunk/fuse/fusepb/controllers/TapeBrowserController.m 2012-12-08 11:50:59 UTC (rev 720)
+++ trunk/fuse/fusepb/controllers/TapeBrowserController.m 2012-12-21 21:54:56 UTC (rev 721)
@@ -343,13 +343,13 @@
[tapeBrowserController
performSelectorOnMainThread:@selector(setInitialising:)
- withObject:@YES
+ withObject:@(YES)
waitUntilDone:NO
];
error = tape_foreach( add_block_details, tapeBrowserController );
[tapeBrowserController
performSelectorOnMainThread:@selector(setInitialising:)
- withObject:@NO
+ withObject:@(NO)
waitUntilDone:NO
];
if( error ) return error;
Modified: trunk/fuse/fusepb/transformers/MachineScalerIsEnabled.m
===================================================================
--- trunk/fuse/fusepb/transformers/MachineScalerIsEnabled.m 2012-12-08 11:50:59 UTC (rev 720)
+++ trunk/fuse/fusepb/transformers/MachineScalerIsEnabled.m 2012-12-21 21:54:56 UTC (rev 721)
@@ -64,7 +64,7 @@
return @(retval);
}
- return @NO;
+ return @(NO);
}
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-03-12 10:38:27
|
Revision: 730
http://sourceforge.net/p/fuse-for-macosx/code/730
Author: fredm
Date: 2013-03-12 10:38:25 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Make releaseCmdKeys function resemble Objective-C code.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/controllers/FuseController.h
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.h 2013-03-12 10:35:28 UTC (rev 729)
+++ trunk/fuse/fusepb/controllers/FuseController.h 2013-03-12 10:38:25 UTC (rev 730)
@@ -158,7 +158,7 @@
- savePanelAccessoryView;
@property (getter=saveFileType,readonly) NSPopUpButton* saveFileType;
-- (void)releaseCmdKeys:(NSString *)character:(int)keyCode;
+- (void)releaseCmdKeys:(NSString *)character withCode:(int)keyCode;
- (void)releaseKey:(int)keyCode;
- (void)ui_menu_activate_media_cartridge:(NSNumber*)active;
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2013-03-12 10:35:28 UTC (rev 729)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2013-03-12 10:38:25 UTC (rev 730)
@@ -619,7 +619,7 @@
[[DisplayOpenGLView instance] unpause];
}
- [self releaseCmdKeys:@"o":QZ_o];
+ [self releaseCmdKeys:@"o" withCode:QZ_o];
}
- (IBAction)reset:(id)sender
@@ -668,13 +668,13 @@
- (IBAction)rzx_insert_snap:(id)sender
{
[[DisplayOpenGLView instance] rzxInsertSnap];
- [self releaseCmdKeys:@"b":QZ_b];
+ [self releaseCmdKeys:@"b" withCode:QZ_b];
}
- (IBAction)rzx_rollback:(id)sender
{
[[DisplayOpenGLView instance] rzxRollback];
- [self releaseCmdKeys:@"z":QZ_z];
+ [self releaseCmdKeys:@"z" withCode:QZ_z];
}
- (IBAction)rzx_start:(id)sender
@@ -784,7 +784,7 @@
save_as_exit:
[[DisplayOpenGLView instance] unpause];
}
- [self releaseCmdKeys:@"s":QZ_s];
+ [self releaseCmdKeys:@"s" withCode:QZ_s];
}
- (IBAction)open_screen:(id)sender
@@ -912,7 +912,7 @@
- (IBAction)joystick_keyboard:(id)sender
{
[[DisplayOpenGLView instance] joystickToggleKeyboard];
- [self releaseCmdKeys:@"j":QZ_j];
+ [self releaseCmdKeys:@"j" withCode:QZ_j];
}
- (IBAction)tape_clear:(id)sender
@@ -942,7 +942,7 @@
- (IBAction)tape_play:(id)sender
{
[[DisplayOpenGLView instance] tapeTogglePlay];
- [self releaseCmdKeys:@"p":QZ_p];
+ [self releaseCmdKeys:@"p" withCode:QZ_p];
}
- (IBAction)tape_rewind:(id)sender
@@ -1024,13 +1024,13 @@
if( !settings_current.full_screen ) {
[[NSApp keyWindow] performClose:self];
}
- [self releaseCmdKeys:@"q":QZ_q];
+ [self releaseCmdKeys:@"q" withCode:QZ_q];
}
- (IBAction)hide:(id)sender
{
[NSApp hide:self];
- [self releaseCmdKeys:@"h":QZ_h];
+ [self releaseCmdKeys:@"h" withCode:QZ_h];
}
- (IBAction)help:(id)sender
@@ -1038,7 +1038,7 @@
if( !settings_current.full_screen ) {
[NSApp showHelp:self];
}
- [self releaseCmdKeys:@"?":QZ_SLASH];
+ [self releaseCmdKeys:@"?" withCode:QZ_SLASH];
}
- (IBAction)cocoa_break:(id)sender
@@ -1077,7 +1077,7 @@
}
[keyboardController showCloseWindow:self];
}
- [self releaseCmdKeys:@"k":QZ_k];
+ [self releaseCmdKeys:@"k" withCode:QZ_k];
}
- (IBAction)showLoadBinaryPane:(id)sender
@@ -1127,7 +1127,7 @@
preferencesController = [[PreferencesController alloc] init];
}
[preferencesController showWindow:self];
- [self releaseCmdKeys:@".":QZ_PERIOD];
+ [self releaseCmdKeys:@"." withCode:QZ_PERIOD];
}
- (IBAction)saveFileTypeClicked:(id)sender;
@@ -1181,7 +1181,7 @@
* to keep the SDL library in a sane state, otherwise only every other
* shortcut keypress will work.
*-----------------------------------------------------------------------------*/
-- (void) releaseCmdKeys:(NSString *)character:(int)keyCode
+- (void) releaseCmdKeys:(NSString *)character withCode:(int)keyCode
{
NSEvent *event1, *event2;
NSPoint point = { 0, 0 };
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2013-03-12 10:35:28 UTC (rev 729)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2013-03-12 10:38:25 UTC (rev 730)
@@ -122,7 +122,7 @@
[view_lock lock];
statusbar_updated = YES;
[view_lock unlock];
- [[FuseController singleton] releaseCmdKeys:@"f":QZ_f];
+ [[FuseController singleton] releaseCmdKeys:@"f" withCode:QZ_f];
}
-(IBAction) zoom:(id)sender
@@ -133,33 +133,33 @@
case 1: /* 320x240 */
size.width = 320;
size.height = 240;
- [[FuseController singleton] releaseCmdKeys:@"1":QZ_1];
+ [[FuseController singleton] releaseCmdKeys:@"1" withCode:QZ_1];
break;
case 2: /* 640x480 */
size.width = 640;
size.height = 480;
- [[FuseController singleton] releaseCmdKeys:@"2":QZ_2];
+ [[FuseController singleton] releaseCmdKeys:@"2" withCode:QZ_2];
break;
case 3: /* 960x720 */
size.width = 960;
size.height = 720;
- [[FuseController singleton] releaseCmdKeys:@"3":QZ_3];
+ [[FuseController singleton] releaseCmdKeys:@"3" withCode:QZ_3];
break;
case 4: /* 1280x960 */
size.width = 1280;
size.height = 960;
- [[FuseController singleton] releaseCmdKeys:@"4":QZ_4];
+ [[FuseController singleton] releaseCmdKeys:@"4" withCode:QZ_4];
break;
case 5: /* 1600x1200 */
size.width = 1600;
size.height = 1200;
- [[FuseController singleton] releaseCmdKeys:@"5":QZ_5];
+ [[FuseController singleton] releaseCmdKeys:@"5" withCode:QZ_5];
break;
case 0:
default: /* Actual size */
size.width = screenTex[0].image_width;
size.height = screenTex[0].image_height;
- [[FuseController singleton] releaseCmdKeys:@"0":QZ_0];
+ [[FuseController singleton] releaseCmdKeys:@"0" withCode:QZ_0];
}
[[self window] setContentSize:size];
@@ -1438,7 +1438,7 @@
-(void) windowDidDeminiaturize:(NSNotification *)inNotification
{
- [[FuseController singleton] releaseCmdKeys:@"m":QZ_m];
+ [[FuseController singleton] releaseCmdKeys:@"m" withCode:QZ_m];
}
-(void) displayLinkStop
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-04-26 05:15:15
|
Revision: 743
http://sourceforge.net/p/fuse-for-macosx/code/743
Author: fredm
Date: 2013-04-26 05:15:13 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Move version numbers to 4915.
Modified Paths:
--------------
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2013-04-25 05:47:40 UTC (rev 742)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2013-04-26 05:15:13 UTC (rev 743)
@@ -552,7 +552,7 @@
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>4918</string>
+ <string>4915</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-02-14 11:29:33
|
Revision: 773
http://sourceforge.net/p/fuse-for-macosx/code/773
Author: fredm
Date: 2014-02-14 11:29:29 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Bring changelog and version numbers up to date.
Modified Paths:
--------------
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/config.h
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2014-02-13 12:13:39 UTC (rev 772)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2014-02-14 11:29:29 UTC (rev 773)
@@ -548,11 +548,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.1.1</string>
+ <string>1.1.1.1</string>
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>1.1.1</string>
+ <string>1.1.1.1</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/fuse/fusepb/config.h
===================================================================
--- trunk/fuse/fusepb/config.h 2014-02-13 12:13:39 UTC (rev 772)
+++ trunk/fuse/fusepb/config.h 2014-02-14 11:29:29 UTC (rev 773)
@@ -5,7 +5,7 @@
#define BUILD_SPECTRANET 1
/* Define copyright of Fuse */
-#define FUSE_COPYRIGHT "(c) 1999-2013 Philip Kendall and others"
+#define FUSE_COPYRIGHT "(c) 1999-2014 Philip Kendall and others"
/* Define version information for win32 executables */
#define FUSE_RC_VERSION 1,1,0,0
@@ -167,7 +167,7 @@
/* #undef USE_WIDGET */
/* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "1.1.1.1"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2014-02-13 12:13:39 UTC (rev 772)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2014-02-14 11:29:29 UTC (rev 773)
@@ -10,8 +10,36 @@
<body>
<font face="Lucida Grande,Helvetica,Arial">
<!-- AppleSegStart="What's New In Fuse?" --><a name="What's New In
- Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 1.1.1 of the Fuse emulator." --></font><br>
+ Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 1.1.1.1 of the Fuse emulator." --></font><br>
<h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
+ Fuse For Mac OS X 1.1.1.1</font></font></h2>
+ <ul>
+ <li><font face="Lucida Grande,Helvetica,Arial">Miscellaneous
+ improvements:</font></li>
+ <li style="list-style-type: none; list-style-image: none;
+ list-style-position: outside;">
+ <ul>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix kernel
+ panic resizing window during screen updates (Fredrick
+ Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Restore support
+ for playing emulator recordings (RZX files) with no
+ embedded snapshot</font><font face="Lucida
+ Grande,Helvetica,Arial"> (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Restore support
+ for competition mode emulator recordings (RZX files) </font><font
+ face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial">(Fredrick Meunier).</font></font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial"><font
+ face="Lucida Grande,Helvetica,Arial">Fix sound loop when
+ pausing emulator</font></font><font face="Lucida
+ Grande,Helvetica,Arial"> (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Now requires
+ Mac OS X 10.8+</font></li>
+ </ul>
+ </li>
+ </ul>
+ <h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
Fuse For Mac OS X 1.1.1</font></font></h2>
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">New policy:</font></li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-03-22 11:32:46
|
Revision: 776
http://sourceforge.net/p/fuse-for-macosx/code/776
Author: fredm
Date: 2014-03-22 11:32:42 +0000 (Sat, 22 Mar 2014)
Log Message:
-----------
NSForm doesn't get along with XCode 5, replace with NSTextField
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/DebuggerController.h
trunk/fuse/fusepb/xibs/Debugger.xib
Modified: trunk/fuse/fusepb/controllers/DebuggerController.h
===================================================================
--- trunk/fuse/fusepb/controllers/DebuggerController.h 2014-03-22 10:41:43 UTC (rev 775)
+++ trunk/fuse/fusepb/controllers/DebuggerController.h 2014-03-22 11:32:42 UTC (rev 776)
@@ -34,31 +34,31 @@
@interface DebuggerController : NSWindowController {
IBOutlet NSButton *continueButton;
IBOutlet NSButton *breakButton;
- IBOutlet NSFormCell *PCText;
- IBOutlet NSFormCell *SPText;
- IBOutlet NSFormCell *AFText;
- IBOutlet NSFormCell *AF_Text;
- IBOutlet NSFormCell *BCText;
- IBOutlet NSFormCell *BC_Text;
- IBOutlet NSFormCell *DEText;
- IBOutlet NSFormCell *DE_Text;
- IBOutlet NSFormCell *HLText;
- IBOutlet NSFormCell *HL_Text;
- IBOutlet NSFormCell *IXText;
- IBOutlet NSFormCell *IYText;
- IBOutlet NSFormCell *IText;
- IBOutlet NSFormCell *RText;
- IBOutlet NSFormCell *tStates;
- IBOutlet NSFormCell *IMText;
- IBOutlet NSFormCell *ULAText;
- IBOutlet NSFormCell *IFF1Text;
- IBOutlet NSFormCell *IFF2Text;
- IBOutlet NSFormCell *AYText;
- IBOutlet NSFormCell *mem128;
- IBOutlet NSFormCell *memPlus3;
- IBOutlet NSFormCell *timexDEC;
- IBOutlet NSFormCell *timexHSR;
- IBOutlet NSFormCell *zxcf;
+ IBOutlet NSTextField *PCText;
+ IBOutlet NSTextField *SPText;
+ IBOutlet NSTextField *AFText;
+ IBOutlet NSTextField *AF_Text;
+ IBOutlet NSTextField *BCText;
+ IBOutlet NSTextField *BC_Text;
+ IBOutlet NSTextField *DEText;
+ IBOutlet NSTextField *DE_Text;
+ IBOutlet NSTextField *HLText;
+ IBOutlet NSTextField *HL_Text;
+ IBOutlet NSTextField *IXText;
+ IBOutlet NSTextField *IYText;
+ IBOutlet NSTextField *IText;
+ IBOutlet NSTextField *RText;
+ IBOutlet NSTextField *tStates;
+ IBOutlet NSTextField *IMText;
+ IBOutlet NSTextField *ULAText;
+ IBOutlet NSTextField *IFF1Text;
+ IBOutlet NSTextField *IFF2Text;
+ IBOutlet NSTextField *AYText;
+ IBOutlet NSTextField *mem128;
+ IBOutlet NSTextField *memPlus3;
+ IBOutlet NSTextField *timexDEC;
+ IBOutlet NSTextField *timexHSR;
+ IBOutlet NSTextField *zxcf;
IBOutlet NSTextField *flags;
IBOutlet NSTextField *entry;
IBOutlet NSTableView *dissasembly;
Modified: trunk/fuse/fusepb/xibs/Debugger.xib
===================================================================
--- trunk/fuse/fusepb/xibs/Debugger.xib 2014-03-22 10:41:43 UTC (rev 775)
+++ trunk/fuse/fusepb/xibs/Debugger.xib 2014-03-22 11:32:42 UTC (rev 776)
@@ -1,3736 +1,1021 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10D2094</string>
- <string key="IBDocument.InterfaceBuilderVersion">762</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
- <string key="IBDocument.HIToolboxVersion">460.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">762</string>
- </object>
- <array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <integer value="6"/>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </array>
- <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="498926979">
- <object class="NSCustomObject" id="316183168">
- <string key="NSClassName">DebuggerController</string>
- </object>
- <object class="NSCustomObject" id="839462725">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="1035351794">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="930661414">
- <int key="NSWindowStyleMask">3</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{41, 128}, {788, 596}}</string>
- <int key="NSWTFlags">-260571136</int>
- <string key="NSWindowTitle">Debugger</string>
- <string key="NSWindowClass">NSPanel</string>
- <object class="NSMutableString" key="NSViewClass">
- <characters key="NS.bytes">View</characters>
- </object>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
- <string key="NSWindowContentMinSize">{213, 107}</string>
- <object class="NSView" key="NSWindowView" id="233491278">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSScrollView" id="78101936">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">274</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="781146691">
- <reference key="NSNextResponder" ref="78101936"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSTableView" id="613070571">
- <reference key="NSNextResponder" ref="781146691"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{165, 348}</string>
- <reference key="NSSuperview" ref="781146691"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTableHeaderView" key="NSHeaderView" id="633630688">
- <reference key="NSNextResponder" ref="716506965"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{165, 17}</string>
- <reference key="NSSuperview" ref="716506965"/>
- <reference key="NSTableView" ref="613070571"/>
- </object>
- <object class="_NSCornerView" key="NSCornerView" id="391632127">
- <reference key="NSNextResponder" ref="78101936"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-26, 0}, {16, 17}}</string>
- <reference key="NSSuperview" ref="78101936"/>
- </object>
- <array class="NSMutableArray" key="NSTableColumns">
- <object class="NSTableColumn" id="747841639">
- <string key="NSIdentifier">address</string>
- <double key="NSWidth">51</double>
- <double key="NSMinWidth">40</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Address</string>
- <object class="NSFont" key="NSSupport" id="500630716">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="NSBackgroundColor" id="291063777">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
- </object>
- <object class="NSColor" key="NSTextColor" id="27500870">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">headerTextColor</string>
- <object class="NSColor" key="NSColor" id="669404927">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="144077294">
- <int key="NSCellFlags">338820672</int>
- <int key="NSCellFlags2">1024</int>
- <object class="NSFont" key="NSSupport" id="895397819">
- <string key="NSName">Monaco</string>
- <double key="NSSize">12</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="613070571"/>
- <object class="NSColor" key="NSBackgroundColor" id="282309020">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="NSColor" key="NSTextColor" id="773964941">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <reference key="NSColor" ref="669404927"/>
- </object>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="613070571"/>
- </object>
- <object class="NSTableColumn" id="499536533">
- <string key="NSIdentifier">instruction</string>
- <double key="NSWidth">107.55599975585938</double>
- <double key="NSMinWidth">65.555999755859375</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Instruction</string>
- <reference key="NSSupport" ref="500630716"/>
- <reference key="NSBackgroundColor" ref="291063777"/>
- <reference key="NSTextColor" ref="27500870"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="81904068">
- <int key="NSCellFlags">338820672</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="895397819"/>
- <reference key="NSControlView" ref="613070571"/>
- <reference key="NSBackgroundColor" ref="282309020"/>
- <reference key="NSTextColor" ref="773964941"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="613070571"/>
- </object>
- </array>
- <double key="NSIntercellSpacingWidth">3</double>
- <double key="NSIntercellSpacingHeight">2</double>
- <reference key="NSBackgroundColor" ref="282309020"/>
- <object class="NSColor" key="NSGridColor" id="656669572">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">gridColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- </object>
- <double key="NSRowHeight">15</double>
- <int key="NSTvFlags">-1027604480</int>
- <reference key="NSDelegate"/>
- <reference key="NSDataSource"/>
- <int key="NSGridStyleMask">1</int>
- <int key="NSColumnAutoresizingStyle">4</int>
- <int key="NSDraggingSourceMaskForLocal">15</int>
- <int key="NSDraggingSourceMaskForNonLocal">0</int>
- <bool key="NSAllowsTypeSelect">YES</bool>
- <int key="NSTableViewDraggingDestinationStyle">0</int>
- </object>
- </array>
- <string key="NSFrame">{{1, 17}, {165, 348}}</string>
- <reference key="NSSuperview" ref="78101936"/>
- <reference key="NSNextKeyView" ref="613070571"/>
- <reference key="NSDocView" ref="613070571"/>
- <object class="NSColor" key="NSBGColor" id="998664178">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlBackgroundColor</string>
- <object class="NSColor" key="NSColor" id="360720273">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <int key="NScvFlags">4</int>
- </object>
- <object class="NSScroller" id="156151064">
- <reference key="NSNextResponder" ref="78101936"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-30, 17}, {15, 316}}</string>
- <reference key="NSSuperview" ref="78101936"/>
- <reference key="NSTarget" ref="78101936"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.99473685026168823</double>
- </object>
- <object class="NSScroller" id="278599292">
- <reference key="NSNextResponder" ref="78101936"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-100, -100}, {150, 15}}</string>
- <reference key="NSSuperview" ref="78101936"/>
- <int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="78101936"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.99230766296386719</double>
- </object>
- <object class="NSClipView" id="716506965">
- <reference key="NSNextResponder" ref="78101936"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <reference ref="633630688"/>
- </array>
- <string key="NSFrame">{{1, 0}, {165, 17}}</string>
- <reference key="NSSuperview" ref="78101936"/>
- <reference key="NSNextKeyView" ref="633630688"/>
- <reference key="NSDocView" ref="633630688"/>
- <reference key="NSBGColor" ref="998664178"/>
- <int key="NScvFlags">4</int>
- </object>
- <reference ref="391632127"/>
- </array>
- <string key="NSFrame">{{258, 188}, {167, 366}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <reference key="NSNextKeyView" ref="781146691"/>
- <int key="NSsFlags">530</int>
- <reference key="NSVScroller" ref="156151064"/>
- <reference key="NSHScroller" ref="278599292"/>
- <reference key="NSContentView" ref="781146691"/>
- <reference key="NSHeaderClipView" ref="716506965"/>
- <reference key="NSCornerView" ref="391632127"/>
- <bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
- </object>
- <object class="NSTextField" id="375303057">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{185, 188}, {65, 20}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="1063810329">
- <int key="NSCellFlags">-2072904127</int>
- <int key="NSCellFlags2">4195328</int>
- <string key="NSContents"/>
- <object class="NSFont" key="NSSupport" id="234635903">
- <string key="NSName">Monaco</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="375303057"/>
- <bool key="NSDrawsBackground">YES</bool>
- <object class="NSColor" key="NSBackgroundColor" id="418975486">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textBackgroundColor</string>
- <reference key="NSColor" ref="282309020"/>
- </object>
- <object class="NSColor" key="NSTextColor" id="1005353692">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textColor</string>
- <reference key="NSColor" ref="669404927"/>
- </object>
- </object>
- </object>
- <object class="NSTextField" id="633875962">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{187, 206}, {60, 17}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="213989840">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">SZ5H3PNC</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="633875962"/>
- <object class="NSColor" key="NSBackgroundColor" id="359607598">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <reference key="NSColor" ref="360720273"/>
- </object>
- <reference key="NSTextColor" ref="773964941"/>
- </object>
- </object>
- <object class="NSTextField" id="543701996">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{20, 60}, {659, 22}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="215574654">
- <int key="NSCellFlags">-1804468671</int>
- <int key="NSCellFlags2">1024</int>
- <string key="NSContents"/>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">Monaco</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="543701996"/>
- <bool key="NSDrawsBackground">YES</bool>
- <reference key="NSBackgroundColor" ref="418975486"/>
- <reference key="NSTextColor" ref="1005353692"/>
- </object>
- </object>
- <object class="NSButton" id="169765289">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{681, 52}, {93, 32}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="733809501">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">137887744</int>
- <string key="NSContents">Evaluate</string>
- <object class="NSFont" key="NSSupport" id="149379105">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
- </object>
- <reference key="NSControlView" ref="169765289"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">1</int>
- <object class="NSFont" key="NSAlternateImage" id="223253359">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
- </object>
- <string key="NSAlternateContents"/>
- <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="885608672">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{14, 12}, {110, 32}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="705682210">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">137887744</int>
- <string key="NSContents">Single Step</string>
- <reference key="NSSupport" ref="149379105"/>
- <reference key="NSControlView" ref="885608672"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="223253359"/>
- <object class="NSMutableString" key="NSAlternateContents">
- <characters key="NS.bytes"/>
- </object>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="748179110">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{124, 12}, {98, 32}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="59264271">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">137887744</int>
- <string key="NSContents">Continue</string>
- <reference key="NSSupport" ref="149379105"/>
- <reference key="NSControlView" ref="748179110"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="223253359"/>
- <object class="NSMutableString" key="NSAlternateContents">
- <characters key="NS.bytes"/>
- </object>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="558783023">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{222, 12}, {84, 32}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="763191847">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">137887744</int>
- <string key="NSContents">Break</string>
- <reference key="NSSupport" ref="149379105"/>
- <reference key="NSControlView" ref="558783023"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="223253359"/>
- <object class="NSMutableString" key="NSAlternateContents">
- <characters key="NS.bytes"/>
- </object>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSScrollView" id="456741639">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">256</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="826280046">
- <reference key="NSNextResponder" ref="456741639"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSTableView" id="99504781">
- <reference key="NSNextResponder" ref="826280046"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{746, 74}</string>
- <reference key="NSSuperview" ref="826280046"/>
- <int key="NSTag">2</int>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTableHeaderView" key="NSHeaderView" id="963087691">
- <reference key="NSNextResponder" ref="266185891"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{746, 17}</string>
- <reference key="NSSuperview" ref="266185891"/>
- <reference key="NSTableView" ref="99504781"/>
- </object>
- <object class="_NSCornerView" key="NSCornerView" id="421788493">
- <reference key="NSNextResponder" ref="456741639"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-26, 0}, {16, 17}}</string>
- <reference key="NSSuperview" ref="456741639"/>
- </object>
- <array class="NSMutableArray" key="NSTableColumns">
- <object class="NSTableColumn" id="653002644">
- <string key="NSIdentifier">id</string>
- <double key="NSWidth">40</double>
- <double key="NSMinWidth">40</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">ID</string>
- <reference key="NSSupport" ref="500630716"/>
- <object class="NSColor" key="NSBackgroundColor" id="365606795">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
- </object>
- <reference key="NSTextColor" ref="27500870"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="41023422">
- <int key="NSCellFlags">338820672</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="895397819"/>
- <reference key="NSControlView" ref="99504781"/>
- <reference key="NSBackgroundColor" ref="282309020"/>
- <reference key="NSTextColor" ref="773964941"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="99504781"/>
- </object>
- <object class="NSTableColumn" id="898263077">
- <string key="NSIdentifier">type</string>
- <double key="NSWidth">79</double>
- <double key="NSMinWidth">40</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Type</string>
- <reference key="NSSupport" ref="500630716"/>
- <reference key="NSBackgroundColor" ref="365606795"/>
- <reference key="NSTextColor" ref="27500870"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="43065045">
- <int key="NSCellFlags">338820672</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="895397819"/>
- <reference key="NSControlView" ref="99504781"/>
- <reference key="NSBackgroundColor" ref="282309020"/>
- <reference key="NSTextColor" ref="773964941"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="99504781"/>
- </object>
- <object class="NSTableColumn" id="963822215">
- <string key="NSIdentifier">value</string>
- <double key="NSWidth">64</double>
- <double key="NSMinWidth">10</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Value</string>
- <reference key="NSSupport" ref="500630716"/>
- <object class="NSColor" key="NSBackgroundColor" id="935589818">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">headerColor</string>
- <reference key="NSColor" ref="282309020"/>
- </object>
- <reference key="NSTextColor" ref="27500870"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="600129512">
- <int key="NSCellFlags">338820672</int>
- <int key="NSCellFlags2">1024</int>
- <object class="NSFont" key="NSSupport" id="600134497">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">12</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="99504781"/>
- <bool key="NSDrawsBackground">YES</bool>
- <reference key="NSBackgroundColor" ref="998664178"/>
- <reference key="NSTextColor" ref="773964941"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="99504781"/>
- </object>
- <object class="NSTableColumn" id="279203501">
- <string key="NSIdentifier">ignore</string>
- <double key="NSWidth">67</double>
- <double key="NSMinWidth">10</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Ignore</string>
- <reference key="NSSupport" ref="500630716"/>
- <reference key="NSBackgroundColor" ref="935589818"/>
- <reference key="NSTextColor" ref="27500870"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="37966189">
- <int key="NSCellFlags">338820672</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="600134497"/>
- <reference key="NSControlView" ref="99504781"/>
- <bool key="NSDrawsBackground">YES</bool>
- <reference key="NSBackgroundColor" ref="998664178"/>
- <reference key="NSTextColor" ref="773964941"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="99504781"/>
- </object>
- <object class="NSTableColumn" id="259522712">
- <string key="NSIdentifier">life</string>
- <double key="NSWidth">114.21697998046875</double>
- <double key="NSMinWidth">23.216999053955078</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Life</string>
- <reference key="NSSupport" ref="500630716"/>
- <reference key="NSBackgroundColor" ref="935589818"/>
- <reference key="NSTextColor" ref="27500870"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="614495871">
- <int key="NSCellFlags">338820672</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="600134497"/>
- <reference key="NSControlView" ref="99504781"/>
- <bool key="NSDrawsBackground">YES</bool>
- <reference key="NSBackgroundColor" ref="998664178"/>
- <reference key="NSTextColor" ref="773964941"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="99504781"/>
- </object>
- <object class="NSTableColumn" id="820739807">
- <string key="NSIdentifier">condition</string>
- <double key="NSWidth">364.17401123046875</double>
- <double key="NSMinWidth">10</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Condition</string>
- <object class="NSFont" key="NSSupport" id="26">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">3100</int>
- </object>
- <reference key="NSBackgroundColor" ref="935589818"/>
- <reference key="NSTextColor" ref="27500870"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="163835329">
- <int key="NSCellFlags">338820672</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="895397819"/>
- <reference key="NSControlView" ref="99504781"/>
- <reference key="NSBackgroundColor" ref="998664178"/>
- <reference key="NSTextColor" ref="773964941"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
- <reference key="NSTableView" ref="99504781"/>
- </object>
- </array>
- <double key="NSIntercellSpacingWidth">3</double>
- <double key="NSIntercellSpacingHeight">2</double>
- <reference key="NSBackgroundColor" ref="282309020"/>
- <reference key="NSGridColor" ref="656669572"/>
- <double key="NSRowHeight">15</double>
- <int key="NSTvFlags">-1027604480</int>
- <reference key="NSDelegate"/>
- <reference key="NSDataSource"/>
- <int key="NSColumnAutoresizingStyle">4</int>
- <int key="NSDraggingSourceMaskForLocal">15</int>
- <int key="NSDraggingSourceMaskForNonLocal">0</int>
- <bool key="NSAllowsTypeSelect">YES</bool>
- <int key="NSTableViewDraggingDestinationStyle">0</int>
- </object>
- </array>
- <string key="NSFrame">{{1, 17}, {746, 74}}</string>
- <reference key="NSSuperview" ref="456741639"/>
- <reference key="NSNextKeyView" ref="99504781"/>
- <reference key="NSDocView" ref="99504781"/>
- <reference key="NSBGColor" ref="998664178"/>
- <int key="NScvFlags">4</int>
- </object>
- <object class="NSScroller" id="938977592">
- <reference key="NSNextResponder" ref="456741639"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-30, 17}, {15, 74}}</string>
- <reference key="NSSuperview" ref="456741639"/>
- <reference key="NSTarget" ref="456741639"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.43529412150382996</double>
- </object>
- <object class="NSScroller" id="663308809">
- <reference key="NSNextResponder" ref="456741639"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{1, -30}, {731, 15}}</string>
- <reference key="NSSuperview" ref="456741639"/>
- <int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="456741639"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.9798927903175354</double>
- </object>
- <object class="NSClipView" id="266185891">
- <reference key="NSNextResponder" ref="456741639"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <reference ref="963087691"/>
- </array>
- <string key="NSFrame">{{1, 0}, {746, 17}}</string>
- <reference key="NSSuperview" ref="456741639"/>
- <reference key="NSNextKeyView" ref="963087691"/>
- <reference key="NSDocView" ref="963087691"/>
- <reference key="NSBGColor" ref="998664178"/>
- <int key="NScvFlags">4</int>
- </object>
- <reference ref="421788493"/>
- </array>
- <string key="NSFrame">{{20, 88}, {748, 92}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <reference key="NSNextKeyView" ref="826280046"/>
- <int key="NSsFlags">562</int>
- <reference key="NSVScroller" ref="938977592"/>
- <reference key="NSHScroller" ref="663308809"/>
- <reference key="NSContentView" ref="826280046"/>
- <reference key="NSHeaderClipView" ref="266185891"/>
- <reference key="NSCornerView" ref="421788493"/>
- <bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
- </object>
- <object class="NSScrollView" id="373864670">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">274</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="498864457">
- <reference key="NSNextResponder" ref="373864670"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSTableView" id="765493799">
- <reference key="NSNextResponder" ref="498864457"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{136, 348}</string>
- <reference key="NSSuperview" ref="498864457"/>
- <int key="NSTag">1</int>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTableHeaderView" key="NSHeaderView" id="866827457">
- <reference key="NSNextResponder" ref="588229165"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{136, 17}</string>
- <reference key="NSSuperview" ref="588229165"/>
- <reference key="NSTableView" ref="765493799"/>
- </object>
- <object class="_NSCornerView" key="NSCornerView" id="67055031">
- <reference key="NSNextResponder" ref="373864670"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-26, 0}, {16, 17}}</string>
- <reference key="NSSuperview" ref="373864670"/>
- </object>
- <array class="NSMutableArray" key="NSTableColumns">
- <object class="NSTableColumn" id="870167296">
- <string key="NSIdentifier">address</string>
- <double key="NSWidth">58</double>
- <double key="NSMinWidth">40</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Address</string>
- <reference key="NSSupport" ref="500630716"/>
- <object class="NSColor" key="NSBackgroundColor" id="655014522">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
- </object>
- <reference key="NSTextColor" ref="27500870"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="474943949">
- <int key="NSCellFlags">338820672</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="895397819"/>
- <reference key="NSControlView" ref="765493799"/>
- <reference key="NSBackgroundColor" ref="282309020"/>
- <reference key="NSTextColor" ref="773964941"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="765493799"/>
- </object>
- <object class="NSTableColumn" id="482998116">
- <string key="NSIdentifier">value</string>
- <double key="NSWidth">72</double>
- <double key="NSMinWidth">37.4010009765625</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Value</string>
- <reference key="NSSupport" ref="500630716"/>
- <reference key="NSBackgroundColor" ref="655014522"/>
- <reference key="NSTextColor" ref="27500870"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="811926594">
- <int key="NSCellFlags">338820672</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="895397819"/>
- <reference key="NSControlView" ref="765493799"/>
- <reference key="NSBackgroundColor" ref="282309020"/>
- <reference key="NSTextColor" ref="773964941"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="765493799"/>
- </object>
- </array>
- <double key="NSIntercellSpacingWidth">3</double>
- <double key="NSIntercellSpacingHeight">2</double>
- <reference key="NSBackgroundColor" ref="282309020"/>
- <reference key="NSGridColor" ref="656669572"/>
- <double key="NSRowHeight">15</double>
- <int key="NSTvFlags">-1027604480</int>
- <reference key="NSDelegate"/>
- <reference key="NSDataSource"/>
- <int key="NSColumnAutoresizingStyle">4</int>
- <int key="NSDraggingSourceMaskForLocal">15</int>
- <int key="NSDraggingSourceMaskForNonLocal">0</int>
- <bool key="NSAllowsTypeSelect">YES</bool>
- <int key="NSTableViewDraggingDestinationStyle">0</int>
- </object>
- </array>
- <string key="NSFrame">{{1, 17}, {136, 348}}</string>
- <reference key="NSSuperview" ref="373864670"/>
- <reference key="NSNextKeyView" ref="765493799"/>
- <reference key="NSDocView" ref="765493799"/>
- <reference key="NSBGColor" ref="998664178"/>
- <int key="NScvFlags">4</int>
- </object>
- <object class="NSScroller" id="889647427">
- <reference key="NSNextResponder" ref="373864670"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-30, 17}, {15, 316}}</string>
- <reference key="NSSuperview" ref="373864670"/>
- <reference key="NSTarget" ref="373864670"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.99473685026168823</double>
- </object>
- <object class="NSScroller" id="426959596">
- <reference key="NSNextResponder" ref="373864670"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-100, -100}, {150, 15}}</string>
- <reference key="NSSuperview" ref="373864670"/>
- <int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="373864670"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.99230766296386719</double>
- </object>
- <object class="NSClipView" id="588229165">
- <reference key="NSNextResponder" ref="373864670"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <reference ref="866827457"/>
- </array>
- <string key="NSFrame">{{1, 0}, {136, 17}}</string>
- <reference key="NSSuperview" ref="373864670"/>
- <reference key="NSNextKeyView" ref="866827457"/>
- <reference key="NSDocView" ref="866827457"/>
- <reference key="NSBGColor" ref="998664178"/>
- <int key="NScvFlags">4</int>
- </object>
- <reference ref="67055031"/>
- </array>
- <string key="NSFrame">{{433, 188}, {138, 366}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <reference key="NSNextKeyView" ref="498864457"/>
- <int key="NSsFlags">530</int>
- <reference key="NSVScroller" ref="889647427"/>
- <reference key="NSHScroller" ref="426959596"/>
- <reference key="NSContentView" ref="498864457"/>
- <reference key="NSHeaderClipView" ref="588229165"/>
- <reference key="NSCornerView" ref="67055031"/>
- <bytes key="NSScrollAmts">AAAAAAAAAABBiAAAQYgAAA</bytes>
- </object>
- <object class="NSForm" id="427774304">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{20, 220}, {125, 356}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <bool key="NSEnabled">YES</bool>
- <int key="NSNumRows">13</int>
- <int key="NSNumCols">1</int>
- <array class="NSMutableArray" key="NSCells">
- <object class="NSFormCell" id="718282586">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <object class="NSMutableString" key="NSContents">
- <characters key="NS.bytes"/>
- </object>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">PC:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="315969690">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <object class="NSMutableString" key="NSContents">
- <characters key="NS.bytes"/>
- </object>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">1</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">AF:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="132088770">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">2</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">BC:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="71500357">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">3</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">DE:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="743742995">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">4</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">HL:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="491693370">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">5</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">IX:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="917431442">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">6</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">I:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="29383345">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">7</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">T-States:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="1021064257">
- <int key="NSCellFlags">-2072904127</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">8</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">ULA:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="838999806">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">9</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">AY:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="200631368">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">10</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">128:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="699942682">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">11</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">TmxDec:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- <object class="NSFormCell" id="435003458">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- <int key="NSTag">12</int>
- <double key="NSTitleWidth">67</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">TmxHsr:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="427774304"/>
- </object>
- </object>
- </array>
- <string key="NSCellSize">{125, 20}</string>
- <string key="NSIntercellSpacing">{1, 8}</string>
- <int key="NSMatrixFlags">67633152</int>
- <string key="NSCellClass">NSActionCell</string>
- <object class="NSFormCell" key="NSProtoCell" id="587548373">
- <int key="NSCellFlags">343014976</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <double key="NSTitleWidth">67</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="234635903"/>
- </object>
- </object>
- <int key="NSSelectedRow">8</int>
- <reference key="NSSelectedCell" ref="1021064257"/>
- <reference key="NSBackgroundColor" ref="359607598"/>
- <reference key="NSCellBackgroundColor" ref="282309020"/>
- </object>
- <object class="NSForm" id="845934082">
- <reference key="NSNextResponder" ref="233491278"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{153, 248}, {97, 328}}</string>
- <reference key="NSSuperview" ref="233491278"/>
- <bool key="NSEnabled">YES</bool>
- <int key="NSNumRows">12</int>
- <int key="NSNumCols">1</int>
- <array class="NSMutableArray" key="NSCells">
- <object class="NSFormCell" id="835563744">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <object class="NSMutableString" key="NSContents">
- <characters key="NS.bytes"/>
- </object>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="845934082"/>
- <double key="NSTitleWidth">39</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">SP:</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="845934082"/>
- </object>
- </object>
- <object class="NSFormCell" id="857286156">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <object class="NSMutableString" key="NSContents">
- <characters key="NS.bytes"/>
- </object>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="845934082"/>
- <int key="NSTag">1</int>
- <double key="NSTitleWidth">39</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">AF':</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="845934082"/>
- </object>
- </object>
- <object class="NSFormCell" id="853131530">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="845934082"/>
- <int key="NSTag">2</int>
- <double key="NSTitleWidth">39</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">BC':</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="845934082"/>
- </object>
- </object>
- <object class="NSFormCell" id="1070686589">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="845934082"/>
- <int key="NSTag">3</int>
- <double key="NSTitleWidth">39</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">DE':</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="845934082"/>
- </object>
- </object>
- <object class="NSFormCell" id="571431826">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="845934082"/>
- <int key="NSTag">4</int>
- <double key="NSTitleWidth">39</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">HL':</string>
- <reference key="NSSupport" ref="234635903"/>
- <reference key="NSControlView" ref="845934082"/>
- </object>
- </object>
- <object class="NSFormCell" id="637449640">
- <int key="NSCellFlags">74579521</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="234635903"/>
- <refere...
[truncated message content] |
|
From: <fr...@us...> - 2016-05-24 11:04:31
|
Revision: 794
http://sourceforge.net/p/fuse-for-macosx/code/794
Author: fredm
Date: 2016-05-24 11:04:28 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Bump SDK to 10.11 and deployment targets to 10.8
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/xibs/JoystickConfiguration.xib
trunk/fuse/fusepb/xibs/Keyboard.xib
trunk/fuse/fusepb/xibs/LoadBinary.xib
trunk/fuse/fusepb/xibs/MainMenu.xib
trunk/fuse/fusepb/xibs/MemoryBrowser.xib
trunk/fuse/fusepb/xibs/PokeFinder.xib
trunk/fuse/fusepb/xibs/PokeMemory.xib
trunk/fuse/fusepb/xibs/Rollback.xib
trunk/fuse/fusepb/xibs/SaveBinary.xib
trunk/fuse/fusepb/xibs/SavePanelAccessoryView.xib
trunk/fuse/fusepb/xibs/TapeBrowser.xib
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2016-03-25 09:56:36 UTC (rev 793)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2016-05-24 11:04:28 UTC (rev 794)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 47;
objects = {
/* Begin PBXBuildFile section */
@@ -1555,7 +1555,7 @@
LastUpgradeCheck = 0730;
};
buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */;
- compatibilityVersion = "Xcode 3.2";
+ compatibilityVersion = "Xcode 6.3";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -1902,7 +1902,7 @@
PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1947,7 +1947,7 @@
PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1991,7 +1991,7 @@
PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -2018,7 +2018,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = YES;
@@ -2043,7 +2043,7 @@
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
@@ -2066,7 +2066,7 @@
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
Modified: trunk/fuse/fusepb/xibs/JoystickConfiguration.xib
===================================================================
--- trunk/fuse/fusepb/xibs/JoystickConfiguration.xib 2016-03-25 09:56:36 UTC (rev 793)
+++ trunk/fuse/fusepb/xibs/JoystickConfiguration.xib 2016-05-24 11:04:28 UTC (rev 794)
@@ -1,2567 +1,445 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1070</int>
- <string key="IBDocument.SystemVersion">12D78</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.37</string>
- <string key="IBDocument.HIToolboxVersion">626.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">3084</string>
- </object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>NSButton</string>
- <string>NSButtonCell</string>
- <string>NSCustomObject</string>
- <string>NSMenu</string>
- <string>NSMenuItem</string>
- <string>NSPopUpButton</string>
- <string>NSPopUpButtonCell</string>
- <string>NSTextField</string>
- <string>NSTextFieldCell</string>
- <string>NSView</string>
- <string>NSWindowTemplate</string>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="386087761">
- <object class="NSCustomObject" id="59248293">
- <string key="NSClassName">JoystickConfigurationController</string>
- </object>
- <object class="NSCustomObject" id="124468593">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="186367009">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="60768200">
- <int key="NSWindowStyleMask">3</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{82, 198}, {644, 262}}</string>
- <int key="NSWTFlags">-260571136</int>
- <string key="NSWindowTitle">Real Joystick Setup</string>
- <string key="NSWindowClass">NSPanel</string>
- <object class="NSMutableString" key="NSViewClass">
- <characters key="NS.bytes">View</characters>
- </object>
- <nil key="NSUserInterfaceItemIdentifier"/>
- <string key="NSWindowContentMinSize">{213, 107}</string>
- <object class="NSView" key="NSWindowView" id="126771939">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSPopUpButton" id="826895574">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 82}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="724868534"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="1064004325">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <object class="NSFont" key="NSSupport" id="632387013">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
- </object>
- <reference key="NSControlView" ref="826895574"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="985653288">
- <reference key="NSMenu" ref="176052470"/>
- <string key="NSTitle">Item1</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <object class="NSCustomResource" key="NSOnImage" id="344018069">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="876485964">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1064004325"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="176052470">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="985653288"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="724868534">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 64}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="975210892"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="7600202">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Y Axis:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="724868534"/>
- <object class="NSColor" key="NSBackgroundColor" id="203591743">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor" id="72727719">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="975210892">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 57}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="846109233"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="996235996">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="975210892"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="178741259">
- <reference key="NSMenu" ref="347079809"/>
- <string key="NSTitle">Item1</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="996235996"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="347079809">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="178741259"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="437828712">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 89}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="826895574"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="686144872">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">X Axis:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="437828712"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="762360309">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 224}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="63947136"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="765042169">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 1:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="762360309"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="63947136">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 218}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="464710259"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="976972296">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="63947136"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="203505031">
- <reference key="NSMenu" ref="864974259"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">4096</int>
- <reference key="NSTarget" ref="976972296"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="864974259">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="203505031"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="842999689">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 198}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="938582266"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="941195128">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 2:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="842999689"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="938582266">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 192}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="65221300"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="864091162">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="938582266"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="426575927">
- <reference key="NSMenu" ref="384085349"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="864091162"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="384085349">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="426575927"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="602628857">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 166}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="94893971"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="78403917">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="602628857"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="617597837">
- <reference key="NSMenu" ref="425932685"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="78403917"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="425932685">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="617597837"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="470771325">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 172}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="602628857"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="772767767">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 3:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="470771325"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="205174857">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 146}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="370749589"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="90832892">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 4:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="205174857"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="370749589">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 140}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="904786252"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="381226327">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="370749589"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="361010091">
- <reference key="NSMenu" ref="29414515"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="381226327"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="29414515">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="361010091"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="1015066804">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 114}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1051109443"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="262477161">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="1015066804"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="288402790">
- <reference key="NSMenu" ref="32353036"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="262477161"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="32353036">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="288402790"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="376370105">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 120}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1015066804"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="495288389">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 5:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="376370105"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="874050939">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{425, 225}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="302009155"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="644776868">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 11:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="874050939"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="302009155">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{502, 218}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="842999689"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="755102968">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="302009155"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="970902686">
- <reference key="NSMenu" ref="699207521"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">4096</int>
- <reference key="NSTarget" ref="755102968"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="699207521">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="970902686"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="574251903">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{425, 198}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="206601973"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="787030583">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 12:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="574251903"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="206601973">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{502, 192}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="470771325"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="1000313725">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="206601973"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="886837373">
- <reference key="NSMenu" ref="899009174"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000313725"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="899009174">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="886837373"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="457339074">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{502, 166}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="205174857"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="73565078">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="457339074"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="267847892">
- <reference key="NSMenu" ref="62951477"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="73565078"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="62951477">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="267847892"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="825645571">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{425, 172}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="457339074"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="569578732">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 13:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="825645571"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="1008403312">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{425, 146}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="205798271"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="987277141">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 14:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="1008403312"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="205798271">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{502, 140}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="376370105"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="790718145">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="205798271"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="221310221">
- <reference key="NSMenu" ref="339581578"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="790718145"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="339581578">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="221310221"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="234186675">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{502, 114}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="437828712"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="140803321">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="234186675"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="465849157">
- <reference key="NSMenu" ref="627952996"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="140803321"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="627952996">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="465849157"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="766644759">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{425, 120}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="234186675"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="167274146">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 15:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="766644759"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="65221300">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{221, 197}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1052411550"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="271662164">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 7:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="65221300"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="210894963">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{298, 166}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="825645571"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="503047014">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="210894963"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="414485706">
- <reference key="NSMenu" ref="555110364"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="503047014"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="555110364">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="414485706"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="627835086">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{298, 114}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="766644759"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="478431843">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="627835086"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="419065522">
- <reference key="NSMenu" ref="191665498"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="478431843"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="191665498">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="419065522"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="94893971">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{221, 171}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="210894963"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="819177107">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 8:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="94893971"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="681935874">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{298, 218}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="874050939"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="1033475237">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="681935874"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="1066018225">
- <reference key="NSMenu" ref="188323386"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1033475237"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="188323386">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="1066018225"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="1052411550">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{298, 192}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="574251903"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="594905258">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="1052411550"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="404602411">
- <reference key="NSMenu" ref="386307341"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="594905258"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="386307341">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="404602411"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="464710259">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{221, 223}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="681935874"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="627514607">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 6:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="464710259"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="138759272">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{298, 140}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1008403312"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="669884116">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="138759272"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="509505863">
- <reference key="NSMenu" ref="875372736"/>
- <string key="NSTitle">Joystick Fire</string>
...
[truncated message content] |
|
From: <fr...@us...> - 2016-09-30 12:43:51
|
Revision: 825
http://sourceforge.net/p/fuse-for-macosx/code/825
Author: fredm
Date: 2016-09-30 12:43:49 +0000 (Fri, 30 Sep 2016)
Log Message:
-----------
Try to fix stuck keys when Tab is combined with Command and when window focus is
lost (bugs# 22).
Modified Paths:
--------------
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/models/Emulator.h
===================================================================
--- trunk/fuse/fusepb/models/Emulator.h 2016-09-30 12:06:54 UTC (rev 824)
+++ trunk/fuse/fusepb/models/Emulator.h 2016-09-30 12:43:49 UTC (rev 825)
@@ -157,6 +157,7 @@
-(void) modifierChange:(input_event_type)theType oldState:(BOOL)old newState:(BOOL)new;
-(void) flagsChanged:(NSEvent *)theEvent;
-(input_key) otherKeysymsRemap:(libspectrum_dword)ui_keysym inHash:(GHashTable*)hash;
+-(void) keyboardReleaseAll;
-(void) keyChange:(NSEvent *)theEvent type:(input_event_type)type;
-(void) keyDown:(NSEvent *)theEvent;
-(void) keyUp:(NSEvent *)theEvent;
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2016-09-30 12:06:54 UTC (rev 824)
+++ trunk/fuse/fusepb/models/Emulator.m 2016-09-30 12:43:49 UTC (rev 825)
@@ -665,6 +665,8 @@
[self modifierChange:INPUT_KEY_Alt_L oldState:optDown newState:optDownNew];
[self modifierChange:INPUT_KEY_Control_L oldState:ctrlDown newState:ctrlDownNew];
[self modifierChange:INPUT_KEY_Shift_L oldState:shiftDown newState:shiftDownNew];
+ } else {
+ keyboard_release_all();
}
optDown = optDownNew;
@@ -719,6 +721,11 @@
}
}
+-(void) keyboardReleaseAll
+{
+ keyboard_release_all();
+}
+
-(void) keyChange:(NSEvent *)theEvent type:(input_event_type)type
{
if( [theEvent isARepeat] == YES ) return;
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.h 2016-09-30 12:06:54 UTC (rev 824)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.h 2016-09-30 12:43:49 UTC (rev 825)
@@ -221,6 +221,7 @@
-(void) windowWillMiniaturize:(NSNotification *)aNotification;
-(void) windowDidMiniaturize:(NSNotification *)notification;
-(BOOL) windowShouldClose:(id)window;
+-(void) windowDidResignKey:(NSNotification *)notification;
-(CVReturn) displayFrame:(const CVTimeStamp *)timeStamp;
-(void) windowChangedScreen:(NSNotification*)inNotification;
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2016-09-30 12:06:54 UTC (rev 824)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2016-09-30 12:43:49 UTC (rev 825)
@@ -382,6 +382,11 @@
[self release];
}
+- (void)windowDidResignKey:(NSNotification *)notification
+{
+ [proxy_emulator keyboardReleaseAll];
+}
+
-(void) loadPicture: (NSString *) name
greenTex:(Texture*) greenTexture
redTex:(Texture*) redTexture
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-11-01 10:40:58
|
Revision: 833
http://sourceforge.net/p/fuse-for-macosx/code/833
Author: fredm
Date: 2016-11-01 10:40:56 +0000 (Tue, 01 Nov 2016)
Log Message:
-----------
More attempts to fix stuck keys when Tab is combined with Command.
Modified Paths:
--------------
trunk/fuse/fusepb/keystate.c
trunk/fuse/fusepb/keystate.h
trunk/fuse/fusepb/models/Emulator.m
Modified: trunk/fuse/fusepb/keystate.c
===================================================================
--- trunk/fuse/fusepb/keystate.c 2016-10-28 11:30:23 UTC (rev 832)
+++ trunk/fuse/fusepb/keystate.c 2016-11-01 10:40:56 UTC (rev 833)
@@ -119,7 +119,8 @@
void
action_sNORMAL_eRELEASE_NORMAL( input_key keysym )
{
- normal_count--;
+ if( normal_count > 0 )
+ normal_count--;
// track depth, if depth is 0 switch back to NONE
if( !normal_count ) current_state = NONE;
release_key(keysym);
@@ -172,3 +173,10 @@
/* invalid event/state - shouldn't happen, just ignore for now */
}
}
+
+void
+reset_keystate( void )
+{
+ current_state = NONE;
+ normal_count = 0;
+}
Modified: trunk/fuse/fusepb/keystate.h
===================================================================
--- trunk/fuse/fusepb/keystate.h 2016-10-28 11:30:23 UTC (rev 832)
+++ trunk/fuse/fusepb/keystate.h 2016-11-01 10:40:56 UTC (rev 833)
@@ -37,5 +37,6 @@
};
void process_keyevent( enum events event, input_key keysym );
+void reset_keystate( void );
#endif /* #ifndef KEYSTATE_H */
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2016-10-28 11:30:23 UTC (rev 832)
+++ trunk/fuse/fusepb/models/Emulator.m 2016-11-01 10:40:56 UTC (rev 833)
@@ -672,13 +672,19 @@
[self modifierChange:INPUT_KEY_Alt_L oldState:optDown newState:optDownNew];
[self modifierChange:INPUT_KEY_Control_L oldState:ctrlDown newState:ctrlDownNew];
[self modifierChange:INPUT_KEY_Shift_L oldState:shiftDown newState:shiftDownNew];
+
+ optDown = optDownNew;
+ ctrlDown = ctrlDownNew;
+ shiftDown = shiftDownNew;
} else {
keyboard_release_all();
+ reset_keystate( );
+
+ optDown = NO;
+ ctrlDown = NO;
+ shiftDown = NO;
}
- optDown = optDownNew;
- ctrlDown = ctrlDownNew;
- shiftDown = shiftDownNew;
commandDown = commandDownNew;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X