fuse-for-macosx-commits Mailing List for Fuse for macOS (Page 3)
Brought to you by:
fredm
Menu
▾
▴
fuse-for-macosx-commits — Tracks commits to the repostiory
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(24) |
Feb
(11) |
Mar
(6) |
Apr
(48) |
May
(9) |
Jun
(38) |
Jul
(33) |
Aug
(15) |
Sep
|
Oct
(3) |
Nov
(6) |
Dec
(3) |
| 2008 |
Jan
|
Feb
(24) |
Mar
(11) |
Apr
(22) |
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(3) |
Nov
(18) |
Dec
(23) |
| 2009 |
Jan
(16) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
(7) |
Jul
(4) |
Aug
(11) |
Sep
(9) |
Oct
|
Nov
(3) |
Dec
(2) |
| 2010 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
(2) |
May
(8) |
Jun
|
Jul
|
Aug
(2) |
Sep
(2) |
Oct
(9) |
Nov
|
Dec
(8) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(2) |
Dec
|
| 2012 |
Jan
(4) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
(13) |
Dec
(11) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
(8) |
Apr
(8) |
May
(16) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2014 |
Jan
|
Feb
(6) |
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(10) |
Jun
(9) |
Jul
(6) |
Aug
(5) |
Sep
(3) |
Oct
(6) |
Nov
(5) |
Dec
|
|
From: <fr...@us...> - 2015-03-02 10:41:01
|
Revision: 787
http://sourceforge.net/p/fuse-for-macosx/code/787
Author: fredm
Date: 2015-03-02 10:40:58 +0000 (Mon, 02 Mar 2015)
Log Message:
-----------
Tweak quotes in file.
Modified Paths:
--------------
trunk/fuse/fusepb/resources/Fuse Help/html/pokememory.html
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/pokememory.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/pokememory.html 2015-03-02 10:37:05 UTC (rev 786)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/pokememory.html 2015-03-02 10:40:58 UTC (rev 787)
@@ -15,7 +15,7 @@
multiface POKEs, allowing to modify specific memory addresses in
order to cheat (infinite lives, infinite ammo, etc.).<br>
<br>
- The ‘POKEs/Cheats’ dialog contains a list of recently loaded
+ The `POKEs/Cheats' dialog contains a list of recently loaded
POKEs from a POK file. It is accessed from the Machine >
POKEs/Cheats menu option.<br>
<br>
@@ -25,8 +25,8 @@
menu option or the drag‐and‐drop functionality. After loading a
snapshot or tape, Fuse will try to automatically locate a POK
file with the same file name. This means that if we open
- ‘GAME.TAP’, then Fuse will try to open ‘GAME.POK’ and
- ‘POKES/GAME.POK’. See <a
+ `GAME.TAP' then Fuse will try to open `GAME.POK' and
+ `POKES/GAME.POK' See <a
href="http://www.worldofspectrum.org/POKformat.txt">http://www.worldofspectrum.org/POKformat.txt</a>
for more details about this file format.<br>
<br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2015-03-02 10:37:06
|
Revision: 786
http://sourceforge.net/p/fuse-for-macosx/code/786
Author: fredm
Date: 2015-03-02 10:37:05 +0000 (Mon, 02 Mar 2015)
Log Message:
-----------
Correct the name of the dialog.
Modified Paths:
--------------
trunk/fuse/fusepb/resources/Fuse Help/html/pokememory.html
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/pokememory.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/pokememory.html 2014-12-29 12:27:26 UTC (rev 785)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/pokememory.html 2015-03-02 10:37:05 UTC (rev 786)
@@ -15,8 +15,9 @@
multiface POKEs, allowing to modify specific memory addresses in
order to cheat (infinite lives, infinite ammo, etc.).<br>
<br>
- The `poke memory’ dialog contains a list of recently loaded
- POKEs.<br>
+ The ‘POKEs/Cheats’ dialog contains a list of recently loaded
+ POKEs from a POK file. It is accessed from the Machine >
+ POKEs/Cheats menu option.<br>
<br>
It is possible to load POKEs from an external file using the
File > Open</font><font face="Lucida Grande,Helvetica,Arial"><span
@@ -24,8 +25,8 @@
menu option or the drag‐and‐drop functionality. After loading a
snapshot or tape, Fuse will try to automatically locate a POK
file with the same file name. This means that if we open
- ‘GAME.TAP’, then Fuse will try to open `GAME.POK’ and
- `POKES/GAME.POK’. See <a
+ ‘GAME.TAP’, then Fuse will try to open ‘GAME.POK’ and
+ ‘POKES/GAME.POK’. See <a
href="http://www.worldofspectrum.org/POKformat.txt">http://www.worldofspectrum.org/POKformat.txt</a>
for more details about this file format.<br>
<br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-12-29 12:27:48
|
Revision: 785
http://sourceforge.net/p/fuse-for-macosx/code/785
Author: fredm
Date: 2014-12-29 12:27:26 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
As we don't believe that fuse is safe to run with root priveleges and therefore
attempt to drop them, then failing to drop them should be a hard error rather
than a warning.
Modified Paths:
--------------
trunk/fuse/fuse.c
Modified: trunk/fuse/fuse.c
===================================================================
--- trunk/fuse/fuse.c 2014-12-29 11:57:53 UTC (rev 784)
+++ trunk/fuse/fuse.c 2014-12-29 12:27:26 UTC (rev 785)
@@ -251,7 +251,13 @@
#ifdef HAVE_GETEUID
/* Drop root privs if we have them */
- if( !geteuid() ) { setuid( getuid() ); }
+ if( !geteuid() ) {
+ error = setuid( getuid() );
+ if( error ) {
+ ui_error( UI_ERROR_ERROR, "Could not drop root privileges" );
+ return 1;
+ }
+ }
#endif /* #ifdef HAVE_GETEUID */
mempool_init();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-12-29 11:57:56
|
Revision: 784
http://sourceforge.net/p/fuse-for-macosx/code/784
Author: fredm
Date: 2014-12-29 11:57:53 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
Replace deprecated [NSBundle loadNibNamed:] with
[[NSBundle mainBundle] loadNibNamed:]
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.m
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2014-12-29 11:53:45 UTC (rev 783)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2014-12-29 11:57:53 UTC (rev 784)
@@ -1158,7 +1158,9 @@
- savePanelAccessoryView
{
if (savePanelAccessoryView == nil) {
- [NSBundle loadNibNamed:@"SavePanelAccessoryView.nib" owner:self];
+ [[NSBundle mainBundle] loadNibNamed:@"SavePanelAccessoryView.nib"
+ owner:self
+ topLevelObjects:nil];
[savePanelAccessoryView retain];
}
return savePanelAccessoryView;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-12-29 11:53:46
|
Revision: 783
http://sourceforge.net/p/fuse-for-macosx/code/783
Author: fredm
Date: 2014-12-29 11:53:45 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
Drop $(HOME)/Library/Frameworks from FRAMEWORK_SEARCH_PATHS.
Run clang static analyser on build steps.
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2014-12-10 09:55:24 UTC (rev 782)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2014-12-29 11:53:45 UTC (rev 783)
@@ -1872,7 +1872,6 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks",
../../,
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
@@ -1919,7 +1918,6 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks",
../../,
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
@@ -1963,7 +1961,6 @@
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
- "$(HOME)/Library/Frameworks",
../../,
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
@@ -2011,6 +2008,7 @@
GCC_VERSION = "";
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
MACOSX_DEPLOYMENT_TARGET = 10.8;
+ RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx10.9;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
@@ -2030,6 +2028,7 @@
GCC_VERSION = "";
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
MACOSX_DEPLOYMENT_TARGET = 10.8;
+ RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx10.9;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
@@ -2048,6 +2047,7 @@
GCC_VERSION = "";
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
MACOSX_DEPLOYMENT_TARGET = 10.8;
+ RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx10.9;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-12-10 09:55:29
|
Revision: 782
http://sourceforge.net/p/fuse-for-macosx/code/782
Author: fredm
Date: 2014-12-10 09:55:24 +0000 (Wed, 10 Dec 2014)
Log Message:
-----------
Restore gcrypt components to generator script.
Modified Paths:
--------------
trunk/fuse/fusepb/generate.pl
Modified: trunk/fuse/fusepb/generate.pl
===================================================================
--- trunk/fuse/fusepb/generate.pl 2014-12-09 12:49:35 UTC (rev 781)
+++ trunk/fuse/fusepb/generate.pl 2014-12-10 09:55:24 UTC (rev 782)
@@ -177,14 +177,18 @@
if( /LIBSPECTRUM_INCLUDE_GCRYPT/ ) {
- $_ = '';
+ $_ = << "CODE";
+#include <gcrypt.h>
+CODE
}
if( /LIBSPECTRUM_SIGNATURE_PARAMETERS/ ) {
- $_ = "/* Signature parameters not stored as libgcrypt is not present */
-";
+ $_ = << "CODE";
+ /* The DSA signature parameters 'r' and 's' */
+ gcry_mpi_t r, s;
+CODE
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-12-09 12:49:44
|
Revision: 781
http://sourceforge.net/p/fuse-for-macosx/code/781
Author: fredm
Date: 2014-12-09 12:49:35 +0000 (Tue, 09 Dec 2014)
Log Message:
-----------
Fix empty memory browser issue (thanks, Derek Bolli)
Modified Paths:
--------------
trunk/fuse/fusepb/xibs/MemoryBrowser.xib
Modified: trunk/fuse/fusepb/xibs/MemoryBrowser.xib
===================================================================
--- trunk/fuse/fusepb/xibs/MemoryBrowser.xib 2014-12-09 12:44:47 UTC (rev 780)
+++ trunk/fuse/fusepb/xibs/MemoryBrowser.xib 2014-12-09 12:49:35 UTC (rev 781)
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">12C54</string>
- <string key="IBDocument.InterfaceBuilderVersion">2843</string>
- <string key="IBDocument.AppKitVersion">1187.34</string>
- <string key="IBDocument.HIToolboxVersion">625.00</string>
+ <string key="IBDocument.SystemVersion">14B25</string>
+ <string key="IBDocument.InterfaceBuilderVersion">6254</string>
+ <string key="IBDocument.AppKitVersion">1343.16</string>
+ <string key="IBDocument.HIToolboxVersion">755.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2843</string>
+ <string key="NS.object.0">6254</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSCustomObject</string>
@@ -54,55 +54,55 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSScrollView" id="542946903">
+ <object class="NSScrollView" id="635160192">
<reference key="NSNextResponder" ref="18192490"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="870857346">
- <reference key="NSNextResponder" ref="542946903"/>
- <int key="NSvFlags">2304</int>
+ <object class="NSClipView" id="968243887">
+ <reference key="NSNextResponder" ref="635160192"/>
+ <int key="NSvFlags">2322</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTableView" id="859908691">
- <reference key="NSNextResponder" ref="870857346"/>
+ <object class="NSTableView" id="506138753">
+ <reference key="NSNextResponder" ref="968243887"/>
<int key="NSvFlags">256</int>
- <string key="NSFrameSize">{498, 233}</string>
- <reference key="NSSuperview" ref="870857346"/>
+ <string key="NSFrameSize">{612, 233}</string>
+ <reference key="NSSuperview" ref="968243887"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="705160308"/>
+ <reference key="NSNextKeyView" ref="5901472"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
- <object class="NSTableHeaderView" key="NSHeaderView" id="652326324">
- <reference key="NSNextResponder" ref="696189721"/>
+ <object class="NSTableHeaderView" key="NSHeaderView" id="571802641">
+ <reference key="NSNextResponder" ref="5901472"/>
<int key="NSvFlags">256</int>
- <string key="NSFrameSize">{498, 17}</string>
- <reference key="NSSuperview" ref="696189721"/>
+ <string key="NSFrameSize">{612, 17}</string>
+ <reference key="NSSuperview" ref="5901472"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="310824406"/>
- <reference key="NSTableView" ref="859908691"/>
+ <reference key="NSNextKeyView" ref="372610263"/>
+ <reference key="NSTableView" ref="506138753"/>
</object>
- <object class="_NSCornerView" key="NSCornerView" id="310824406">
+ <object class="_NSCornerView" key="NSCornerView" id="372610263">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{484, 0}, {16, 17}}</string>
- <reference key="NSNextKeyView" ref="870857346"/>
+ <string key="NSFrame">{{598, 0}, {16, 17}}</string>
+ <reference key="NSNextKeyView" ref="968243887"/>
</object>
<array class="NSMutableArray" key="NSTableColumns">
- <object class="NSTableColumn" id="619005495">
- <string key="NSIdentifier">type</string>
- <double key="NSWidth">172</double>
+ <object class="NSTableColumn" id="509357520">
+ <string key="NSIdentifier">address</string>
+ <double key="NSWidth">62</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Address</string>
- <object class="NSFont" key="NSSupport" id="737095483">
- <string key="NSName">LucidaGrande</string>
+ <object class="NSFont" key="NSSupport" id="26">
+ <bool key="IBIsSystemFont">YES</bool>
<double key="NSSize">11</double>
- <int key="NSfFlags">16</int>
+ <int key="NSfFlags">3100</int>
</object>
- <object class="NSColor" key="NSBackgroundColor" id="389332259">
+ <object class="NSColor" key="NSBackgroundColor" id="1072534403">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
</object>
@@ -116,7 +116,7 @@
</object>
</object>
</object>
- <object class="NSTextFieldCell" key="NSDataCell" id="1008334756">
+ <object class="NSTextFieldCell" key="NSDataCell" id="87940021">
<int key="NSCellFlags">338690112</int>
<int key="NSCellFlags2">1024</int>
<object class="NSFont" key="NSSupport" id="355333690">
@@ -124,7 +124,7 @@
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
</object>
- <reference key="NSControlView" ref="859908691"/>
+ <reference key="NSControlView" ref="506138753"/>
<object class="NSColor" key="NSBackgroundColor" id="343714705">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@@ -138,48 +138,19 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="859908691"/>
+ <reference key="NSTableView" ref="506138753"/>
</object>
- <object class="NSTableColumn" id="532096921">
- <string key="NSIdentifier">hex</string>
- <double key="NSWidth">158.9580078125</double>
- <double key="NSMinWidth">28.958000183105469</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75497536</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Hex</string>
- <reference key="NSSupport" ref="737095483"/>
- <reference key="NSBackgroundColor" ref="389332259"/>
- <reference key="NSTextColor" ref="856098434"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="314451532">
- <int key="NSCellFlags">338690112</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="355333690"/>
- <reference key="NSControlView" ref="859908691"/>
- <reference key="NSBackgroundColor" ref="343714705"/>
- <reference key="NSTextColor" ref="194906987"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="859908691"/>
- </object>
- <object class="NSTableColumn" id="412675232">
+ <object class="NSTableColumn" id="988794380">
<string key="NSIdentifier">data</string>
- <double key="NSWidth">157.50199890136719</double>
+ <double key="NSWidth">162.50201416015625</double>
<double key="NSMinWidth">28.50200080871582</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Data</string>
- <object class="NSFont" key="NSSupport" id="26">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">3100</int>
- </object>
- <object class="NSColor" key="NSBackgroundColor" id="308222478">
+ <reference key="NSSupport" ref="26"/>
+ <object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">headerColor</string>
@@ -187,11 +158,11 @@
</object>
<reference key="NSTextColor" ref="856098434"/>
</object>
- <object class="NSTextFieldCell" key="NSDataCell" id="768007922">
+ <object class="NSTextFieldCell" key="NSDataCell" id="225874964">
<int key="NSCellFlags">338690112</int>
<int key="NSCellFlags2">1024</int>
<reference key="NSSupport" ref="355333690"/>
- <reference key="NSControlView" ref="859908691"/>
+ <reference key="NSControlView" ref="506138753"/>
<object class="NSColor" key="NSBackgroundColor" id="158820069">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
@@ -205,167 +176,18 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="859908691"/>
- </object>
- </array>
- <double key="NSIntercellSpacingWidth">3</double>
- <double key="NSIntercellSpacingHeight">2</double>
- <reference key="NSBackgroundColor" ref="343714705"/>
- <object class="NSColor" key="NSGridColor" id="864956217">
- <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">17</double>
- <int key="NSTvFlags">1388347392</int>
- <reference key="NSDelegate"/>
- <reference key="NSDataSource"/>
- <int key="NSColumnAutoresizingStyle">1</int>
- <int key="NSDraggingSourceMaskForLocal">-1</int>
- <int key="NSDraggingSourceMaskForNonLocal">0</int>
- <bool key="NSAllowsTypeSelect">YES</bool>
- <int key="NSTableViewDraggingDestinationStyle">0</int>
- <int key="NSTableViewGroupRowStyle">1</int>
- </object>
- </array>
- <string key="NSFrame">{{1, 17}, {498, 233}}</string>
- <reference key="NSSuperview" ref="542946903"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="859908691"/>
- <reference key="NSDocView" ref="859908691"/>
- <reference key="NSBGColor" ref="158820069"/>
- <int key="NScvFlags">4</int>
- </object>
- <object class="NSScroller" id="705160308">
- <reference key="NSNextResponder" ref="542946903"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{483, 17}, {16, 233}}</string>
- <reference key="NSSuperview" ref="542946903"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="926983026"/>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <reference key="NSTarget" ref="542946903"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.83157896995544434</double>
- </object>
- <object class="NSScroller" id="926983026">
- <reference key="NSNextResponder" ref="542946903"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{1, 234}, {498, 16}}</string>
- <reference key="NSSuperview" ref="542946903"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="635160192"/>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="542946903"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.99793388429752061</double>
- </object>
- <object class="NSClipView" id="696189721">
- <reference key="NSNextResponder" ref="542946903"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <reference ref="652326324"/>
- </array>
- <string key="NSFrame">{{1, 0}, {498, 17}}</string>
- <reference key="NSSuperview" ref="542946903"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="652326324"/>
- <reference key="NSDocView" ref="652326324"/>
- <reference key="NSBGColor" ref="158820069"/>
- <int key="NScvFlags">4</int>
- </object>
- </array>
- <string key="NSFrame">{{20, 20}, {500, 251}}</string>
- <reference key="NSSuperview" ref="18192490"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="696189721"/>
- <int key="NSsFlags">133170</int>
- <reference key="NSVScroller" ref="705160308"/>
- <reference key="NSHScroller" ref="926983026"/>
- <reference key="NSContentView" ref="870857346"/>
- <reference key="NSHeaderClipView" ref="696189721"/>
- <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
- <double key="NSMinMagnification">0.25</double>
- <double key="NSMaxMagnification">4</double>
- <double key="NSMagnification">1</double>
- </object>
- <object class="NSScrollView" id="635160192">
- <reference key="NSNextResponder" ref="18192490"/>
- <int key="NSvFlags">274</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="968243887">
- <reference key="NSNextResponder" ref="635160192"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSTableView" id="506138753">
- <reference key="NSNextResponder" ref="968243887"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{612, 233}</string>
- <reference key="NSSuperview" ref="968243887"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="59414325"/>
- <bool key="NSEnabled">YES</bool>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <bool key="NSControlAllowsExpansionToolTips">YES</bool>
- <object class="NSTableHeaderView" key="NSHeaderView" id="571802641">
- <reference key="NSNextResponder" ref="5901472"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{612, 17}</string>
- <reference key="NSSuperview" ref="5901472"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="372610263"/>
- <reference key="NSTableView" ref="506138753"/>
- </object>
- <object class="_NSCornerView" key="NSCornerView" id="372610263">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{598, 0}, {16, 17}}</string>
- <reference key="NSNextKeyView" ref="968243887"/>
- </object>
- <array class="NSMutableArray" key="NSTableColumns">
- <object class="NSTableColumn" id="509357520">
- <string key="NSIdentifier">address</string>
- <double key="NSWidth">62</double>
- <double key="NSMinWidth">40</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75497536</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Address</string>
- <reference key="NSSupport" ref="737095483"/>
- <object class="NSColor" key="NSBackgroundColor" id="1072534403">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
- </object>
- <reference key="NSTextColor" ref="856098434"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="87940021">
- <int key="NSCellFlags">338690112</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="355333690"/>
- <reference key="NSControlView" ref="506138753"/>
- <reference key="NSBackgroundColor" ref="343714705"/>
- <reference key="NSTextColor" ref="194906987"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
<reference key="NSTableView" ref="506138753"/>
</object>
<object class="NSTableColumn" id="278305639">
<string key="NSIdentifier">hex</string>
- <double key="NSWidth">377.9580078125</double>
+ <double key="NSWidth">378.45800018310547</double>
<double key="NSMinWidth">28.958000183105469</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Hex</string>
- <reference key="NSSupport" ref="737095483"/>
+ <reference key="NSSupport" ref="26"/>
<reference key="NSBackgroundColor" ref="1072534403"/>
<reference key="NSTextColor" ref="856098434"/>
</object>
@@ -381,36 +203,19 @@
<bool key="NSIsResizeable">YES</bool>
<reference key="NSTableView" ref="506138753"/>
</object>
- <object class="NSTableColumn" id="988794380">
- <string key="NSIdentifier">data</string>
- <double key="NSWidth">162.50201416015625</double>
- <double key="NSMinWidth">28.50200080871582</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75497536</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Data</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSBackgroundColor" ref="308222478"/>
- <reference key="NSTextColor" ref="856098434"/>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="225874964">
- <int key="NSCellFlags">338690112</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="355333690"/>
- <reference key="NSControlView" ref="506138753"/>
- <reference key="NSBackgroundColor" ref="158820069"/>
- <reference key="NSTextColor" ref="194906987"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="506138753"/>
- </object>
</array>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
<reference key="NSBackgroundColor" ref="343714705"/>
- <reference key="NSGridColor" ref="864956217"/>
+ <object class="NSColor" key="NSGridColor">
+ <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">17</double>
<int key="NSTvFlags">1388314624</int>
<reference key="NSDelegate"/>
@@ -430,6 +235,7 @@
<reference key="NSDocView" ref="506138753"/>
<reference key="NSBGColor" ref="158820069"/>
<int key="NScvFlags">4</int>
+ <bool key="NSAutomaticallyAdjustsContentInsets">YES</bool>
</object>
<object class="NSScroller" id="59414325">
<reference key="NSNextResponder" ref="635160192"/>
@@ -439,6 +245,8 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="285226706"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <string key="NSControlAction">_doScroller:</string>
+ <reference key="NSControlTarget" ref="635160192"/>
<reference key="NSTarget" ref="635160192"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.83157896995544434</double>
@@ -449,16 +257,17 @@
<string key="NSFrame">{{1, 234}, {612, 16}}</string>
<reference key="NSSuperview" ref="635160192"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <string key="NSControlAction">_doScroller:</string>
+ <reference key="NSControlTarget" ref="635160192"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="635160192"/>
<string key="NSAction">_doScroller:</string>
- <double key="NSPercent">0.99832775919732442</double>
+ <double key="NSPercent">0.93714285714285717</double>
</object>
<object class="NSClipView" id="5901472">
<reference key="NSNextResponder" ref="635160192"/>
- <int key="NSvFlags">2304</int>
+ <int key="NSvFlags">2338</int>
<array class="NSMutableArray" key="NSSubviews">
<reference ref="571802641"/>
</array>
@@ -467,14 +276,13 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="571802641"/>
<reference key="NSDocView" ref="571802641"/>
- <reference key="NSBGColor" ref="158820069"/>
- <int key="NScvFlags">4</int>
+ <bool key="NSAutomaticallyAdjustsContentInsets">YES</bool>
</object>
</array>
<string key="NSFrame">{{20, 20}, {614, 251}}</string>
<reference key="NSSuperview" ref="18192490"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="5901472"/>
+ <reference key="NSNextKeyView" ref="968243887"/>
<int key="NSsFlags">133170</int>
<reference key="NSVScroller" ref="59414325"/>
<reference key="NSHScroller" ref="285226706"/>
@@ -489,7 +297,7 @@
<string key="NSFrameSize">{654, 291}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="542946903"/>
+ <reference key="NSNextKeyView"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMinSize">{213, 129}</string>
@@ -498,7 +306,7 @@
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
- <array class="NSMutableArray" key="connectionRecords">
+ <array key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">memoryBrowser</string>
@@ -573,57 +381,17 @@
<int key="objectID">5</int>
<reference key="object" ref="18192490"/>
<array class="NSMutableArray" key="children">
- <reference ref="542946903"/>
<reference ref="635160192"/>
</array>
<reference key="parent" ref="53132852"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">10</int>
- <reference key="object" ref="542946903"/>
- <array class="NSMutableArray" key="children">
- <reference ref="859908691"/>
- <reference ref="705160308"/>
- <reference ref="926983026"/>
- <reference ref="652326324"/>
- </array>
- <reference key="parent" ref="18192490"/>
+ <int key="objectID">-3</int>
+ <reference key="object" ref="68541193"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">9</int>
- <reference key="object" ref="859908691"/>
- <array class="NSMutableArray" key="children">
- <reference ref="619005495"/>
- <reference ref="532096921"/>
- <reference ref="412675232"/>
- </array>
- <reference key="parent" ref="542946903"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="619005495"/>
- <array class="NSMutableArray" key="children">
- <reference ref="1008334756"/>
- </array>
- <reference key="parent" ref="859908691"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="532096921"/>
- <array class="NSMutableArray" key="children">
- <reference ref="314451532"/>
- </array>
- <reference key="parent" ref="859908691"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">12</int>
- <reference key="object" ref="412675232"/>
- <array class="NSMutableArray" key="children">
- <reference ref="768007922"/>
- </array>
- <reference key="parent" ref="859908691"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">13</int>
<reference key="object" ref="635160192"/>
<array class="NSMutableArray" key="children">
@@ -635,148 +403,97 @@
<reference key="parent" ref="18192490"/>
</object>
<object class="IBObjectRecord">
+ <int key="objectID">36</int>
+ <reference key="object" ref="571802641"/>
+ <reference key="parent" ref="635160192"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">35</int>
+ <reference key="object" ref="285226706"/>
+ <reference key="parent" ref="635160192"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">34</int>
+ <reference key="object" ref="59414325"/>
+ <reference key="parent" ref="635160192"/>
+ </object>
+ <object class="IBObjectRecord">
<int key="objectID">14</int>
<reference key="object" ref="506138753"/>
<array class="NSMutableArray" key="children">
+ <reference ref="509357520"/>
<reference ref="278305639"/>
- <reference ref="509357520"/>
<reference ref="988794380"/>
</array>
<reference key="parent" ref="635160192"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">15</int>
- <reference key="object" ref="278305639"/>
+ <int key="objectID">17</int>
+ <reference key="object" ref="988794380"/>
<array class="NSMutableArray" key="children">
- <reference ref="437124708"/>
+ <reference ref="225874964"/>
</array>
<reference key="parent" ref="506138753"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">16</int>
- <reference key="object" ref="509357520"/>
- <array class="NSMutableArray" key="children">
- <reference ref="87940021"/>
- </array>
- <reference key="parent" ref="506138753"/>
+ <int key="objectID">30</int>
+ <reference key="object" ref="225874964"/>
+ <reference key="parent" ref="988794380"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">17</int>
- <reference key="object" ref="988794380"/>
+ <int key="objectID">15</int>
+ <reference key="object" ref="278305639"/>
<array class="NSMutableArray" key="children">
- <reference ref="225874964"/>
+ <reference ref="437124708"/>
</array>
<reference key="parent" ref="506138753"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">25</int>
- <reference key="object" ref="1008334756"/>
- <reference key="parent" ref="619005495"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">26</int>
- <reference key="object" ref="314451532"/>
- <reference key="parent" ref="532096921"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">27</int>
- <reference key="object" ref="768007922"/>
- <reference key="parent" ref="412675232"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">28</int>
<reference key="object" ref="437124708"/>
<reference key="parent" ref="278305639"/>
</object>
<object class="IBObjectRecord">
+ <int key="objectID">16</int>
+ <reference key="object" ref="509357520"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="87940021"/>
+ </array>
+ <reference key="parent" ref="506138753"/>
+ </object>
+ <object class="IBObjectRecord">
<int key="objectID">29</int>
<reference key="object" ref="87940021"/>
<reference key="parent" ref="509357520"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">30</int>
- <reference key="object" ref="225874964"/>
- <reference key="parent" ref="988794380"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">31</int>
- <reference key="object" ref="705160308"/>
- <reference key="parent" ref="542946903"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">32</int>
- <reference key="object" ref="926983026"/>
- <reference key="parent" ref="542946903"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">33</int>
- <reference key="object" ref="652326324"/>
- <reference key="parent" ref="542946903"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">34</int>
- <reference key="object" ref="59414325"/>
- <reference key="parent" ref="635160192"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">35</int>
- <reference key="object" ref="285226706"/>
- <reference key="parent" ref="635160192"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">36</int>
- <reference key="object" ref="571802641"/>
- <reference key="parent" ref="635160192"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object" ref="68541193"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">Application</string>
- </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <reference key="14.IBNSViewMetadataGestureRecognizers" ref="0"/>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="25.IBShouldRemoveOnLegacySave"/>
- <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="26.IBShouldRemoveOnLegacySave"/>
- <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="27.IBShouldRemoveOnLegacySave"/>
<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="28.IBShouldRemoveOnLegacySave"/>
<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="29.IBShouldRemoveOnLegacySave"/>
<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="30.IBShouldRemoveOnLegacySave"/>
- <string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="31.IBShouldRemoveOnLegacySave"/>
- <string key="32.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="32.IBShouldRemoveOnLegacySave"/>
- <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="33.IBShouldRemoveOnLegacySave"/>
<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="34.IBShouldRemoveOnLegacySave"/>
<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="35.IBShouldRemoveOnLegacySave"/>
<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="36.IBShouldRemoveOnLegacySave"/>
+ <reference key="5.IBNSViewMetadataGestureRecognizers" ref="0"/>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6.IBWindowTemplateEditedContentRect">{{43, 322}, {654, 331}}</string>
- <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
@@ -789,20 +506,6 @@
<object class="IBPartialClassDescription">
<string key="className">MemoryBrowserController</string>
<string key="superclassName">NSWindowController</string>
- <dictionary class="NSMutableDictionary" key="actions">
- <string key="apply:">id</string>
- <string key="showWindow:">id</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="actionInfosByName">
- <object class="IBActionInfo" key="apply:">
- <string key="name">apply:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="showWindow:">
- <string key="name">showWindow:</string>
- <string key="candidateClassName">id</string>
- </object>
- </dictionary>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">memoryBrowser</string>
<string key="NS.object.0">NSTableView</string>
@@ -816,17 +519,22 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/MemoryBrowserController.h</string>
+ <string key="minorKey">../controllers/MemoryBrowserController.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1060" key="NS.object.0"/>
</object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+ <integer value="4600" key="NS.object.0"/>
+ </object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-12-09 12:44:55
|
Revision: 780
http://sourceforge.net/p/fuse-for-macosx/code/780
Author: fredm
Date: 2014-12-09 12:44:47 +0000 (Tue, 09 Dec 2014)
Log Message:
-----------
Migrate to XCode 6.1 and Mac OS X 10.9 SDK
Modified Paths:
--------------
trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/audiofile/audiofile.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
Modified: trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2014-08-14 14:04:13 UTC (rev 779)
+++ trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2014-12-09 12:44:47 UTC (rev 780)
@@ -363,7 +363,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0460;
+ LastUpgradeCheck = 0610;
};
buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "FuseGenerator" */;
compatibilityVersion = "Xcode 3.2";
@@ -526,38 +526,51 @@
2CA326230896AD4900168862 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEAD_CODE_STRIPPING = YES;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.8;
+ ONLY_ACTIVE_ARCH = YES;
+ SDKROOT = macosx10.9;
};
name = Debug;
};
2CA326240896AD4900168862 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEAD_CODE_STRIPPING = YES;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
};
name = Release;
};
Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2014-08-14 14:04:13 UTC (rev 779)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2014-12-09 12:44:47 UTC (rev 780)
@@ -338,7 +338,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0610;
};
buildConfigurationList = B6B0E30008CC65D5001D8411 /* Build configuration list for PBXProject "FuseImporter" */;
compatibilityVersion = "Xcode 3.2";
@@ -566,8 +566,10 @@
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -576,7 +578,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
};
name = Development;
};
@@ -588,9 +590,11 @@
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -599,7 +603,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
};
name = Deployment;
};
@@ -611,8 +615,10 @@
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -621,7 +627,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
};
name = Default;
};
Modified: trunk/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2014-08-14 14:04:13 UTC (rev 779)
+++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2014-12-09 12:44:47 UTC (rev 780)
@@ -303,7 +303,7 @@
000000000000000016601A90 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0450;
+ LastUpgradeCheck = 0610;
};
buildConfigurationList = B62395470C1CF4F8003B8E87 /* Build configuration list for PBXProject "audiofile" */;
compatibilityVersion = "Xcode 3.2";
@@ -402,7 +402,6 @@
B62395480C1CF4F8003B8E87 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_VERSION = 0.2.6;
@@ -415,7 +414,6 @@
B62395490C1CF4F8003B8E87 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
FRAMEWORK_VERSION = 0.2.6;
@@ -428,7 +426,6 @@
B623954A0C1CF4F8003B8E87 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_VERSION = 0.2.6;
@@ -441,7 +438,6 @@
B62395BD0C1CF586003B8E87 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -472,7 +468,7 @@
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = framework;
@@ -483,7 +479,6 @@
B62395BE0C1CF586003B8E87 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -513,7 +508,7 @@
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = framework;
@@ -524,7 +519,6 @@
B62395BF0C1CF586003B8E87 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -553,7 +547,7 @@
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = framework;
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2014-08-14 14:04:13 UTC (rev 779)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2014-12-09 12:44:47 UTC (rev 780)
@@ -1552,7 +1552,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0500;
+ LastUpgradeCheck = 0610;
};
buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */;
compatibilityVersion = "Xcode 3.2";
@@ -1903,7 +1903,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1948,7 +1948,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1992,7 +1992,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -2011,7 +2011,7 @@
GCC_VERSION = "";
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
MACOSX_DEPLOYMENT_TARGET = 10.8;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = YES;
@@ -2030,7 +2030,7 @@
GCC_VERSION = "";
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
MACOSX_DEPLOYMENT_TARGET = 10.8;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
@@ -2048,7 +2048,7 @@
GCC_VERSION = "";
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
MACOSX_DEPLOYMENT_TARGET = 10.8;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
Modified: trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
===================================================================
--- trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2014-08-14 14:04:13 UTC (rev 779)
+++ trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2014-12-09 12:44:47 UTC (rev 780)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -357,9 +357,10 @@
00000000000000001640F4D0 /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0610;
};
buildConfigurationList = B61D2B3F0A59ED600008B6CC /* Build configuration list for PBXProject "libgcrypt" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -454,6 +455,7 @@
B61D2B390A59ED5F0008B6CC /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 13;
DYLIB_CURRENT_VERSION = 13.1;
@@ -491,6 +493,7 @@
B61D2B3A0A59ED5F0008B6CC /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DYLIB_COMPATIBILITY_VERSION = 13;
DYLIB_CURRENT_VERSION = 13.1;
@@ -527,6 +530,7 @@
B61D2B3B0A59ED5F0008B6CC /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 13;
DYLIB_CURRENT_VERSION = 13.1;
FRAMEWORK_VERSION = 1.2.4;
@@ -563,7 +567,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
};
name = Development;
};
@@ -574,7 +578,7 @@
DEPLOYMENT_POSTPROCESSING = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
};
name = Deployment;
};
@@ -584,7 +588,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
- SDKROOT = macosx10.8;
+ SDKROOT = macosx10.9;
};
name = Default;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-08-14 14:04:15
|
Revision: 779
http://sourceforge.net/p/fuse-for-macosx/code/779
Author: fredm
Date: 2014-08-14 14:04:13 +0000 (Thu, 14 Aug 2014)
Log Message:
-----------
PERIPH_TYPE_BETA128_PENTAGON and PERIPH_TYPE_BETA128_PENTAGON_LATE indicate that
PERIPH_TYPE_BETA128 type actions should be allowed too.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.m
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2014-07-25 13:03:15 UTC (rev 778)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2014-08-14 14:04:13 UTC (rev 779)
@@ -189,6 +189,13 @@
return 0;
}
+static int
+is_beta_active( void ) {
+ return ( periph_is_active( PERIPH_TYPE_BETA128 ) ||
+ periph_is_active( PERIPH_TYPE_BETA128_PENTAGON ) ||
+ periph_is_active( PERIPH_TYPE_BETA128_PENTAGON_LATE ) );
+}
+
@implementation FuseController
static FuseController *singleton = nil;
@@ -1277,7 +1284,7 @@
if( !machine_current ) {
} else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
newValue = diskPlus3FlipA;
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
newValue = diskTrDosFlipA;
} else {
newValue = diskPlusDFlipA;
@@ -1293,7 +1300,7 @@
if( !machine_current ) {
} else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
newValue = diskPlus3FlipB;
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
newValue = diskTrDosFlipB;
} else {
newValue = diskPlusDFlipB;
@@ -1309,7 +1316,7 @@
if( !machine_current ) {
} else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
newValue = diskPlus3WpA;
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
newValue = diskTrDosWpA;
} else {
newValue = diskPlusDWpA;
@@ -1325,7 +1332,7 @@
if( !machine_current ) {
} else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
newValue = diskPlus3WpB;
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
newValue = diskTrDosWpB;
} else {
newValue = diskPlusDWpB;
@@ -2104,7 +2111,7 @@
if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
[[DisplayOpenGLView instance] specplus3DiskInsertNew:drive];
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
[[DisplayOpenGLView instance] betaDiskInsertNew:drive];
} else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
[[DisplayOpenGLView instance] opusDiskInsertNew:drive];
@@ -2127,7 +2134,7 @@
if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
fileTypes = plus3FileTypes;
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
fileTypes = betaFileTypes;
} else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
fileTypes = opusFileTypes;
@@ -2135,7 +2142,8 @@
fileTypes = plusdFileTypes;
}
- if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 || periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ||
+ is_beta_active() ) {
message = ( drive == SPECPLUS3_DRIVE_A ? @"Insert disk into drive A:" :
@"Insert disk into drive B:" );
} else {
@@ -2151,7 +2159,7 @@
if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
[[DisplayOpenGLView instance] specplus3DiskInsert:filename inDrive:drive];
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
[[DisplayOpenGLView instance] betaDiskInsert:filename inDrive:drive];
} else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
[[DisplayOpenGLView instance] opusDiskInsert:filename inDrive:drive];
@@ -2676,7 +2684,7 @@
[[DisplayOpenGLView instance] pause];
if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
[[DisplayOpenGLView instance] specplus3DiskEject:drive];
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
[[DisplayOpenGLView instance] betaDiskEject:drive];
} else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
[[DisplayOpenGLView instance] opusDiskEject:drive];
@@ -2694,7 +2702,7 @@
[[DisplayOpenGLView instance] pause];
if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
[[DisplayOpenGLView instance] specplus3DiskSave:drive saveAs:saveas];
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
[[DisplayOpenGLView instance] betaDiskSave:drive saveAs:saveas];
} else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
[[DisplayOpenGLView instance] opusDiskSave:drive saveAs:saveas];
@@ -2712,7 +2720,7 @@
[[DisplayOpenGLView instance] pause];
if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
[[DisplayOpenGLView instance] specplus3DiskFlip:drive side:flip];
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
[[DisplayOpenGLView instance] betaDiskFlip:drive side:flip];
} else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
[[DisplayOpenGLView instance] opusDiskFlip:drive side:flip];
@@ -2730,7 +2738,7 @@
[[DisplayOpenGLView instance] pause];
if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
[[DisplayOpenGLView instance] specplus3DiskWriteProtect:drive protect:wrprot];
- } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+ } else if( is_beta_active() ) {
[[DisplayOpenGLView instance] betaDiskWriteProtect:drive protect:wrprot];
} else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
[[DisplayOpenGLView instance] opusDiskWriteProtect:drive protect:wrprot];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-07-25 13:03:21
|
Revision: 778
http://sourceforge.net/p/fuse-for-macosx/code/778
Author: fredm
Date: 2014-07-25 13:03:15 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
Handle nested pauses when a paused emulator uses a modal dialog.
Modified Paths:
--------------
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
Modified: trunk/fuse/fusepb/models/Emulator.h
===================================================================
--- trunk/fuse/fusepb/models/Emulator.h 2014-04-11 12:35:21 UTC (rev 777)
+++ trunk/fuse/fusepb/models/Emulator.h 2014-07-25 13:03:15 UTC (rev 778)
@@ -34,7 +34,7 @@
@interface Emulator : NSObject
{
- BOOL isEmulating;
+ int isPaused;
NSTimer* timer;
CFAbsoluteTime time;
float timerInterval;
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2014-04-11 12:35:21 UTC (rev 777)
+++ trunk/fuse/fusepb/models/Emulator.m 2014-07-25 13:03:15 UTC (rev 778)
@@ -122,7 +122,7 @@
timer = nil;
timerInterval = 1.0f / 50.0f;
- isEmulating = NO;
+ isPaused = 0;
optDown = NO;
ctrlDown = NO;
@@ -255,21 +255,21 @@
-(void) pause
{
fuse_emulation_pause();
- if( isEmulating ) {
- if( timer != nil ) {
- [self stopEmulationTimer];
- }
- isEmulating = NO;
+
+ if( isPaused++ ) return;
+
+ if( timer != nil ) {
+ [self stopEmulationTimer];
}
}
-(void) unpause
{
fuse_emulation_unpause();
- if( !isEmulating ) {
- isEmulating = YES;
- [self startEmulationTimer];
- }
+
+ if( --isPaused ) return;
+
+ [self startEmulationTimer];
}
-(void) reset
@@ -688,8 +688,6 @@
return divide_eject( unit );
}
-@synthesize isEmulating;
-
-(void) startEmulationTimer
{
if( timer == nil ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-04-11 12:35:24
|
Revision: 777
http://sourceforge.net/p/fuse-for-macosx/code/777
Author: fredm
Date: 2014-04-11 12:35:21 +0000 (Fri, 11 Apr 2014)
Log Message:
-----------
Fix typo in example "set" command.
Modified Paths:
--------------
trunk/fuse/fusepb/resources/Fuse Help/html/pokefinder.html
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/pokefinder.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/pokefinder.html 2014-03-22 11:32:42 UTC (rev 776)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/pokefinder.html 2014-04-11 12:35:21 UTC (rev 777)
@@ -1,92 +1,131 @@
-<head>
-<!-- AppleSegStart="The Poke Finder" -->
- <title>The Poke Finder</title>
-</head>
-<font
- face="Lucida Grande,Helvetica,Arial"><a name="The Poke Finder"></a><!-- AppleSegDescription="This section describes the Fuse poke finder." --></font>
-<div class="refsect1" xml:lang="en" lang="en">
-<h2><font face="Lucida Grande,Helvetica,Arial">The Poke
-Finder</font></h2>
-</div>
-<p>
-<font face="Lucida Grande,Helvetica,Arial">The `poke finder' is a tool
-which is designed to make the task of
-finding (infinite lives etc) pokes for games a bit easier: it is
-similar to the `Lifeguard' utility which was available for use with
-the Multiface. It works by maintaining a list of locations in which
-the current number of lives (etc) may be stored, and having the
-ability to remove from that list any locations which don't contain
-a specified
-value.</font></p>
-<p>
-<font face="Lucida Grande,Helvetica,Arial">The poke finder dialog
-contains an entry box for specifying the
-value to be searched for, a count of the current number of possible
-locations and, if there are less than 20 possible locations, a list
-of the possible locations (in `page:offset' format). The five
-buttons act as
-follows:</font></p>
-<div class="variablelist">
-<dl>
- <dt> <span class="term"><font face="Lucida Grande,Helvetica,Arial"><em>Incremented</em>
- </font></span></dt>
- <dd>
- <p><font face="Lucida Grande,Helvetica,Arial">Remove from the list
-of possible locations all addresses which have not been incremented
-since the last search.</font></p>
- </dd>
- <dt> <span class="term"><font face="Lucida Grande,Helvetica,Arial"><em>Decremented</em>
- </font></span></dt>
- <dd>
- <p><font face="Lucida Grande,Helvetica,Arial">Remove from the list
-of possible locations all addresses which have not been deccremented
-since the last search.</font></p>
- </dd>
- <dt> <span class="term"><font face="Lucida Grande,Helvetica,Arial"><em>Search</em>
- </font></span></dt>
- <dd>
- <p><font face="Lucida Grande,Helvetica,Arial">Remove from the list
-of possible locations all addresses which do not contain the value
-specified in the `Search for' field.</font></p>
- </dd>
- <dt> <span class="term"><font face="Lucida Grande,Helvetica,Arial"><em>Reset</em></font></span></dt>
- <dd>
- <p><font face="Lucida Grande,Helvetica,Arial">Reset the poke finder
-so that all locations are considered possible.</font></p>
- </dd>
- <dt> <span class="term"><font face="Lucida Grande,Helvetica,Arial"><em>OK</em></font></span></dt>
- <dd>
- <p><font face="Lucida Grande,Helvetica,Arial">Close the dialog.
-Note that this does not reset the current state of the poke
-finder.</font></p>
- </dd>
-</dl>
-</div>
-<p>
-<font face="Lucida Grande,Helvetica,Arial">An example of how to use
-this may make things a bit clearer. We'll
-use the 128K version of Gryzor. Load the game, define keys to suit
-and start playing. Immediately pause the game and bring up the poke
-finder dialog. We note that we currently have 6 lives, so enter `6'
-into the `Search for' field and click `Search'. This reduces the
-number of possible locations to around 931 (you may get a slightly
-different number depending on exactly when you paused the game).
-Play along a bit and then (deliberately) lose a life. Pause the
-game again. As we now have 5 lives, replace the `6' in the 'Search
-for' field with a `5' and click `Search' again. This then reduces
-the list of possible locations to just one: page 2, offset 0x00BC.
-This is the only location in memory which stored `6' when we had 6
-lives and `5' when we had 5 lives, so its pretty likely that this
-is where the lives count is stored. Double-clicking on the
-`2:0x00BC' entry in the dialog will set the appropriate breakpoint
-(you may wish to open the debugger at this point to confirm this).
-Play along a bit more. When you next lose a life, emulation is
-stopped with PC at 0x91CD. Scrolling up a few addresses in the
-debugger's disassembly pane shows a value was loaded from 0x80BC
-(our hypothetical lives counter), decremented and then stored again
-to 0x80BC, which looks very much like the code to reduce the number
-of lives. We can now use the debugger to replace the decrement with
-a NOP (`set 0x91C90'), and playing the game some more after this
-reveals that this has worked and we now have infinite
-lives.</font></p>
-<!-- AppleSegEnd -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+
+ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+ <!-- AppleSegStart="The Poke Finder" -->
+ <title>The Poke Finder</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="The Poke Finder"></a><!-- AppleSegDescription="This section describes the Fuse poke finder." --></font>
+ <div class="refsect1" xml:lang="en" lang="en">
+ <h2><font face="Lucida Grande,Helvetica,Arial">The Poke
+ Finder</font></h2>
+ </div>
+ <p>
+ <font face="Lucida Grande,Helvetica,Arial">The `poke finder' is a
+ tool
+ which is designed to make the task of
+ finding (infinite lives etc) pokes for games a bit easier: it is
+ similar to the `Lifeguard' utility which was available for use
+ with
+ the Multiface. It works by maintaining a list of locations in
+ which
+ the current number of lives (etc) may be stored, and having the
+ ability to remove from that list any locations which don't
+ contain
+ a specified
+ value.</font></p>
+ <p>
+ <font face="Lucida Grande,Helvetica,Arial">The poke finder dialog
+ contains an entry box for specifying the
+ value to be searched for, a count of the current number of
+ possible
+ locations and, if there are less than 20 possible locations, a
+ list
+ of the possible locations (in `page:offset' format). The five
+ buttons act as
+ follows:</font></p>
+ <div class="variablelist">
+ <dl>
+ <dt> <span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Incremented</em> </font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">Remove from the
+ list
+ of possible locations all addresses which have not been
+ incremented
+ since the last search.</font></p>
+ </dd>
+ <dt> <span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Decremented</em> </font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">Remove from the
+ list
+ of possible locations all addresses which have not been
+ deccremented
+ since the last search.</font></p>
+ </dd>
+ <dt> <span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Search</em> </font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">Remove from the
+ list
+ of possible locations all addresses which do not contain
+ the value
+ specified in the `Search for' field.</font></p>
+ </dd>
+ <dt> <span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Reset</em></font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">Reset the poke
+ finder
+ so that all locations are considered possible.</font></p>
+ </dd>
+ <dt> <span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em>OK</em></font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">Close the
+ dialog.
+ Note that this does not reset the current state of the
+ poke
+ finder.</font></p>
+ </dd>
+ </dl>
+ </div>
+ <p>
+ <font face="Lucida Grande,Helvetica,Arial">An example of how to
+ use
+ this may make things a bit clearer. We'll
+ use the 128K version of Gryzor. Load the game, define keys to
+ suit
+ and start playing. Immediately pause the game and bring up the
+ poke
+ finder dialog. We note that we currently have 6 lives, so enter
+ `6'
+ into the `Search for' field and click `Search'. This reduces the
+ number of possible locations to around 931 (you may get a
+ slightly
+ different number depending on exactly when you paused the game).
+ Play along a bit and then (deliberately) lose a life. Pause the
+ game again. As we now have 5 lives, replace the `6' in the
+ 'Search
+ for' field with a `5' and click `Search' again. This then
+ reduces
+ the list of possible locations to just one: page 2, offset
+ 0x00BC.
+ This is the only location in memory which stored `6' when we had
+ 6
+ lives and `5' when we had 5 lives, so its pretty likely that
+ this
+ is where the lives count is stored. Double-clicking on the
+ `2:0x00BC' entry in the dialog will set the appropriate
+ breakpoint
+ (you may wish to open the debugger at this point to confirm
+ this).
+ Play along a bit more. When you next lose a life, emulation is
+ stopped with PC at 0x91CD. Scrolling up a few addresses in the
+ debugger's disassembly pane shows a value was loaded from 0x80BC
+ (our hypothetical lives counter), decremented and then stored
+ again
+ to 0x80BC, which looks very much like the code to reduce the
+ number
+ of lives. We can now use the debugger to replace the decrement
+ with
+ a NOP (`set 0x91C9 0'), and playing the game some more after
+ this
+ reveals that this has worked and we now have infinite
+ lives.</font></p>
+ <!-- AppleSegEnd -->
+ </body>
+</html>
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...> - 2014-03-22 10:41:46
|
Revision: 775
http://sourceforge.net/p/fuse-for-macosx/code/775
Author: fredm
Date: 2014-03-22 10:41:43 +0000 (Sat, 22 Mar 2014)
Log Message:
-----------
NSForm doesn't get along with XCode 5, replace with NSTextField
Modified Paths:
--------------
trunk/fuse/fusepb/xibs/Preferences.xib
Modified: trunk/fuse/fusepb/xibs/Preferences.xib
===================================================================
--- trunk/fuse/fusepb/xibs/Preferences.xib 2014-02-15 05:13:19 UTC (rev 774)
+++ trunk/fuse/fusepb/xibs/Preferences.xib 2014-03-22 10:41:43 UTC (rev 775)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
- <deployment version="1050" defaultVersion="1080" identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+ <deployment version="1080" defaultVersion="1080" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="PreferencesController">
@@ -28,7 +28,7 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application"/>
- <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" wantsToBeColor="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="5" userLabel="Preferences" customClass="NSPanel">
+ <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="5" userLabel="Preferences" customClass="NSPanel">
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="24" y="202" width="627" height="403"/>
@@ -159,53 +159,6 @@
<binding destination="270" name="value" keyPath="values.fastload" id="1786"/>
</connections>
</button>
- <form verticalHuggingPriority="750" mode="track" allowsEmptySelection="NO" autosizesCells="NO" id="1353">
- <rect key="frame" x="121" y="193" width="279" height="52"/>
- <autoresizingMask key="autoresizingMask"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- <size key="cellSize" width="279" height="22"/>
- <size key="intercellSpacing" width="1" height="8"/>
- <formCell key="prototype" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="justified" title="Field:" id="1370">
- <font key="font" metaFont="system"/>
- <font key="titleFont" metaFont="system"/>
- </formCell>
- <cells>
- <column>
- <formCell scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="justified" title="Emulation speed:" id="1371">
- <numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="#,##0%" negativeFormat="-#,##0.00" thousandSeparator="," id="1790">
- <attributedString key="attributedStringForZero">
- <fragment content="0"/>
- </attributedString>
- <integer key="minimum" value="1"/>
- <decimal key="maximum" value="NaN"/>
- </numberFormatter>
- <font key="font" metaFont="system"/>
- <font key="titleFont" metaFont="system"/>
- <connections>
- <binding destination="270" name="value" keyPath="values.speed" id="1382"/>
- </connections>
- </formCell>
- <formCell scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="justified" tag="1" title="Screen refresh rate (1:n):" id="1372">
- <numberFormatter key="formatter" formatterBehavior="custom10_4" positiveFormat="#" negativeFormat="#" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" minimumFractionDigits="0" maximumFractionDigits="0" id="1791">
- <real key="roundingIncrement" value="0.0"/>
- <nil key="nilSymbol"/>
- <nil key="negativeInfinitySymbol"/>
- <nil key="positiveInfinitySymbol"/>
- <integer key="minimum" value="1"/>
- <real key="maximum" value="50"/>
- <metadata>
- <bool key="localizesFormat" value="YES"/>
- </metadata>
- </numberFormatter>
- <font key="font" metaFont="system"/>
- <font key="titleFont" metaFont="system"/>
- <connections>
- <binding destination="270" name="value" keyPath="values.rate" id="1384"/>
- </connections>
- </formCell>
- </column>
- </cells>
- </form>
<button id="1354">
<rect key="frame" x="293" y="129" width="151" height="18"/>
<autoresizingMask key="autoresizingMask"/>
@@ -299,6 +252,59 @@
<binding destination="270" name="value" keyPath="values.confirmactions" id="1399"/>
</connections>
</button>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="NNe-bG-amc">
+ <rect key="frame" x="167" y="230" width="112" height="17"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Emulation speed:" id="BoH-kb-bUl">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="V1D-ym-CTs">
+ <rect key="frame" x="119" y="196" width="160" height="17"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Screen refresh rate (1:n):" id="69l-0C-1Jd">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="AQm-ut-oKC">
+ <rect key="frame" x="285" y="228" width="116" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="8Rf-5o-m5G">
+ <numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="#,##0%" negativeFormat="-#,##0.00" thousandSeparator="," id="jTc-rQ-dSN">
+ <real key="minimum" value="1"/>
+ <decimal key="maximum" value="NaN"/>
+ </numberFormatter>
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="270" name="value" keyPath="values.speed" id="zJq-NB-RjL"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="rJU-D7-OFM">
+ <rect key="frame" x="285" y="194" width="116" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="5My-XZ-RQ4">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="309" maximumFractionDigits="3" id="F1O-A5-msN">
+ <real key="minimum" value="1"/>
+ <real key="maximum" value="50"/>
+ <metadata>
+ <real key="inspectorSampleValue" value="1"/>
+ </metadata>
+ </numberFormatter>
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="270" name="value" keyPath="values.rate" id="Zrv-JU-bcU"/>
+ </connections>
+ </textField>
</subviews>
</customView>
<customView id="1408" userLabel="Sound">
@@ -310,7 +316,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="1858" id="1856">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="1857">
<items>
<menuItem title="Item 1" state="on" id="1858"/>
@@ -407,7 +413,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="1886" id="1884">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="1885">
<items>
<menuItem title="Item 1" state="on" id="1886"/>
@@ -530,35 +536,6 @@
<action selector="chooseFile:" target="-2" id="1486"/>
</connections>
</button>
- <form verticalHuggingPriority="750" mode="track" allowsEmptySelection="NO" autosizesCells="NO" id="1464">
- <rect key="frame" x="23" y="13" width="451" height="52"/>
- <autoresizingMask key="autoresizingMask"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- <size key="cellSize" width="451" height="22"/>
- <size key="intercellSpacing" width="1" height="8"/>
- <formCell key="prototype" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="justified" title="Field:" id="1471">
- <font key="font" metaFont="system"/>
- <font key="titleFont" metaFont="system"/>
- </formCell>
- <cells>
- <column>
- <formCell scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="justified" title="Graphic Output File:" id="1470">
- <font key="font" metaFont="system"/>
- <font key="titleFont" metaFont="system"/>
- <connections>
- <binding destination="270" name="value" keyPath="values.graphicsfile" id="1484"/>
- </connections>
- </formCell>
- <formCell scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="justified" tag="1" title="Text Output File:" id="1469">
- <font key="font" metaFont="system"/>
- <font key="titleFont" metaFont="system"/>
- <connections>
- <binding destination="270" name="value" keyPath="values.textfile" id="1485"/>
- </connections>
- </formCell>
- </column>
- </cells>
- </form>
<button id="1463">
<rect key="frame" x="18" y="91" width="138" height="18"/>
<autoresizingMask key="autoresizingMask"/>
@@ -581,6 +558,48 @@
<binding destination="270" name="value" keyPath="values.zxprinter" id="1953"/>
</connections>
</button>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Vg7-l5-Jxr">
+ <rect key="frame" x="25" y="46" width="131" height="17"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Graphic Output File:" id="bvv-kb-cZ4">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="ptU-fP-Mnq">
+ <rect key="frame" x="47" y="16" width="109" height="17"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Text Output File:" id="0Dt-bm-EQa">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="LuR-Lj-xFi">
+ <rect key="frame" x="157" y="44" width="317" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="xTs-kP-Vfd">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="270" name="value" keyPath="values.graphicsfile" id="kps-HD-1Jz"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="YFe-FE-BDr">
+ <rect key="frame" x="157" y="14" width="317" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="y2D-9H-b0V">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="270" name="value" keyPath="values.textfile" id="k3o-QR-kcC"/>
+ </connections>
+ </textField>
</subviews>
</view>
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
@@ -764,15 +783,10 @@
<cells>
<column>
<formCell scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="justified" title="MDR cartridge len:" id="1460">
- <numberFormatter key="formatter" formatterBehavior="custom10_4" positiveFormat="#" negativeFormat="#" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="3" minimumFractionDigits="0" maximumFractionDigits="0" id="1793">
- <real key="roundingIncrement" value="0.0"/>
- <nil key="nilSymbol"/>
+ <numberFormatter key="formatter" formatterBehavior="custom10_4" positiveFormat="#" negativeFormat="#" usesGroupingSeparator="NO" paddingCharacter="*" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="3" decimalSeparator="." groupingSeparator="," currencyDecimalSeparator="." plusSign="+" minusSign="-" notANumberSymbol="NaN" perMillSymbol="‰" percentSymbol="%" exponentSymbol="E" positivePrefix="" positiveSuffix="" negativePrefix="-" negativeSuffix="" id="1793">
<nil key="negativeInfinitySymbol"/>
<nil key="positiveInfinitySymbol"/>
<integer key="minimum" value="0"/>
- <metadata>
- <bool key="localizesFormat" value="YES"/>
- </metadata>
</numberFormatter>
<font key="font" metaFont="system"/>
<font key="titleFont" metaFont="system"/>
@@ -843,7 +857,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="1936" id="1932">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="1933">
<items>
<menuItem title="Item 1" state="on" id="1936"/>
@@ -870,12 +884,7 @@
<rect key="frame" x="429" y="43" width="83" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="fzK-PL-kaX">
- <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#,##0.###" negativeFormat="#,##0.###" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="309" minimumFractionDigits="0" maximumFractionDigits="3" id="L6j-fI-9tx">
- <real key="roundingIncrement" value="0.0"/>
- <metadata>
- <bool key="localizesFormat" value="YES"/>
- </metadata>
- </numberFormatter>
+ <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#,##0.###" negativeFormat="#,##0.###" numberStyle="decimal" paddingCharacter="*" minimumIntegerDigits="1" maximumIntegerDigits="309" maximumFractionDigits="3" decimalSeparator="." groupingSeparator="," currencyDecimalSeparator="." plusSign="+" minusSign="-" notANumberSymbol="NaN" perMillSymbol="‰" percentSymbol="%" exponentSymbol="E" positivePrefix="" positiveSuffix="" negativePrefix="-" negativeSuffix="" id="L6j-fI-9tx"/>
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -911,7 +920,7 @@
<autoresizingMask key="autoresizingMask"/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1517" id="1513">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="1514">
<items>
<menuItem title="Item1" state="on" id="1517"/>
@@ -955,7 +964,7 @@
<autoresizingMask key="autoresizingMask"/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1533" id="1531">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="1532">
<items>
<menuItem title="Item1" state="on" id="1533"/>
@@ -973,7 +982,7 @@
<autoresizingMask key="autoresizingMask"/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1530" id="1526">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="1527">
<items>
<menuItem title="Item1" state="on" id="1530"/>
@@ -1035,7 +1044,7 @@
<autoresizingMask key="autoresizingMask"/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1549" id="1547">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="1548">
<items>
<menuItem title="Item1" state="on" id="1549"/>
@@ -1052,7 +1061,7 @@
<autoresizingMask key="autoresizingMask"/>
<popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1545" id="1542">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="1543">
<items>
<menuItem title="Item1" state="on" id="1545"/>
@@ -1303,14 +1312,14 @@
<font key="font" metaFont="smallSystem"/>
<font key="titleFont" metaFont="smallSystem"/>
<connections>
- <binding destination="533" name="enabled" keyPath="selection.rom0" id="1652">
+ <binding destination="533" name="value" keyPath="selection.rom0" id="1644">
<dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
+ <integer key="NSAllowsEditingMultipleValuesSelection" value="0"/>
</dictionary>
</binding>
- <binding destination="533" name="value" keyPath="selection.rom0" id="1644">
+ <binding destination="533" name="enabled" keyPath="selection.rom0" id="1652">
<dictionary key="options">
- <integer key="NSAllowsEditingMultipleValuesSelection" value="0"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
</dictionary>
</binding>
</connections>
@@ -1319,14 +1328,14 @@
<font key="font" metaFont="smallSystem"/>
<font key="titleFont" metaFont="smallSystem"/>
<connections>
- <binding destination="533" name="enabled" keyPath="selection.rom1" id="1655">
+ <binding destination="533" name="value" keyPath="selection.rom1" id="1646">
<dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
+ <integer key="NSAllowsEditingMultipleValuesSelection" value="0"/>
</dictionary>
</binding>
- <binding destination="533" name="value" keyPath="selection.rom1" id="1646">
+ <binding destination="533" name="enabled" keyPath="selection.rom1" id="1655">
<dictionary key="options">
- <integer key="NSAllowsEditingMultipleValuesSelection" value="0"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
</dictionary>
</binding>
</connections>
@@ -1335,14 +1344,14 @@
<font key="font" metaFont="smallSystem"/>
<font key="titleFont" metaFont="smallSystem"/>
<connections>
- <binding destination="533" name="enabled" keyPath="selection.rom2" id="1657">
+ <binding destination="533" name="value" keyPath="selection.rom2" id="1648">
<dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
+ <integer key="NSAllowsEditingMultipleValuesSelection" value="0"/>
</dictionary>
</binding>
- <binding destination="533" name="value" keyPath="selection.rom2" id="1648">
+ <binding destination="533" name="enabled" keyPath="selection.rom2" id="1657">
<dictionary key="options">
- <integer key="NSAllowsEditingMultipleValuesSelection" value="0"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
</dictionary>
</binding>
</connections>
@@ -1973,4 +1982,4 @@
<image name="Sound" width="32" height="32"/>
<image name="qs2t_icon" width="23" height="23"/>
</resources>
-</document>
\ No newline at end of file
+</document>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-02-15 05:13:21
|
Revision: 774
http://sourceforge.net/p/fuse-for-macosx/code/774
Author: fredm
Date: 2014-02-15 05:13:19 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
Tag release 1.1.1.1
Added Paths:
-----------
tags/Release-1_1_1_1/
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-02-13 12:13:42
|
Revision: 772
http://sourceforge.net/p/fuse-for-macosx/code/772
Author: fredm
Date: 2014-02-13 12:13:39 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
Add support for playing RZXs with no embedded snapshot from the File->Open menu
and from the command line and drag-n-drop.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.m
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2014-02-12 10:16:52 UTC (rev 771)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2014-02-13 12:13:39 UTC (rev 772)
@@ -642,10 +642,7 @@
- (IBAction)rzx_play:(id)sender
{
- char *recording, *snapshot;
- utils_file file;
- libspectrum_error libspec_error; int error;
- libspectrum_snap* snap;
+ char *recording;
if( rzx_playback || rzx_recording ) return;
@@ -655,53 +652,12 @@
if( !recording ) { [[DisplayOpenGLView instance] unpause]; return; }
- rzx = libspectrum_rzx_alloc();
+ [self openFile:recording];
- error = utils_read_file( recording, &file );
- if( error ) {
- free( recording );
- [[DisplayOpenGLView instance] unpause];
- return;
- }
-
- libspec_error = libspectrum_rzx_read( rzx, file.buffer, file.length );
- utils_close_file( &file );
- if( libspec_error != LIBSPECTRUM_ERROR_NONE ) {
- free( recording );
- [[DisplayOpenGLView instance] unpause];
- return;
- }
-
- snap = rzx_get_initial_snapshot();
- if( !snap ) {
- /* We need to load an external snapshot. */
- snapshot = cocoaui_openpanel_get_filename( @"Load Replay Snapshot",
- snapFileTypes );
- if( !snapshot ) {
- free( recording );
- [[DisplayOpenGLView instance] unpause];
- return;
- }
-
- [[DisplayOpenGLView instance] snapOpen:snapshot];
- free( snapshot );
- } else {
- // FIXME: snapless rzxs loaded from the menu would require a snapshot
- // prompt when selecting from the recent files list which would deadlock
- // right now
- [self addRecentSnapshot:recording];
- }
-
- libspectrum_rzx_free( rzx );
-
- [[DisplayOpenGLView instance] rzxStartPlayback:recording];
-
free( recording );
display_refresh_all();
- if( rzx_playback ) ui_menu_activate( UI_MENU_ITEM_RECORDING, 1 );
-
[[DisplayOpenGLView instance] unpause];
}
@@ -1944,9 +1900,56 @@
- (void)openFile:(const char *)filename
{
+ char *snapshot;
+ utils_file file; libspectrum_id_t type;
+ libspectrum_class_t lsclass;
+ libspectrum_error libspec_error; int error;
+ libspectrum_snap* snap;
+
if( !filename ) return;
- [[DisplayOpenGLView instance] openFile:filename];
+ if( utils_read_file( filename, &file ) ) fuse_abort();
+
+ if( libspectrum_identify_file( &type, filename, file.buffer, file.length ) ) {
+ utils_close_file( &file );
+ fuse_abort();
+ }
+
+ if( libspectrum_identify_class( &lsclass, type ) ) fuse_abort();
+
+ if( lsclass != LIBSPECTRUM_CLASS_RECORDING ) {
+ utils_close_file( &file );
+ [[DisplayOpenGLView instance] openFile:filename];
+ return;
+ }
+
+ if( rzx_playback || rzx_recording ) return;
+
+ rzx = libspectrum_rzx_alloc();
+
+ libspec_error = libspectrum_rzx_read( rzx, file.buffer, file.length );
+ utils_close_file( &file );
+ if( libspec_error != LIBSPECTRUM_ERROR_NONE ) return;
+
+ snap = rzx_get_initial_snapshot();
+ if( !snap ) {
+ /* We need to load an external snapshot. */
+ snapshot = cocoaui_openpanel_get_filename( @"Load Replay Snapshot",
+ snapFileTypes );
+ if( !snapshot ) return;
+
+ [[DisplayOpenGLView instance] snapOpen:snapshot];
+
+ free( snapshot );
+ }
+
+ [self addRecentSnapshot:filename];
+
+ libspectrum_rzx_free( rzx );
+
+ [[DisplayOpenGLView instance] rzxStartPlayback:filename];
+
+ if( rzx_playback ) ui_menu_activate( UI_MENU_ITEM_RECORDING, 1 );
}
- (void)openRecent:(id)fileMenu
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-02-12 10:16:57
|
Revision: 771
http://sourceforge.net/p/fuse-for-macosx/code/771
Author: fredm
Date: 2014-02-12 10:16:52 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
Restore compo mode support.
Modified Paths:
--------------
trunk/README
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/config.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/libspectrum.h
trunk/fuse/fusepb/resources/Fuse Help/html/rzx.html
trunk/fuse/fusepb/xibs/Preferences.xib
trunk/libgcrypt/config.h
trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
trunk/libspectrum/config.h
trunk/libspectrum/libspectrum.h
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/libgcrypt/
Property Changed:
----------------
trunk/libgcrypt/libgcrypt.xcodeproj/
Modified: trunk/README
===================================================================
--- trunk/README 2014-02-09 12:27:33 UTC (rev 770)
+++ trunk/README 2014-02-12 10:16:52 UTC (rev 771)
@@ -12,6 +12,9 @@
cd audiofile
xcodebuild -configuration Deployment
cd ..
+cd libgcrypt
+xcodebuild -configuration Deployment
+cd ..
cd FuseGenerator
xcodebuild -configuration Release
cd ..
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2014-02-09 12:27:33 UTC (rev 770)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2014-02-12 10:16:52 UTC (rev 771)
@@ -227,6 +227,8 @@
B6CE3A130CD217C2005ACDC8 /* pentagon1024.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CE3A120CD217C2005ACDC8 /* pentagon1024.c */; };
B6CE7F420B2830A300EB65B3 /* cocoajoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7F3C0B2830A300EB65B3 /* cocoajoystick.c */; };
B6CE7FCE0B28FBD600EB65B3 /* DisplayOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7FCC0B28FBD600EB65B3 /* DisplayOpenGLView.m */; };
+ B6D65C3718A6431500170B64 /* gcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6D65C3618A6431500170B64 /* gcrypt.framework */; };
+ B6D65C3818A645A100170B64 /* gcrypt.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6D65C3618A6431500170B64 /* gcrypt.framework */; };
B6DCBBBF114FA0E700DC9A11 /* bzip2.c in Sources */ = {isa = PBXBuildFile; fileRef = B6DCBB62114FA0E700DC9A11 /* bzip2.c */; };
B6DCBBC4114FA0E700DC9A11 /* creator.c in Sources */ = {isa = PBXBuildFile; fileRef = B6DCBB67114FA0E700DC9A11 /* creator.c */; };
B6DCBBC5114FA0E700DC9A11 /* crypto.c in Sources */ = {isa = PBXBuildFile; fileRef = B6DCBB68114FA0E700DC9A11 /* crypto.c */; };
@@ -366,6 +368,7 @@
dstSubfolderSpec = 10;
files = (
B6FA75C60C1D76A5007F5A10 /* audiofile.framework in CopyFiles */,
+ B6D65C3818A645A100170B64 /* gcrypt.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -630,6 +633,7 @@
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>"; };
+ B6D65C3618A6431500170B64 /* gcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = gcrypt.framework; path = ../../libgcrypt/build/Deployment/gcrypt.framework; sourceTree = "<group>"; };
B6DCBB62114FA0E700DC9A11 /* bzip2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bzip2.c; sourceTree = "<group>"; };
B6DCBB67114FA0E700DC9A11 /* creator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = creator.c; sourceTree = "<group>"; };
B6DCBB68114FA0E700DC9A11 /* crypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypto.c; sourceTree = "<group>"; };
@@ -787,6 +791,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ B6D65C3718A6431500170B64 /* gcrypt.framework in Frameworks */,
B6FA759D0C1D7507007F5A10 /* audiofile.framework in Frameworks */,
B61F469A09121DF100C8096C /* Cocoa.framework in Frameworks */,
B61F469B09121DF100C8096C /* Foundation.framework in Frameworks */,
@@ -824,6 +829,7 @@
isa = PBXGroup;
children = (
B6FA759C0C1D7507007F5A10 /* audiofile.framework */,
+ B6D65C3618A6431500170B64 /* gcrypt.framework */,
);
name = "Linked Frameworks";
sourceTree = "<group>";
@@ -1869,8 +1875,10 @@
"$(HOME)/Library/Frameworks",
../../,
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../audiofile/build/Deployment\"";
+ FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libgcrypt/build/Deployment\"";
GCC_C_LANGUAGE_STANDARD = gnu89;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -1882,6 +1890,7 @@
GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)/gcrypt.framework/Headers",
..,
);
INFOPLIST_FILE = "Info-Fuse.plist";
@@ -1913,8 +1922,10 @@
"$(HOME)/Library/Frameworks",
../../,
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../audiofile/build/Deployment\"";
+ FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libgcrypt/build/Deployment\"";
GCC_C_LANGUAGE_STANDARD = gnu89;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -1924,6 +1935,7 @@
GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)/gcrypt.framework/Headers",
..,
);
INFOPLIST_FILE = "Info-Fuse.plist";
@@ -1954,8 +1966,10 @@
"$(HOME)/Library/Frameworks",
../../,
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../audiofile/build/Deployment\"";
+ FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libgcrypt/build/Deployment\"";
GCC_C_LANGUAGE_STANDARD = gnu89;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -1965,6 +1979,7 @@
GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
+ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)/gcrypt.framework/Headers",
..,
);
INFOPLIST_FILE = "Info-Fuse.plist";
Modified: trunk/fuse/fusepb/config.h
===================================================================
--- trunk/fuse/fusepb/config.h 2014-02-09 12:27:33 UTC (rev 770)
+++ trunk/fuse/fusepb/config.h 2014-02-12 10:16:52 UTC (rev 771)
@@ -40,6 +40,9 @@
/* Define to 1 if you have the <libspectrum.h> header file. */
#define HAVE_LIBSPECTRUM_H 1
+/* Define to 1 if you have the <gcrypt.h> header file. */
+#define HAVE_GCRYPT_H 1
+
/* Define to 1 if you have the `bz2' library (-lbz2). */
#define HAVE_LIBBZ2 1
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2014-02-09 12:27:33 UTC (rev 770)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2014-02-12 10:16:52 UTC (rev 771)
@@ -856,7 +856,6 @@
paused = 0;
ui_statusbar_update( UI_STATUSBAR_ITEM_PAUSED,
UI_STATUSBAR_STATE_INACTIVE );
- timer_estimate_reset();
[[DisplayOpenGLView instance] unpause];
} else {
[[DisplayOpenGLView instance] pause];
Modified: trunk/fuse/fusepb/libspectrum.h
===================================================================
--- trunk/fuse/fusepb/libspectrum.h 2014-02-09 12:27:33 UTC (rev 770)
+++ trunk/fuse/fusepb/libspectrum.h 2014-02-12 10:16:52 UTC (rev 771)
@@ -71,6 +71,7 @@
#define DEPRECATED
#endif /* #ifdef __GNUC__ */
+#include <gcrypt.h>
/* Standard typedefs */
#include <stdint.h>
@@ -1298,7 +1299,8 @@
/* Where in the buffer is the signed data? */
const libspectrum_byte *start; ptrdiff_t length;
-/* Signature parameters not stored as libgcrypt is not present */
+ /* The DSA signature parameters 'r' and 's' */
+ gcry_mpi_t r, s;
} libspectrum_signature;
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/rzx.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/rzx.html 2014-02-09 12:27:33 UTC (rev 770)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/rzx.html 2014-02-12 10:16:52 UTC (rev 771)
@@ -1,62 +1,103 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
- <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-<!-- AppleSegStart="Recording Preferences" -->
- <title>Recording Preferences</title>
-</head>
-<body>
-<font face="Lucida Grande,Helvetica,Arial"><a
- name="Recording Preferences"></a><!-- AppleSegDescription="This section describes the Fuse Recording preferences dialog." --></font>
-<h2><font face="Lucida Grande,Helvetica,Arial"><span
- style="font-style: italic;">Recording</span> preferences</font></h2>
-<p><span class="emphasis"></span><font
- face="Lucida Grande,Helvetica,Arial">Use the Recording pane of Fuse
-preferences to
-configure how Fuse deals with RZX emulator
-input recordings.</font></p>
-<p><span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span></p>
-<table style="text-align: left; width: 100%;" cellpadding="2"
- cellspacing="2">
- <tbody>
- <tr>
- <th style="vertical-align: top;"><font style="font-weight: bold;"
- face="Lucida Grande,Helvetica,Arial">OPTION</font><br>
- </th>
- <th style="vertical-align: top;"><font style="font-weight: bold;"
- face="Lucida Grande,Helvetica,Arial">DESCRIPTION</font><br>
- </th>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Create
-autosaves</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If this option is
-selected, Fuse will add a snapshot into the recording stream every 5
-seconds while creating an RZX file, thus enabling the rollback
-facilities to be used without having to explicitly add snapshots into
-the stream. Older snapshots will be pruned from the stream to keep the
-file size and number of snapshots down: each snapshot up to 15 seconds
-will be kept, then one snapshot every 15 seconds until one minute, then
-one snapshot every minute until 5 minutes, and then one snapshot every
-5 minutes. Note that this "pruning" applies only to automatically
-inserted snapshots: snapshots manually inserted into the stream will
-never be pruned.</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>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Specify whether a
-snapshot should be embedded in an RZX file when recording is
-started from an ex</font><font face="Lucida Grande,Helvetica,Arial">isting
-snapshot.</font></td>
- </tr>
- </tbody>
-</table>
-</body>
+ <head>
+ <meta http-equiv="content-type" content="text/html;
+ charset=ISO-8859-1">
+ <!-- AppleSegStart="Recording Preferences" -->
+ <title>Recording Preferences</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="Recording
+ Preferences"></a><!-- AppleSegDescription="This section describes the Fuse Recording preferences dialog." --></font>
+ <h2><font face="Lucida Grande,Helvetica,Arial"><span
+ style="font-style: italic;">Recording</span> preferences</font></h2>
+ <p><span class="emphasis"></span><font face="Lucida
+ Grande,Helvetica,Arial">Use the Recording pane of Fuse
+ preferences to configure how Fuse deals with RZX emulator input
+ recordings.</font></p>
+ <p><span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span></p>
+ <table style="text-align: left; width: 100%;" cellpadding="2"
+ cellspacing="2">
+ <tbody>
+ <tr>
+ <th style="vertical-align: top;"><font style="font-weight:
+ bold;" face="Lucida Grande,Helvetica,Arial">OPTION</font><br>
+ </th>
+ <th style="vertical-align: top;"><font style="font-weight:
+ bold;" face="Lucida Grande,Helvetica,Arial">DESCRIPTION</font><br>
+ </th>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Emulator
+ recording create autosaves</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will add a snapshot into the recording stream every 5
+ seconds while creating an RZX file, thus enabling the
+ rollback facilities to be used without having to
+ explicitly add snapshots into the stream. Older snapshots
+ will be pruned from the stream to keep the file size and
+ number of snapshots down: each snapshot up to 15 seconds
+ will be kept, then one snapshot every 15 seconds until one
+ minute, then one snapshot every minute until 5 minutes,
+ and then one snapshot every 5 minutes. Note that this
+ "pruning" applies only to automatically inserted
+ snapshots: snapshots manually inserted into the stream
+ will never be pruned.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Emulator
+ recording always embed snapshot</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Specify whether a snapshot should
+ be embedded in an RZX file when recording is started from
+ an ex</font><font face="Lucida Grande,Helvetica,Arial">isting
+
+ snapshot.</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><span class="emphasis"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Emulator recording
+ competition mode</em></font></span></td>
+ <td valign="top"><font face="Lucida Grande,Helvetica,Arial">Any
+
+ input recordings which are started when this option is
+ selected will be made in "competition mode". In essence,
+ this means that Fuse will act just like a real Spectrum
+ would: you can't load snapshots, pause the emulation in
+ any way, change the speed or anything that you couldn't do
+ on the real machine. If any of these things are attempted,
+ or if the emulated Fuse is running more than 5% faster or
+ slower than normal Spectrum speed, then the recording will
+ immediately be stopped.<br>
+ <br>
+ Recordings made with competition mode active will be
+ digitally signed, in theory to "certify" that it was made
+ with the above restrictions in place.<i> However, this
+ procedure is not secure</i><i> (and cannot be made so),
+ so the presence of any signature on an RZX</i><i> file
+ should not be taken as providing proof that it was made
+ with</i><i> competition mode active.</i> This feature is
+ included in Fuse solely as it was one of the requirements
+ for Fuse to be used in an on-line tournament.</font><font
+ face="Lucida Grande,Helvetica,Arial">.</font></td>
+ </tr>
+ <tr>
+ <td valign="top"><span class="emphasis"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Emulator recording
+ competition code</em></font></span></td>
+ <td valign="top"><font face="Lucida Grande,Helvetica,Arial">The
+
+ numeric code entered here will be written into any RZX
+ files made in competition mode. This is another feature
+ for on-line tournaments which can be used to "prove" that
+ the recording was made after a specific code was released.
+ If you're not playing in such a tournament, you can safely
+ ignore this option.</font></td>
+ </tr>
+ </tbody>
+ </table>
+ </body>
</html>
Modified: trunk/fuse/fusepb/xibs/Preferences.xib
===================================================================
--- trunk/fuse/fusepb/xibs/Preferences.xib 2014-02-09 12:27:33 UTC (rev 770)
+++ trunk/fuse/fusepb/xibs/Preferences.xib 2014-02-12 10:16:52 UTC (rev 771)
@@ -1,10424 +1,1976 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1050</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>NSArrayController</string>
- <string>NSBox</string>
- <string>NSButton</string>
- <string>NSButtonCell</string>
- <string>NSCustomObject</string>
- <string>NSCustomView</string>
- <string>NSForm</string>
- <string>NSFormCell</string>
- <string>NSMatrix</string>
- <string>NSMenu</string>
- <string>NSMenuItem</string>
- <string>NSNumberFormatter</string>
- <string>NSObjectController</string>
- <string>NSPopUpButton</string>
- <string>NSPopUpButtonCell</string>
- <string>NSScrollView</string>
- <string>NSScroller</string>
- <string>NSSlider</string>
- <string>NSSliderCell</string>
- <string>NSTableColumn</string>
- <string>NSTableHeaderView</string>
- <string>NSTableView</string>
- <string>NSTextField</string>
- <string>NSTextFieldCell</string>
- <string>NSToolbar</string>
- <string>NSToolbarItem</string>
- <string>NSUserDefaultsController</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="729263285">
- <object class="NSCustomObject" id="363526684">
- <string key="NSClassName">PreferencesController</string>
- </object>
- <object class="NSCustomObject" id="341482335">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="218789108">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="765474969">
- <int key="NSWindowStyleMask">3</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{24, 202}, {627, 403}}</string>
- <int key="NSWTFlags">1886912512</int>
- <string key="NSWindowTitle">Preferences</string>
- <string key="NSWindowClass">NSPanel</string>
- <object class="NSToolbar" key="NSViewClass" id="281460241">
- <object class="NSMutableString" key="NSToolbarIdentifier">
- <characters key="NS.bytes">2B5EC7EB-5A6C-4F96-8405-91E5B21A019C</characters>
- </object>
- <nil key="NSToolbarDelegate"/>
- <bool key="NSToolbarPrefersToBeShown">YES</bool>
- <bool key="NSToolbarShowsBaselineSeparator">NO</bool>
- <bool key="NSToolbarAllowsUserCustomization">NO</bool>
- <bool key="NSToolbarAutosavesConfiguration">YES</bool>
- <int key="NSToolbarDisplayMode">1</int>
- <int key="NSToolbarSizeMode">1</int>
- <dictionary class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
- <object class="NSToolbarItem" key="1D3C684F-4B0A-4828-ADF3-E4106D08C1CD" id="761998648">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">1D3C684F-4B0A-4828-ADF3-E4106D08C1CD</characters>
- </object>
- <string key="NSToolbarItemLabel">Sound</string>
- <string key="NSToolbarItemPaletteLabel">Sound</string>
- <string key="NSToolbarItemToolTip"/>
- <nil key="NSToolbarItemView"/>
- <object class="NSCustomResource" key="NSToolbarItemImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">Sound</string>
- </object>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{0, 0}</string>
- <string key="NSToolbarItemMaxSize">{0, 0}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">NO</bool>
- <int key="NSToolbarItemTag">1</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" key="2C4BF74A-9900-4A0E-A2FC-50ADDA64B166" id="141636598">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">2C4BF74A-9900-4A0E-A2FC-50ADDA64B166</characters>
- </object>
- <string key="NSToolbarItemLabel">Video</string>
- <string key="NSToolbarItemPaletteLabel">Video</string>
- <string key="NSToolbarItemToolTip"/>
- <nil key="NSToolbarItemView"/>
- <object class="NSCustomResource" key="NSToolbarItemImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">Graphics_Filter</string>
- </object>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{0, 0}</string>
- <string key="NSToolbarItemMaxSize">{0, 0}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">NO</bool>
- <int key="NSToolbarItemTag">7</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" key="4F5A5E26-7A02-464D-80D8-F49DECE3E69B" id="160350779">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">4F5A5E26-7A02-464D-80D8-F49DECE3E69B</characters>
- </object>
- <string key="NSToolbarItemLabel">Peripherals</string>
- <string key="NSToolbarItemPaletteLabel">Peripherals</string>
- <string key="NSToolbarItemToolTip"/>
- <nil key="NSToolbarItemView"/>
- <object class="NSCustomResource" key="NSToolbarItemImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">Peripherals</string>
- </object>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{0, 0}</string>
- <string key="NSToolbarItemMaxSize">{0, 0}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">NO</bool>
- <int key="NSToolbarItemTag">2</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" key="75749378-6992-4894-9B4C-43B464285D3E" id="924265735">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">75749378-6992-4894-9B4C-43B464285D3E</characters>
- </object>
- <string key="NSToolbarItemLabel">General</string>
- <string key="NSToolbarItemPaletteLabel">General</string>
- <string key="NSToolbarItemToolTip"/>
- <nil key="NSToolbarItemView"/>
- <object class="NSCustomResource" key="NSToolbarItemImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSPreferencesGeneral</string>
- </object>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{0, 0}</string>
- <string key="NSToolbarItemMaxSize">{0, 0}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">NO</bool>
- <int key="NSToolbarItemTag">0</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" key="BE697B6E-7F18-4D78-9F89-364AF4806055" id="490785676">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">BE697B6E-7F18-4D78-9F89-364AF4806055</characters>
- </object>
- <string key="NSToolbarItemLabel">Recording</string>
- <string key="NSToolbarItemPaletteLabel">Recording</string>
- <string key="NSToolbarItemToolTip"/>
- <nil key="NSToolbarItemView"/>
- <object class="NSCustomResource" key="NSToolbarItemImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">RZX</string>
- </object>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{0, 0}</string>
- <string key="NSToolbarItemMaxSize">{0, 0}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">NO</bool>
- <int key="NSToolbarItemTag">3</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" key="D64DF5CD-B687-4DAB-8B9B-CB7BCB98DECE" id="367507624">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">D64DF5CD-B687-4DAB-8B9B-CB7BCB98DECE</characters>
- </object>
- <string key="NSToolbarItemLabel">ROM</string>
- <string key="NSToolbarItemPaletteLabel">ROM</string>
- <string key="NSToolbarItemToolTip"/>
- <nil key="NSToolbarItemView"/>
- <object class="NSCustomResource" key="NSToolbarItemImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">Select_ROMs</string>
- </object>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{0, 0}</string>
- <string key="NSToolbarItemMaxSize">{0, 0}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">NO</bool>
- <int key="NSToolbarItemTag">5</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" key="F897F259-A5D7-4274-A9C8-9D7D7C86199E" id="156451834">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">F897F259-A5D7-4274-A9C8-9D7D7C86199E</characters>
- </object>
- <string key="NSToolbarItemLabel">Inputs</string>
- <string key="NSToolbarItemPaletteLabel">Inputs</string>
- <string key="NSToolbarItemToolTip"/>
- <nil key="NSToolbarItemView"/>
- <object class="NSCustomResource" key="NSToolbarItemImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">qs2t_icon</string>
- </object>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{0, 0}</string>
- <string key="NSToolbarItemMaxSize">{0, 0}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">NO</bool>
- <int key="NSToolbarItemTag">4</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- <object class="NSToolbarItem" key="FD445694-259E-4F31-A40E-117D01F46BB6" id="943816128">
- <object class="NSMutableString" key="NSToolbarItemIdentifier">
- <characters key="NS.bytes">FD445694-259E-4F31-A40E-117D01F46BB6</characters>
- </object>
- <string key="NSToolbarItemLabel">Machine</string>
- <string key="NSToolbarItemPaletteLabel">Machine</string>
- <string key="NSToolbarItemToolTip"/>
- <nil key="NSToolbarItemView"/>
- <object class="NSCustomResource" key="NSToolbarItemImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">Machine</string>
- </object>
- <nil key="NSToolbarItemTarget"/>
- <nil key="NSToolbarItemAction"/>
- <string key="NSToolbarItemMinSize">{0, 0}</string>
- <string key="NSToolbarItemMaxSize">{0, 0}</string>
- <bool key="NSToolbarItemEnabled">YES</bool>
- <bool key="NSToolbarItemAutovalidates">NO</bool>
- <int key="NSToolbarItemTag">6</int>
- <bool key="NSToolbarIsUserRemovable">YES</bool>
- <int key="NSToolbarItemVisibilityPriority">0</int>
- </object>
- </dictionary>
- <array key="NSToolbarIBAllowedItems">
- <reference ref="924265735"/>
- <reference ref="761998648"/>
- <reference ref="160350779"/>
- <reference ref="490785676"/>
- <reference ref="156451834"/>
- <reference ref="367507624"/>
- <reference ref="943816128"/>
- <reference ref="141636598"/>
- </array>
- <array key="NSToolbarIBDefaultItems">
- <reference ref="924265735"/>
- <reference ref="761998648"/>
- <reference ref="160350779"/>
- <reference ref="490785676"/>
- <reference ref="156451834"/>
- <reference ref="367507624"/>
- <reference ref="943816128"/>
- <reference ref="141636598"/>
- </array>
- <array key="NSToolbarIBSelectableItems" id="0"/>
- </object>
- <nil key="NSUserInterfaceItemIdentifier"/>
- <string key="NSWindowContentMinSize">{213, 107}</string>
- <object class="NSView" key="NSWindowView" id="41054612">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{627, 403}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
- </object>
- <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
- <string key="NSMinSize">{213, 184}</string>
- <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
- <string key="NSFrameAutosaveName"/>
- <bool key="NSWindowIsRestorable">YES</bool>
- </object>
- <object class="NSCustomView" id="869768206">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">268</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSButton" id="382408068">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{119, 49}, {123, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="934579195"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="508894506">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Confirm actions</string>
- <object class="NSFont" key="NSSupport" id="447006373">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
- </object>
- <reference key="NSControlView" ref="382408068"/>
- <int key="NSButtonFlags">1211912448</int>
- <int key="NSButtonFlags2">2</int>
- <object class="NSButtonImageSource" key="NSAlternateImage" id="529831564">
- <string key="NSImageName">NSSwitch</string>
- </object>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="691708568">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{293, 169}, {131, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="281223997"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="565379702">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Issue 2 keyboard</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="691708568"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="236482654">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{119, 69}, {168, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="382408068"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="1036853429">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Show tape/disk status</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="236482654"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="876021687">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{119, 89}, {165, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="706432924"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="288530032">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Auto-load media</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="876021687"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="632257383">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{293, 109}, {105, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="876021687"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="336105546">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Use .slt traps</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="632257383"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="776295189">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{119, 169}, {113, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="691708568"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="921014375">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Use tape traps</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="776295189"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="706432924">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{293, 89}, {214, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="236482654"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="71439217">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Set joysticks on snapshot load</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="706432924"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="173497110">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{293, 129}, {151, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="695941014"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="279939766">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Allow writes to ROM</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="173497110"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSForm" id="418457192">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{121, 193}, {279, 52}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="776295189"/>
- <bool key="NSEnabled">YES</bool>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <int key="NSNumRows">2</int>
- <int key="NSNumCols">1</int>
- <array class="NSMutableArray" key="NSCells">
- <object class="NSFormCell" id="494277899">
- <int key="NSCellFlags">-1804599231</int>
- <int key="NSCellFlags2">-1941961728</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="447006373"/>
- <object class="NSNumberFormatter" key="NSFormatter" id="815687010">
- <dictionary class="NSMutableDictionary" key="NS.attributes">
- <integer value="1" key="allowsFloats"/>
- <string key="decimalSeparator">.</string>
- <integer value="1000" key="formatterBehavior"/>
- <string key="groupingSeparator">,</string>
- <integer value="1" key="minimum"/>
- <integer value="1" key="multiplier"/>
- <string key="negativeFormat">-#,##0.00</string>
- <integer value="3" key="numberStyle"/>
- <string key="positiveFormat">#,##0%</string>
- <boolean value="YES" key="usesGroupingSeparator"/>
- </dictionary>
- <string key="NS.positiveformat">#,##0%</string>
- <string key="NS.negativeformat">-#,##0.00</string>
- <nil key="NS.positiveattrs"/>
- <nil key="NS.negativeattrs"/>
- <object class="NSAttributedString" key="NS.zero">
- <string key="NSString">0</string>
- <dictionary key="NSAttributes" id="769847889"/>
- </object>
- <object class="NSAttributedString" key="NS.nil">
- <string key="NSString"/>
- </object>
- <object class="NSAttributedString" key="NS.nan">
- <string key="NSString">NaN</string>
- <reference key="NSAttributes" ref="769847889"/>
- </object>
- <integer value="1" key="NS.min"/>
- <object class="NSDecimalNumberPlaceholder" key="NS.max" id="648108068">
- <int key="NS.exponent">0</int>
- <int key="NS.length">0</int>
- <bool key="NS.negative">YES</bool>
- <bool key="NS.compact">NO</bool>
- <int key="NS.mantissa.bo">1</int>
- <bytes key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes>
- </object>
- <nil key="NS.rounding"/>
- <string key="NS.decimal">.</string>
- <string key="NS.thousand">,</string>
- <bool key="NS.hasthousands">YES</bool>
- <bool key="NS.localized">YES</bool>
- <bool key="NS.allowsfloats">YES</bool>
- </object>
- <reference key="NSControlView" ref="418457192"/>
- <double key="NSTitleWidth">161</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">Emulation speed:</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="418457192"/>
- </object>
- </object>
- <object class="NSFormCell" id="319020855">
- <int key="NSCellFlags">-1804599231</int>
- <int key="NSCellFlags2">205521920</int>
- <reference key="NSSupport" ref="447006373"/>
- <object class="NSNumberFormatter" key="NSFormatter" id="657991658">
- <dictionary class="NSMutableDictionary" key="NS.attributes">
- <integer value="1" key="allowsFloats"/>
- <integer value="1040" key="formatterBehavior"/>
- <object class="NSLocale" key="locale" id="514081757">
- <string key="NS.identifier"/>
- </object>
- <real value="50" key="maximum"/>
- <integer value="1" key="minimum"/>
- <integer value="0" key="numberStyle"/>
- </dictionary>
- <string key="NS.positiveformat">#</string>
- <string key="NS.negativeformat">#</string>
- <nil key="NS.positiveattrs"/>
- <nil key="NS.negativeattrs"/>
- <nil key="NS.zero"/>
- <nil key="NS.nil"/>
- <object class="NSAttributedString" key="NS.nan">
- <string key="NSString">NaN</string>
- <reference key="NSAttributes" ref="769847889"/>
- </object>
- <integer value="1" key="NS.min"/>
- <real value="50" key="NS.max"/>
- <object class="NSDecimalNumberHandler" key="NS.rounding">
- <int key="NS.roundingmode">3</int>
- <bool key="NS.raise.overflow">YES</bool>
- <bool key="NS.raise.underflow">YES</bool>
- <bool key="NS.raise.dividebyzero">YES</bool>
- </object>
- <string key="NS.decimal">.</string>
- <string key="NS.thousand">,</string>
- <bool key="NS.hasthousands">NO</bool>
- <bool key="NS.localized">NO</bool>
- <bool key="NS.allowsfloats">YES</bool>
- </object>
- <reference key="NSControlView" ref="418457192"/>
- <int key="NSTag">1</int>
- <double key="NSTitleWidth">161</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">Screen refresh rate (1:n):</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="418457192"/>
- </object>
- </object>
- </array>
- <string key="NSCellSize">{279, 22}</string>
- <string key="NSIntercellSpacing">{1, 8}</string>
- <int key="NSMatrixFlags">67633152</int>
- <string key="NSCellClass">NSActionCell</string>
- <object class="NSFormCell" key="NSProtoCell" id="912393328">
- <int key="NSCellFlags">342884416</int>
- <int key="NSCellFlags2">205521920</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="447006373"/>
- <double key="NSTitleWidth">161</double>
- <object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">67108864</int>
- <string key="NSContents">Field:</string>
- <reference key="NSSupport" ref="447006373"/>
- </object>
- </object>
- <int key="NSSelectedRow">-1</int>
- <int key="NSSelectedCol">-1</int>
- <object class="NSColor" key="NSBackgroundColor" id="519317542">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor" id="429360493">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSCellBackgroundColor" id="70288484">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <reference key="NSFont" ref="447006373"/>
- </object>
- <object class="NSButton" id="281223997">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{119, 149}, {131, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="384664460"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="787494350">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Fast tape loading</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="281223997"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="695941014">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{119, 109}, {145, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="632257383"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="539932935">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Detect tape loaders</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="695941014"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="759805714">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{119, 129}, {170, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="173497110"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="153178233">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Accelerate tape loaders</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="759805714"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="384664460">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{293, 149}, {151, 18}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="759805714"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="696843910">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Late CPU timings</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="384664460"/>
- <int key="NSButtonFlags">1211912448</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>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSButton" id="934579195">
- <reference key="NSNextResponder" ref="869768206"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{461, 12}, {152, 32}}</string>
- <reference key="NSSuperview" ref="869768206"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="305612276">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Reset Preferences</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="934579195"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="447006373"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- </array>
- <string key="NSFrameSize">{627, 265}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="418457192"/>
- <string key="NSClassName">NSView</string>
- </object>
- <object class="NSCustomView" id="803517542">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">268</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSSlider" id="519106344">
- <reference key="NSNextResponder" ref="803517542"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{360, 126}, {115, 25}}</string>
- <reference key="NSSuperview" ref="803517542"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="292110812"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSSliderCell" key="NSCell" id="458739798">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <object class="NSMutableString" key="NSContents">
- <characters key="NS.bytes"/>
- </object>
- <object class="NSFont" key="NSSupport" id="333640230">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">12</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="519106344"/>
- <double key="NSMaxValue">100</double>
- <double key="NSMinValue">0.0</double>
- <double key="NSValue">100</double>
- <double key="NSAltIncValue">0.0</double>
- <int key="NSNumberOfTickMarks">10</int>
- <int key="NSTickMarkPosition">0</int>
- <bool key="NSAllowsTickMarkValuesOnly">YES</bool>
- <bool key="NSVertical">NO</bool>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="516188975">
- <reference key="NSNextResponder" ref="803517542"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{232, 126}, {125, 24}}</string>
- <reference key="NSSuperview" ref="803517542"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="519106344"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="864030352">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">SpecDrum Volume</string>
- <reference key="NSSupport" ref="447006373"/>
- <reference key="NSControlView" ref="516188975"/>
- <reference key="NSBackgroundColor" ref="519317542"/>
- <object class="NSColor" key="NSTextColor" id="696958365">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor" id="399634204">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="210111604">
- <reference key="NSNextResponder" ref="803517542"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{323, 61}, {153, 26}}</string>
- <reference key="NSSuperview" ref="803517542"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="441962883"/>
- <string key="NSReuseIdentifierKey">_NS:9</string>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="322746189">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">2048</int>
- <reference key="NSSupport" ref="447006373"/>
- <string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="210111604"/>
- <int key="NSButtonFlags">109199360</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="444900169">
- <reference key="NSMenu" ref="367979483"/>
- <string key="NSTitle">Item 1</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="27507601">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="460218791">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="322746189"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="367979483">
- <string key="NSTitle">OtherViews</string>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="444900169"/>
- <object class="NSMenuItem" id="923430656">
- <reference key="NSMenu" ref="367979483"/>
- <string key="NSTitle">Item 2</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="27507601"/>
- <reference key="NSMixedImage" ref="460218791"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="322746189"/>
- </object>
- <object class="NSMenuItem" id="641029084">
- <reference key="NSMenu" ref="367979483"/>
- <string key="NSTitle">Item 3</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">214748...
[truncated message content] |
|
From: <fr...@us...> - 2014-02-09 12:27:36
|
Revision: 770
http://sourceforge.net/p/fuse-for-macosx/code/770
Author: fredm
Date: 2014-02-09 12:27:33 +0000 (Sun, 09 Feb 2014)
Log Message:
-----------
Need to unconditionally pause and unpause as we call pause when the emulator
isn't running sometimes.
Modified Paths:
--------------
trunk/fuse/fusepb/models/Emulator.m
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2014-02-04 12:00:34 UTC (rev 769)
+++ trunk/fuse/fusepb/models/Emulator.m 2014-02-09 12:27:33 UTC (rev 770)
@@ -254,10 +254,10 @@
-(void) pause
{
+ fuse_emulation_pause();
if( isEmulating ) {
if( timer != nil ) {
[self stopEmulationTimer];
- fuse_emulation_pause();
}
isEmulating = NO;
}
@@ -265,10 +265,10 @@
-(void) unpause
{
+ fuse_emulation_unpause();
if( !isEmulating ) {
isEmulating = YES;
[self startEmulationTimer];
- fuse_emulation_unpause();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-02-04 12:00:38
|
Revision: 769
http://sourceforge.net/p/fuse-for-macosx/code/769
Author: fredm
Date: 2014-02-04 12:00:34 +0000 (Tue, 04 Feb 2014)
Log Message:
-----------
Restore support for playing RZXs with no embedded snapshot.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
trunk/fuse/rzx.h
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2013-12-25 23:59:06 UTC (rev 768)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2014-02-04 12:00:34 UTC (rev 769)
@@ -642,7 +642,10 @@
- (IBAction)rzx_play:(id)sender
{
- char *recording;
+ char *recording, *snapshot;
+ utils_file file;
+ libspectrum_error libspec_error; int error;
+ libspectrum_snap* snap;
if( rzx_playback || rzx_recording ) return;
@@ -652,8 +655,45 @@
if( !recording ) { [[DisplayOpenGLView instance] unpause]; return; }
- [self addRecentSnapshot:recording];
+ rzx = libspectrum_rzx_alloc();
+ error = utils_read_file( recording, &file );
+ if( error ) {
+ free( recording );
+ [[DisplayOpenGLView instance] unpause];
+ return;
+ }
+
+ libspec_error = libspectrum_rzx_read( rzx, file.buffer, file.length );
+ utils_close_file( &file );
+ if( libspec_error != LIBSPECTRUM_ERROR_NONE ) {
+ free( recording );
+ [[DisplayOpenGLView instance] unpause];
+ return;
+ }
+
+ snap = rzx_get_initial_snapshot();
+ if( !snap ) {
+ /* We need to load an external snapshot. */
+ snapshot = cocoaui_openpanel_get_filename( @"Load Replay Snapshot",
+ snapFileTypes );
+ if( !snapshot ) {
+ free( recording );
+ [[DisplayOpenGLView instance] unpause];
+ return;
+ }
+
+ [[DisplayOpenGLView instance] snapOpen:snapshot];
+ free( snapshot );
+ } else {
+ // FIXME: snapless rzxs loaded from the menu would require a snapshot
+ // prompt when selecting from the recent files list which would deadlock
+ // right now
+ [self addRecentSnapshot:recording];
+ }
+
+ libspectrum_rzx_free( rzx );
+
[[DisplayOpenGLView instance] rzxStartPlayback:recording];
free( recording );
Modified: trunk/fuse/fusepb/models/Emulator.h
===================================================================
--- trunk/fuse/fusepb/models/Emulator.h 2013-12-25 23:59:06 UTC (rev 768)
+++ trunk/fuse/fusepb/models/Emulator.h 2014-02-04 12:00:34 UTC (rev 769)
@@ -65,6 +65,7 @@
-(id) init;
-(void) openFile:(const char *)filename;
+-(void) snapOpen:(const char *)filename;
-(void) tapeOpen:(const char *)filename;
-(void) tapeWrite:(const char *)filename;
-(void) tapeTogglePlay;
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2013-12-25 23:59:06 UTC (rev 768)
+++ trunk/fuse/fusepb/models/Emulator.m 2014-02-04 12:00:34 UTC (rev 769)
@@ -199,6 +199,13 @@
display_refresh_all();
}
+-(void) snapOpen:(const char *)filename
+{
+ snapshot_read( filename );
+
+ display_refresh_all();
+}
+
-(void) tapeOpen:(const char *)filename
{
tape_open( filename, 0 );
@@ -513,7 +520,7 @@
-(int) rzxStartPlayback:(const char *)filename
{
- return rzx_start_playback( filename, 1 );
+ return rzx_start_playback( filename, 0 );
}
-(void) rzxInsertSnap
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.h 2013-12-25 23:59:06 UTC (rev 768)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.h 2014-02-04 12:00:34 UTC (rev 769)
@@ -100,6 +100,7 @@
-(void) setNeedsDisplayYes;
-(void) openFile:(const char *)filename;
+-(void) snapOpen:(const char *)filename;
-(void) tapeOpen:(const char *)filename;
-(void) tapeWrite:(const char *)filename;
-(void) tapeTogglePlay;
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2013-12-25 23:59:06 UTC (rev 768)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2014-02-04 12:00:34 UTC (rev 769)
@@ -661,6 +661,11 @@
[proxy_emulator openFile:filename];
}
+-(void) snapOpen:(const char *)filename
+{
+ [proxy_emulator snapOpen:filename];
+}
+
-(void) tapeOpen:(const char *)filename
{
[proxy_emulator tapeOpen:filename];
Modified: trunk/fuse/rzx.h
===================================================================
--- trunk/fuse/rzx.h 2013-12-25 23:59:06 UTC (rev 768)
+++ trunk/fuse/rzx.h 2014-02-04 12:00:34 UTC (rev 769)
@@ -84,4 +84,6 @@
GSList* rzx_get_rollback_list( libspectrum_rzx *rzx );
+libspectrum_snap* rzx_get_initial_snapshot( void );
+
#endif /* #ifndef FUSE_RZX_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-12-25 23:59:09
|
Revision: 768
http://sourceforge.net/p/fuse-for-macosx/code/768
Author: fredm
Date: 2013-12-25 23:59:06 +0000 (Wed, 25 Dec 2013)
Log Message:
-----------
Xcode 5 gives OS X SDK 10.8 as minimal option so switch to that and as 10.7 and
newer require x86_64 so stop building 32 bit support as it can't be used.
Modified Paths:
--------------
trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/audiofile/audiofile.xcodeproj/project.pbxproj
Modified: trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2013-12-25 12:41:05 UTC (rev 767)
+++ trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2013-12-25 23:59:06 UTC (rev 768)
@@ -480,7 +480,6 @@
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
INFOPLIST_FILE = Info.plist;
@@ -490,7 +489,6 @@
"-lz",
);
PRODUCT_NAME = FuseGenerator;
- SDKROOT = macosx10.7;
VALID_ARCHS = "ppc x86_64 i386";
WRAPPER_EXTENSION = qlgenerator;
ZERO_LINK = YES;
@@ -502,7 +500,6 @@
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
@@ -516,7 +513,6 @@
"-lz",
);
PRODUCT_NAME = FuseGenerator;
- SDKROOT = macosx10.7;
VALID_ARCHS = "ppc x86_64 i386";
WARNING_CFLAGS = (
"-Wmost",
@@ -530,8 +526,7 @@
2CA326230896AD4900168862 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
- ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+ ARCHS = "$(ARCHS_STANDARD)";
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
@@ -543,14 +538,14 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.8;
};
name = Debug;
};
2CA326240896AD4900168862 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD)";
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
@@ -562,7 +557,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.8;
};
name = Release;
};
Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2013-12-25 12:41:05 UTC (rev 767)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2013-12-25 23:59:06 UTC (rev 768)
@@ -338,7 +338,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0460;
+ LastUpgradeCheck = 0500;
};
buildConfigurationList = B6B0E30008CC65D5001D8411 /* Build configuration list for PBXProject "FuseImporter" */;
compatibilityVersion = "Xcode 3.2";
@@ -482,7 +482,6 @@
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = FuseImporter;
- SDKROOT = macosx10.7;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@@ -516,7 +515,6 @@
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = FuseImporter;
- SDKROOT = macosx10.7;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@@ -549,7 +547,6 @@
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = FuseImporter;
- SDKROOT = macosx10.7;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@@ -564,55 +561,67 @@
B6B0E30108CC65D5001D8411 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ SDKROOT = macosx10.8;
};
name = Development;
};
B6B0E30208CC65D5001D8411 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ SDKROOT = macosx10.8;
};
name = Deployment;
};
B6B0E30308CC65D5001D8411 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ SDKROOT = macosx10.8;
};
name = Default;
};
Modified: trunk/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2013-12-25 12:41:05 UTC (rev 767)
+++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2013-12-25 23:59:06 UTC (rev 768)
@@ -441,8 +441,10 @@
B62395BD0C1CF586003B8E87 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1.2;
FRAMEWORK_VERSION = 0.2.6;
@@ -470,7 +472,7 @@
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = framework;
@@ -481,8 +483,10 @@
B62395BE0C1CF586003B8E87 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1.2;
FRAMEWORK_VERSION = 0.2.6;
@@ -509,7 +513,7 @@
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = framework;
@@ -520,7 +524,9 @@
B62395BF0C1CF586003B8E87 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1.2;
FRAMEWORK_VERSION = 0.2.6;
@@ -547,7 +553,7 @@
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = framework;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-12-25 12:41:07
|
Revision: 767
http://sourceforge.net/p/fuse-for-macosx/code/767
Author: fredm
Date: 2013-12-25 12:41:05 +0000 (Wed, 25 Dec 2013)
Log Message:
-----------
Make sure we lock the view if we are going to access the OpenGL context as the
displaylink callback is not on the main thread where resizing-related drawing
will occur, also cover the screen texture swap. Expect to resolve [#14].
Modified Paths:
--------------
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2013-12-25 12:38:34 UTC (rev 766)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2013-12-25 12:41:05 UTC (rev 767)
@@ -1295,7 +1295,10 @@
long rowbytes = size.width * 4;
rowbytes = (rowbytes + 3)& ~3; // ctx rowbytes is always multiple of 4, per glGrab
unsigned char* bitmap = malloc(rowbytes * size.height);
-
+
+ // Stuffing around with OpenGL context - lock view while we do
+ [view_lock lock];
+
[[NSOpenGLContext currentContext] makeCurrentContext];
glFinish(); // finish any pending OpenGL commands
glPushAttrib(GL_ALL_ATTRIB_BITS); // reset all properties that affect glReadPixels, in case app was using them
@@ -1342,6 +1345,8 @@
glReadPixels(0, 0, size.width, size.height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, bitmap);
glPopAttrib();
+ [view_lock unlock];
+
[self lockFocus];
// create a CGImageRef from the memory block
CGDataProviderDirectCallbacks gProviderCallbacks = { 0, get_byte_pointer, NULL, NULL, NULL };
@@ -1409,11 +1414,17 @@
if( buffered_screen.dirty->count > 0 ) {
+ // Make sure we lock the view if we are going to update the textures so
+ // there is no concurrent access to the OpenGL context as the displaylink
+ // callback is not on the main thread where resizing-related drawing will
+ // occur, also cover the screen texture swap
+ [view_lock lock];
+
if (screenTex[currentScreenTex].dirty)
pig_dirty_copy( &workdirty, screenTex[currentScreenTex].dirty );
-
+
currentScreenTex = !currentScreenTex;
-
+
pig_dirty_copy( &screenTex[currentScreenTex].dirty, buffered_screen.dirty );
if( workdirty )
@@ -1429,7 +1440,7 @@
buffered_screen.dirty->count = 0;
pig_dirty_close( workdirty );
-
+
[[self openGLContext] makeCurrentContext];
/* Bind, update and draw new image */
@@ -1441,6 +1452,7 @@
GL_UNSIGNED_SHORT_1_5_5_5_REV,
screenTex[currentScreenTex].pixels );
+ [view_lock unlock];
}
[buffered_screen_lock unlock];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-12-25 12:38:37
|
Revision: 766
http://sourceforge.net/p/fuse-for-macosx/code/766
Author: fredm
Date: 2013-12-25 12:38:34 +0000 (Wed, 25 Dec 2013)
Log Message:
-----------
While we are at it, 10.7 and newer require x86_64 so stop building 32 bit
support as it can't be used.
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2013-12-25 12:30:08 UTC (rev 765)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2013-12-25 12:38:34 UTC (rev 766)
@@ -1546,7 +1546,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0460;
+ LastUpgradeCheck = 0500;
};
buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */;
compatibilityVersion = "Xcode 3.2";
@@ -1988,7 +1988,6 @@
B63319B4086803BA00732AA3 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_AUTO_VECTORIZATION = NO;
@@ -2007,7 +2006,6 @@
B63319B5086803BA00732AA3 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
@@ -2027,7 +2025,6 @@
B63319B6086803BA00732AA3 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_AUTO_VECTORIZATION = NO;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-12-25 12:30:11
|
Revision: 765
http://sourceforge.net/p/fuse-for-macosx/code/765
Author: fredm
Date: 2013-12-25 12:30:08 +0000 (Wed, 25 Dec 2013)
Log Message:
-----------
Xcode 5 gives OS X SDK 10.8 as minimal option so switch to that.
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2013-06-03 10:45:19 UTC (rev 764)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2013-12-25 12:30:08 UTC (rev 765)
@@ -1894,7 +1894,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1936,7 +1936,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1977,7 +1977,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1996,8 +1996,8 @@
GCC_DYNAMIC_NO_PIC = YES;
GCC_VERSION = "";
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ SDKROOT = macosx10.8;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = YES;
@@ -2016,8 +2016,8 @@
GCC_DYNAMIC_NO_PIC = YES;
GCC_VERSION = "";
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ SDKROOT = macosx10.8;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
@@ -2035,8 +2035,8 @@
GCC_DYNAMIC_NO_PIC = YES;
GCC_VERSION = "";
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ SDKROOT = macosx10.8;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-06-03 10:45:22
|
Revision: 764
http://sourceforge.net/p/fuse-for-macosx/code/764
Author: fredm
Date: 2013-06-03 10:45:19 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
Tag v1.1.1 release.
Added Paths:
-----------
tags/Release-1_1_1/
Index: tags/Release-1_1_1
===================================================================
--- branches/Release-1_1_0 2013-06-01 07:15:01 UTC (rev 763)
+++ tags/Release-1_1_1 2013-06-03 10:45:19 UTC (rev 764)
Property changes on: tags/Release-1_1_1
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+staging
+SDL.framework
Added: svn:mergeinfo
## -0,0 +1 ##
+/trunk:762
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-06-01 07:15:04
|
Revision: 763
http://sourceforge.net/p/fuse-for-macosx/code/763
Author: fredm
Date: 2013-06-01 07:15:01 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Merge r762 from trunk.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/762
Modified Paths:
--------------
branches/Release-1_1_0/fuse/Makefile.am
branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/general.html
branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/joysticks.html
branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/spectranet.html
branches/Release-1_1_0/fuse/hacking/ChangeLog
branches/Release-1_1_0/fuse/man/fuse.1
branches/Release-1_1_0/fuse/pokefinder/pokemem.c
branches/Release-1_1_0/fuse/ui/win32/installer/fuse.nsi.in
Property Changed:
----------------
branches/Release-1_1_0/
branches/Release-1_1_0/fuse/
Index: branches/Release-1_1_0
===================================================================
--- branches/Release-1_1_0 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0 2013-06-01 07:15:01 UTC (rev 763)
Property changes on: branches/Release-1_1_0
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1 ##
+/trunk:762
\ No newline at end of property
Index: branches/Release-1_1_0/fuse
===================================================================
--- branches/Release-1_1_0/fuse 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse 2013-06-01 07:15:01 UTC (rev 763)
Property changes on: branches/Release-1_1_0/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,6 ##
+/trunk/fuse:762
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-756
+/vendor/fuse-emulator/current/fuse:530-761
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: branches/Release-1_1_0/fuse/Makefile.am
===================================================================
--- branches/Release-1_1_0/fuse/Makefile.am 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/Makefile.am 2013-06-01 07:15:01 UTC (rev 763)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4980 2013-05-21 12:37:51Z fredm $
+## $Id: Makefile.am 5003 2013-05-26 16:24:03Z sbaldovi $
## 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
@@ -244,7 +244,7 @@
cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \
cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR)
# Get text files
- for file in AUTHORS COPYING README; \
+ for file in AUTHORS ChangeLog COPYING README; \
do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \
done
# Get manuals
Modified: branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/general.html
===================================================================
--- branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/general.html 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/general.html 2013-06-01 07:15:01 UTC (rev 763)
@@ -1,207 +1,199 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
- <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-<!-- AppleSegStart="General Preferences" -->
- <title>General Preferences</title>
-</head>
-<body>
-<font face="Lucida Grande,Helvetica,Arial"><a name="General Preferences"></a><!-- AppleSegDescription="This section describes the Fuse general preferences dialog." --></font>
-<h2><font face="Lucida Grande,Helvetica,Arial"><span
- style="font-style: italic;">General</span> preferences</font></h2>
-<p><font face="Lucida Grande,Helvetica,Arial">The General pane of Fuse
-preferences lets you configure miscellaneous Fuse options.<br>
-</font></p>
-<table style="text-align: left; width: 100%;" cellpadding="2"
- cellspacing="2">
- <tbody>
- <tr>
- <th style="vertical-align: top;"><font style="font-weight: bold;"
- face="Lucida Grande,Helvetica,Arial">OPTION</font><br>
- </th>
- <th style="vertical-align: top;"><font style="font-weight: bold;"
- face="Lucida Grande,Helvetica,Arial">DESCRIPTION</font><br>
- </th>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Emulation
-speed</em></font></span></td>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em></em></font></span><font
- face="Lucida Grande,Helvetica,Arial">Set how fast Fuse will
-attempt to emulate the Spectrum, as a percentage of the speed at
-which the real machine runs. If your machine isn't fast enough to
-keep up with the requested speed, Fuse will just run as fast as it
-can. Note that if the emulation speed is 1%, no sound
-output will be produced.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Screen
-refresh
-rate</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Specify the frame rate,
-the ratio of spectrum frame updates to real frame updates. This is
-useful if your machine is having trouble keeping up with the
-spectrum screen updates.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Issue
-2
-keyboard</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Early versions of the
-Spectrum used a different value for unused bits on the keyboard
-input ports, and a few games depended on the old value of these
-bits. Enabling this option switches to the old value, to let you </font><font
- face="Lucida Grande,Helvetica,Arial">run those games.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Late
-timings</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If
-selected,
-Fuse
-will
-cause all screen-related timings (for example, when
-the screen is rendered and when memory contention occurs) to be one
-tstate later than "normal", an effect which is present on some real
-hardware.</font>
- <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Use
-tape
-traps</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Ordinarily, Fuse
-intercepts calls to the ROM tape-loading routine in order to load
-from tape files more quickly when possible. But this can (rarely)
-interfere with TZX loading; disabling this option avoids the
-problem at the cost of slower (i.e. always real-time) tape-loading.
-When tape-loading traps are disabled, you need to start tape
-playback manually, by choosing the<span class="emphasis"><em>Tape,
-Play</em></span> menu item.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Fast
-tape
-loading</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If this option is
-enabled, then Fuse will run at the fastest possible speed when the
-virtual tape is playing, thus dramatically reducing the time it
-takes to load programs. You may wish to disable this option if you
-wish to stop the tape at a specific point.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Detect
-tape
-loaders</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If
-this
-option
-is enabled, Fuse
-will attempt to detect when a loading routine is in progress, and then
-automatically start the virtual tape to load the program in. This is
-done by using a heuristic to identify a
-loading routine, so is by no means infalliable, but works in most cases.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Auto-load
-media</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">On many occasions when
-you open a tape or disk file, it's because it's got a program in
-you want to load and run. If this option is selected, this will
-automatically happen for you when you open one of these files using the
- </font><font face="Lucida Grande,Helvetica,Arial"><span
- class="emphasis"><em>File,
-Open...</em></span></font><font face="Lucida Grande,Helvetica,Arial">
-menu option - you must then use the Media menu to use tapes or disks
-for saving data to, or for loading data into an already running program.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Use
-.slt
-traps</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">The multi-load aspect of
-SLT files requires a trap instruction to be supported. This
-instruction is not generally used except for this trap, but since
-it's not inconceivable that a program could be wanting to use the
-real instruction instead, you can choose whether to support the
-trap or not.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Confirm
-actions</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Specify
-whether `dangerous' actions (those which could cause data loss, for
-example resetting the Spectrum) require confirmation before occuring.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Allow
-writes
-to
-ROM</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If this option is
-selected, Fuse will happily allow programs to overwrite what would
-normally be ROM. This probably isn't very useful in most
-circumstances, especially as the 48K ROM overwrites parts of
-itself.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Show
-tape/disk
-status</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Enables the status icons
-showing whether the disk and tape are being accessed.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Set
-joysticks
-on
-snapshot
-load</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Controls
-whether Fuse should
-allow snapshot files to override your current joystick configuration.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Reset
-Preferences</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">This causes all of Fuse's
-current preferences to be discarded and replaced with the default
-values as shipped.</font></td>
- </tr>
- </tbody>
-</table>
-<span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span><font
- face="Lucida Grande,Helvetica,Arial"></font>
-<p><span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span>
-<!-- AppleSegEnd --></p>
-</body>
+ <head>
+ <meta http-equiv="content-type" content="text/html;
+ charset=ISO-8859-1">
+ <!-- AppleSegStart="General Preferences" -->
+ <title>General Preferences</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="General
+ Preferences"></a><!-- AppleSegDescription="This section describes the Fuse general preferences dialog." --></font>
+ <h2><font face="Lucida Grande,Helvetica,Arial"><span
+ style="font-style: italic;">General</span> preferences</font></h2>
+ <p><font face="Lucida Grande,Helvetica,Arial">The General pane of
+ Fuse preferences lets you configure miscellaneous Fuse options.<br>
+ </font></p>
+ <table style="text-align: left; width: 100%;" cellpadding="2"
+ cellspacing="2">
+ <tbody>
+ <tr>
+ <th style="vertical-align: top;"><font style="font-weight:
+ bold;" face="Lucida Grande,Helvetica,Arial">OPTION</font><br>
+ </th>
+ <th style="vertical-align: top;"><font style="font-weight:
+ bold;" face="Lucida Grande,Helvetica,Arial">DESCRIPTION</font><br>
+ </th>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Emulation speed</em></font></span></td>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em></em></font></span><font
+ face="Lucida Grande,Helvetica,Arial">Set how fast Fuse
+ will attempt to emulate the Spectrum, as a percentage of
+ the speed at which the real machine runs. If your machine
+ isn't fast enough to keep up with the requested speed,
+ Fuse will just run as fast as it can. Note that if the
+ emulation speed is 1%, no sound output will be produced.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Screen refresh
+ rate</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Specify the frame rate, the ratio
+ of spectrum frame updates to real frame updates. This is
+ useful if your machine is having trouble keeping up with
+ the spectrum screen updates.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Use tape traps</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Ordinarily, Fuse intercepts calls
+ to the ROM tape-loading routine in order to load from tape
+ files more quickly when possible. But this can (rarely)
+ interfere with TZX loading; disabling this option avoids
+ the problem at the cost of slower (i.e. always real-time)
+ tape-loading. When tape-loading traps are disabled, you
+ need to start tape playback manually, by choosing the<span
+ class="emphasis"><em>Tape, Play</em></span> menu item.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Fast tape
+ loading</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is enabled, then
+ Fuse will run at the fastest possible speed when the
+ virtual tape is playing, thus dramatically reducing the
+ time it takes to load programs. You may wish to disable
+ this option if you wish to stop the tape at a specific
+ point.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Accelerate
+ loaders</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is enabled, then
+ Fuse will attempt to accelerate tape loaders by "short
+ circuiting" the loading loop. This will in general speed
+ up loading, but may cause some loaders to fail.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Detect tape
+ loaders</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is enabled, Fuse
+ will attempt to detect when a loading routine is in
+ progress, and then automatically start the virtual tape to
+ load the program in. This is done by using a heuristic to
+ identify a loading routine, so is by no means infalliable,
+ but works in most cases.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Auto-load media</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">On many occasions when you open a
+ tape or disk file, it's because it's got a program in you
+ want to load and run. If this option is selected, this
+ will automatically happen for you when you open one of
+ these files using the </font><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em>File,
+ Open...</em></span></font><font face="Lucida
+ Grande,Helvetica,Arial"> menu option - you must then use
+ the Media menu to use tapes or disks for saving data to,
+ or for loading data into an already running program.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Show tape/disk
+ status</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Enables the status icons showing
+ whether the disk and tape are being accessed.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Confirm actions</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Specify whether `dangerous'
+ actions (those which could cause data loss, for example
+ resetting the Spectrum) require confirmation before
+ occuring.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Issue 2
+ keyboard</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Early versions of the Spectrum
+ used a different value for unused bits on the keyboard
+ input ports, and a few games depended on the old value of
+ these bits. Enabling this option switches to the old
+ value, to let you </font><font face="Lucida
+ Grande,Helvetica,Arial">run those games.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Late CPU
+ timings</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If selected, Fuse will cause all
+ screen-related timings (for example, when the screen is
+ rendered and when memory contention occurs) to be one
+ tstate later than "normal", an effect which is present on
+ some real hardware.</font> <span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em></em></font></span></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Allow writes to
+ ROM</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will happily allow programs to overwrite what would
+ normally be ROM. This probably isn't very useful in most
+ circumstances, especially as the 48K ROM overwrites parts
+ of itself.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Use .slt traps</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">The multi-load aspect of SLT files
+ requires a trap instruction to be supported. This
+ instruction is not generally used except for this trap,
+ but since it's not inconceivable that a program could be
+ wanting to use the real instruction instead, you can
+ choose whether to support the trap or not.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Set joysticks
+ on snapshot load</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Controls whether Fuse should allow
+ snapshot files to override your current joystick
+ configuration.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Reset
+ Preferences</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">This causes all of Fuse's current
+ preferences to be discarded and replaced with the default
+ values as shipped.</font></td>
+ </tr>
+ </tbody>
+ </table>
+ <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span>
+ <p><span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span>
+ <!-- AppleSegEnd --></p>
+ </body>
</html>
Modified: branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/joysticks.html
===================================================================
--- branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/joysticks.html 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/joysticks.html 2013-06-01 07:15:01 UTC (rev 763)
@@ -43,12 +43,16 @@
face="Lucida Grande,Helvetica,Arial"><em>Kempston</em></font></span>
<font face="Lucida Grande,Helvetica,Arial">A Kempston joystick,
read from input port 31. Note that the <span class="emphasis"><em>Peripherals
+
+
preferences > Kempston interface</em></span> option must
also be set for the input to be recognised.</font></p>
<p style="margin-left: 40px;"> <span class="emphasis"><font
face="Lucida Grande,Helvetica,Arial"><em>Sinclair 1</em></font></span>
<span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Sinclair
+
+
2</em></font></span> <font face="Lucida
Grande,Helvetica,Arial">The `left' and `right' Sinclair
joysticks, equivalent to pressing 1 (left), 2 (right), 3 (down),
@@ -58,6 +62,8 @@
face="Lucida Grande,Helvetica,Arial"><em>Timex 1</em></font></span>
<span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Timex
+
+
2</em></font></span> <font face="Lucida
Grande,Helvetica,Arial">The `left' and `right' joysticks as
attached to the Timex 2068s built-in joystick interface.</font></p>
@@ -81,6 +87,20 @@
</tr>
<tr>
<td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Interface II</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will emulate a cartridge port as found on the Interface
+ II. Cartridges can then be inserted and removed via the <span
+ class="emphasis"><em>Media > Cartridge</em></span>
+ menu. Note that the Pentagon, Scorpion, Interface II,
+ ZXATASP and ZXCF all use the same hardware mechanism for
+ accessing some of their extended features, so only one of
+ these should be selected at once or unpredictable
+ behaviour will occur.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
face="Lucida Grande,Helvetica,Arial"><em>Kempston
joystick interface</em></font></span></td>
<td style="vertical-align: top;"><font face="Lucida
@@ -108,17 +128,12 @@
</tr>
<tr>
<td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Interface II</em></font></span></td>
+ face="Lucida Grande,Helvetica,Arial"><em>Swap mouse
+ buttons</em></font></span></td>
<td style="vertical-align: top;"><font face="Lucida
- Grande,Helvetica,Arial">If this option is selected, Fuse
- will emulate a cartridge port as found on the Interface
- II. Cartridges can then be inserted and removed via the <span
- class="emphasis"><em>Media > Cartridge</em></span>
- menu. Note that the Pentagon, Scorpion, Interface II,
- ZXATASP and ZXCF all use the same hardware mechanism for
- accessing some of their extended features, so only one of
- these should be selected at once or unpredictable
- behaviour will occur.</font></td>
+ Grande,Helvetica,Arial">If this option is enabled, the
+ left and right mouse buttons will be swapped when
+ emulating a Kempston mouse.</font></td>
</tr>
</tbody>
</table>
Modified: branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/spectranet.html
===================================================================
--- branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/spectranet.html 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/fusepb/resources/Fuse Help/html/spectranet.html 2013-06-01 07:15:01 UTC (rev 763)
@@ -25,6 +25,9 @@
+
+
+
preferences</em></span></font></a><font face="Lucida
Grande,Helvetica,Arial"> dialog, and the state of its </font><font
face="Lucida Grande,Helvetica,Arial">automatic page-in</font><font
@@ -67,6 +70,9 @@
+
+
+
preferences</em></span></font></a><font face="Lucida
Grande,Helvetica,Arial"> dialog</font><font face="Lucida
Grande,Helvetica,Arial">. Once that's done, open the installer
@@ -96,6 +102,9 @@
+
+
+
disable</span></font><font face="Lucida
Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font>
<font face="Lucida Grande,Helvetica,Arial">option</font><font
@@ -111,15 +120,9 @@
Spectranet" and ending with the Spectranet's IP address (which
will be 255.255.255.255 at this stage).<br>
<br>
- If you see all that, type the following command:<br>
- </font></p>
- <font face="Lucida Grande,Helvetica,Arial"><big><span
- style="font-family: monospace;">%cfgnew</span></big><br>
- </font>
- <p><font face="Lucida Grande,Helvetica,Arial">Which will show the
- standard 0 OK, 0:1 at the bottom of the screen. Now, trigger an
- NMI (the Machine > NMI menu option) and you should get a
- white on blue Spectranet NMI menu with five options.<br>
+ Now, trigger an NMI (the Machine > NMI menu option) and you
+ should get a white on blue Spectranet NMI menu with five
+ options.<br>
<br>
Select [A] Configure network settings - this should lead you to
another menu, which will scroll of the top of the screen; don't
@@ -171,6 +174,9 @@
+
+
+
: 255.255.255.000</span><br style="font-family: monospace;">
<span style="font-family: monospace;">Default gateway :
192.168.000.001</span><br style="font-family: monospace;">
@@ -189,6 +195,9 @@
+
+
+
: fuse</span><br style="font-family: monospace;">
<br style="font-family: monospace;">
<span style="font-family: monospace;"><menu options></span></big><font
@@ -199,11 +208,22 @@
Exit, at which point you'll be returned to BASIC. Reset the
Spectrum again and you'll see the same four line status display,
but this time with your IP address on the last line.<br>
- <br>
- Congratulations! You have now installed the Spectranet firmware.
- To save having to go through all that every time you start Fuse,
- save a .szx snapshot at this point, and load that in every time
- you want to use the Spectranet.</font></p>
+ </font><br>
+ <font face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial">Now type the following commands:<br>
+ </font> <font face="Lucida Grande,Helvetica,Arial"><big><span
+ style="font-family: monospace;">%cfgnew<br>
+ %cfgcommit</span></big></font><big><br>
+ </big> </font> </p>
+ <p><font face="Lucida Grande,Helvetica,Arial">Which will show the
+ standard <font face="Lucida Grande,Helvetica,Arial"><big><span
+ style="font-family: monospace;">0 OK, 0:1</span></big></font>
+ at the bottom of the screen. </font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial"> Congratulations! You
+ have now installed the Spectranet firmware. To save having to go
+ through all that every time you start Fuse, save a .szx snapshot
+ at this point, and load that in every time you want to use the
+ Spectranet.</font></p>
<!-- AppleSegEnd -->
</body>
</html>
Modified: branches/Release-1_1_0/fuse/hacking/ChangeLog
===================================================================
--- branches/Release-1_1_0/fuse/hacking/ChangeLog 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/hacking/ChangeLog 2013-06-01 07:15:01 UTC (rev 763)
@@ -4518,3 +4518,13 @@
20130524 ChangeLog,README: updates for a "1.1.1" release (Fred).
20130524 ChangeLog,README,configure.ac,man/fuse.1: fill in date and bump
version number (Stuart).
+20130526 Makefile.am,ui/win32/installer/fuse.nsi.in: distribute ChangeLog and
+ build notes in Windows packages (Sergio).
+20130527 pokefinder/pokemem.c: fix crash when opening a file without extension
+ (patch #312) (UB880D and Sergio).
+20130531 man/fuse.1: correct Spectranet initialisation script (thanks, Guesser)
+ (Fred).
+20130531 man/fuse.1: add missing documentation (fixes bug #282) (Stuart).
+20130531 ui/win32/installer/fuse.nsi.in: adding Fuse to the OpenWith list for
+ file extensions could result in an true association under some
+ circumstances on Windows 7 (thanks, Alessandro Grussu) (Sergio).
Modified: branches/Release-1_1_0/fuse/man/fuse.1
===================================================================
--- branches/Release-1_1_0/fuse/man/fuse.1 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/man/fuse.1 2013-06-01 07:15:01 UTC (rev 763)
@@ -1988,6 +1988,13 @@
you wish to stop the tape at a specific point.
.RE
.PP
+.I "Accelerate loaders"
+.RS
+If this option is enabled, then Fuse will attempt to accelerate tape
+loaders by \(lqshort circuiting\(rq the loading loop. This will in
+general speed up loading, but may cause some loaders to fail.
+.RE
+.PP
.I "Detect loaders"
.RS
If this option is enabled, Fuse will attempt to detect when a loading
@@ -2046,6 +2053,14 @@
If the value smaller than 4 or greater than 254 Fuse assumes 4 or 254.
.RE
.PP
+.I "Random length MDR cartridge"
+.RS
+If this option is enabled, Fuse will use a random Microdrive cartridge
+length instead of the length specified in the
+.I "MDR cartridge len"
+option.
+.RE
+.PP
.I "RS-232 handshake"
.RS
If you turn this option off, Fuse assumes the RS-232 line other end is
@@ -2211,6 +2226,12 @@
connected mouse may be used.
.RE
.PP
+.I "Swap mouse buttons"
+.RS
+If this option is enabled, the left and right mouse buttons will be swapped
+when emulating a Kempston mouse.
+.RE
+.PP
.I "Fuller Box"
.RS
If this option is selected, Fuse will emulate a Fuller Box AY sound and
@@ -2365,14 +2386,6 @@
section for more details.
.RE
.PP
-.I "Opus Discovery interface"
-.RS
-If this option is selected, Fuse will emulate the Opus Discovery interface.
-See the
-.B "OPUS DISCOVERY EMULATION"
-section for more details.
-.RE
-.PP
.I "+D interface"
.RS
If this option is selected, Fuse will emulate the +D interface. See the
@@ -2395,8 +2408,22 @@
section for more details. Beta\ 128 emulation is enabled for the
Pentagon and Scorpion machines regardless of this option.
.RE
+.PP
+.I "Beta\ 128 auto-boot in 48K\ machines"
+.RS
+If this option is selected, then when a Beta\ 128 interface is used in 48K
+or TC2048 emulation, the machine will boot directly into the TR-DOS system.
.RE
.PP
+.I "Opus Discovery interface"
+.RS
+If this option is selected, Fuse will emulate the Opus Discovery interface.
+See the
+.B "OPUS DISCOVERY EMULATION"
+section for more details.
+.RE
+.RE
+.PP
.I "Options, RZX..."
.RS
Display the RZX Options dialog, letting you configure how Fuse's deals
@@ -3740,11 +3767,7 @@
starting with \(lqAlioth Spectranet\(rq and ending with the Spectranet's IP
address (which will be 255.255.255.255 at this stage).
.PP
-If you see all that, type the following command:
-.PP
-%cfgnew
-.PP
-Which will show the standard 0 OK, 0:1 at the bottom of the screen. Now trigger an NMI (the Machine / NMI menu option)
+Now trigger an NMI (the Machine / NMI menu option)
and you should get a white on blue Spectranet NMI menu with five
options.
.PP
@@ -3798,7 +3821,17 @@
.PP
If everything looks correct, select [I] Save changes and exit (you'll
see a brief \(lqSaving configuration...\(rq message) followed by [E] Exit,
-at which point you'll be returned to BASIC. Reset the Spectrum again
+at which point you'll be returned to BASIC.
+.PP
+Now type the following commands:
+.PP
+%cfgnew
+.br
+%cfgcommit
+.PP
+Which will show the standard 0 OK, 0:1 at the bottom of the screen.
+.PP
+Reset the Spectrum again
and you'll see the same four line status display, but this time with
your IP address on the last line.
.PP
Modified: branches/Release-1_1_0/fuse/pokefinder/pokemem.c
===================================================================
--- branches/Release-1_1_0/fuse/pokefinder/pokemem.c 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/pokefinder/pokemem.c 2013-06-01 07:15:01 UTC (rev 763)
@@ -1,7 +1,7 @@
/* pokemem.c: help with handling pokes
Copyright (c) 2011 Philip Kendall, Sergio Baldoví
- $Id: pokemem.c 4785 2012-12-07 23:56:40Z sbaldovi $
+ $Id: pokemem.c 5005 2013-05-29 21:17:26Z pak21 $
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
@@ -487,8 +487,8 @@
int
pokemem_find_pokfile( const char *path )
{
- int n, has_extension;
- size_t length, filename_size, last_dot, last_slash;
+ int n, has_extension, last_dot, last_slash;
+ size_t length, filename_size;
char *test_file, *c;
if( pokfile ) return 1; /* Previous .pok file already found */
@@ -507,7 +507,7 @@
c = strrchr( test_file, '.' );
last_dot = ( c )? c - test_file : -1;
- has_extension = ( last_dot > last_slash );
+ has_extension = ( last_dot > last_slash + 1 );
/* Try .pok extension */
if( has_extension ) {
@@ -532,15 +532,16 @@
}
/* Browse POKES/ directory */
- if( last_slash ) {
+ if( last_slash >= 0 ) {
n = last_slash + 1; /* insert directory */
- filename_size = ( has_extension )? last_dot - last_slash - 1 :
- strlen( &path[n] );
+ filename_size =
+ ( has_extension )? (unsigned int) ( last_dot - last_slash - 1 ) :
+ strlen( &path[n] );
test_file[ n ] = '\0';
strncat( test_file, "POKES", 5 );
} else {
n = 0; /* prepend directory */
- filename_size = ( has_extension )? last_dot : length;
+ filename_size = ( has_extension )? (unsigned int) last_dot : length;
strncpy( test_file, "POKES", 5 );
test_file[ 5 ] = '\0';
}
Modified: branches/Release-1_1_0/fuse/ui/win32/installer/fuse.nsi.in
===================================================================
--- branches/Release-1_1_0/fuse/ui/win32/installer/fuse.nsi.in 2013-06-01 07:10:26 UTC (rev 762)
+++ branches/Release-1_1_0/fuse/ui/win32/installer/fuse.nsi.in 2013-06-01 07:15:01 UTC (rev 763)
@@ -1,7 +1,7 @@
## NSIS (nsis.sf.net) script to produce installer for win32 platform
## Copyright (c) 2009 Marek Januszewski
-## $Id: fuse.nsi.in 4775 2012-11-26 23:03:36Z sbaldovi $
+## $Id: fuse.nsi.in 5010 2013-05-31 18:32:45Z sbaldovi $
## 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
@@ -116,10 +116,6 @@
${CallArtificialFunction} UnRegisterExtension_
!macroend
-!macro AddOpenWithListCall _EXTENSION
- WriteRegStr HKLM "Software\Classes\${_EXTENSION}\OpenWithProgids" "${PROG_ID}" ""
-!macroend
-
!macro SelectUnregisteredExt_
Exch $R1 ;section
Exch
@@ -146,6 +142,9 @@
Exch $R0 ;extension
Push $0
+ ; Recommend Fuse in the Open With list
+ WriteRegStr HKLM "Software\Classes\$R0\OpenWithProgids" "${PROG_ID}" ""
+
; Read global file association
ReadRegStr $0 HKLM "Software\Classes\$R0" ""
StrCmp "$0" "" NoBackup ; is it empty
@@ -211,7 +210,6 @@
!define SelectUnregisteredExt `!insertmacro SelectUnregisteredExtCall`
!define RegisterExtension `!insertmacro RegisterExtensionCall`
!define UnRegisterExtension `!insertmacro UnRegisterExtensionCall`
-!define AddOpenWithList `!insertmacro AddOpenWithListCall`
;--------------------------------
; Uninstall previous version
@@ -246,10 +244,12 @@
; Installation files
File "AUTHORS.txt"
+ File "ChangeLog.txt"
File "COPYING.txt"
File "fuse.exe"
File "fuse.html"
File "README.txt"
+ File /nonfatal "README-win32.txt"
File "*.dll"
SetOutPath $INSTDIR\lib
File "lib\*"
@@ -303,14 +303,6 @@
WriteRegStr HKLM "Software\Classes\${PROG_ID}\shell\open\command" "" '"$INSTDIR\fuse.exe" "%1"'
WriteRegStr HKLM "Software\Classes\Applications\fuse.exe" "NoOpenWith" ""
- ; Recommend Fuse for known extensions
- ${AddOpenWithList} ".pzx"
- ${AddOpenWithList} ".rzx"
- ${AddOpenWithList} ".sna"
- ${AddOpenWithList} ".szx"
- ${AddOpenWithList} ".tap"
- ${AddOpenWithList} ".tzx"
- ${AddOpenWithList} ".z80"
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd
@@ -362,10 +354,12 @@
Delete "$INSTDIR\roms\*"
RMDir "$INSTDIR\roms"
Delete "$INSTDIR\AUTHORS.txt"
+ Delete "$INSTDIR\ChangeLog.txt"
Delete "$INSTDIR\COPYING.txt"
Delete "$INSTDIR\fuse.exe"
Delete "$INSTDIR\fuse.html"
Delete "$INSTDIR\README.txt"
+ Delete "$INSTDIR\README-win32.txt"
Delete "$INSTDIR\*.dll"
RMDir "$INSTDIR"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
