ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: 

- Add the following toolbar items: Frame Advance, Enable/Disable HUD, Toggle Displays
This commit is contained in:
rogerman 2016-02-12 06:51:34 +00:00
parent 25f33c54ba
commit e8f660b381
3 changed files with 3101 additions and 2865 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib
View File

@ -55,10 +55,13 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>0135754F-463F-4625-9D27-DEF701AEF50E</string>
<string>039A3D54-15EA-4743-88B7-60517113C193</string>
<string>2E728430-6055-404B-944F-25594ACBEC39</string>
<string>321036F9-6034-47B1-9CC5-2461D98700F0</string>
<string>41A299FB-4A95-4FA3-9982-8523FF04ACDE</string>
<string>8A505B61-7B2E-49ED-B6A0-DBE0A72DB48D</string>
<string>C626F2C1-4353-4288-AD59-40FB7F4C1A58</string>
<string>D3628D4D-C39F-4CC3-B82F-7CC0F699B953</string>
<string>EDBFD998-E031-4AC5-A86A-7114D66FF847</string>
<string>NSToolbarFlexibleSpaceItem</string>
<string>NSToolbarSpaceItem</string>
@ -87,6 +90,28 @@
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="78663493">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">039A3D54-15EA-4743-88B7-60517113C193</characters>
</object>
<string key="NSToolbarItemLabel">Toggle Displays</string>
<string key="NSToolbarItemPaletteLabel">Toggle Displays</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Icon_DisplayToggle_420x420</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">YES</bool>
<int key="NSToolbarItemTag">-1</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="298859108">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">2E728430-6055-404B-944F-25594ACBEC39</characters>
@ -153,6 +178,28 @@
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="838391207">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">8A505B61-7B2E-49ED-B6A0-DBE0A72DB48D</characters>
</object>
<string key="NSToolbarItemLabel">Enable HUD</string>
<string key="NSToolbarItemPaletteLabel">Enable/Disable HUD</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Icon_ShowHUD_420x420</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">YES</bool>
<int key="NSToolbarItemTag">-1</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="843588223">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">C626F2C1-4353-4288-AD59-40FB7F4C1A58</characters>
@ -175,6 +222,28 @@
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="535920858">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">D3628D4D-C39F-4CC3-B82F-7CC0F699B953</characters>
</object>
<string key="NSToolbarItemLabel">Frame Advance</string>
<string key="NSToolbarItemPaletteLabel">Frame Advance</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Icon_FrameAdvance_420x420</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">YES</bool>
<int key="NSToolbarItemTag">-1</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="137384193">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">EDBFD998-E031-4AC5-A86A-7114D66FF847</characters>
@ -262,15 +331,18 @@
<object class="NSArray" key="NSToolbarIBAllowedItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="298859108"/>
<reference ref="137384193"/>
<reference ref="535920858"/>
<reference ref="281439290"/>
<reference ref="137384193"/>
<reference ref="843588223"/>
<reference ref="668087633"/>
<reference ref="78663493"/>
<reference ref="838391207"/>
<reference ref="127287125"/>
<reference ref="522097277"/>
<reference ref="69604475"/>
</object>
<object class="NSArray" key="NSToolbarIBDefaultItems">
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="298859108"/>
<reference ref="137384193"/>
@ -296,7 +368,6 @@
<int key="NSvFlags">5156</int>
<string key="NSFrame">{{2, 3}, {16, 16}}</string>
<reference key="NSSuperview" ref="1027645320"/>
<reference key="NSNextKeyView" ref="731708450"/>
<int key="NSpiFlags">28938</int>
<double key="NSMaxValue">100</double>
</object>
@ -305,7 +376,6 @@
<int key="NSvFlags">294</int>
<string key="NSFrame">{{17, 5}, {137, 14}}</string>
<reference key="NSSuperview" ref="1027645320"/>
<reference key="NSNextKeyView" ref="154157914"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="644649254">
<int key="NSCellFlags">68157504</int>
@ -348,7 +418,6 @@
</object>
<string key="NSFrame">{{0, 24}, {256, 384}}</string>
<reference key="NSSuperview" ref="1027645320"/>
<reference key="NSNextKeyView" ref="963885183"/>
<bool key="NSViewCanDrawConcurrently">YES</bool>
<string key="NSClassName">DisplayView</string>
</object>
@ -428,7 +497,6 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{151, -1}, {42, 26}}</string>
<reference key="NSSuperview" ref="1027645320"/>
<reference key="NSNextKeyView" ref="347607109"/>
<string key="NSReuseIdentifierKey">_NS:791</string>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="480563989">
@ -489,7 +557,6 @@
</object>
</object>
<string key="NSFrameSize">{256, 408}</string>
<reference key="NSNextKeyView" ref="740908585"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1177}}</string>
<string key="NSMinSize">{256, 477}</string>
@ -1429,6 +1496,30 @@
</object>
<int key="connectionID">233</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">frameAdvance:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="535920858"/>
</object>
<int key="connectionID">243</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleNDSDisplays:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="78663493"/>
</object>
<int key="connectionID">244</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleHUDVisibility:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="838391207"/>
</object>
<int key="connectionID">245</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -1480,6 +1571,9 @@
<reference ref="298859108"/>
<reference ref="137384193"/>
<reference ref="281439290"/>
<reference ref="535920858"/>
<reference ref="78663493"/>
<reference ref="838391207"/>
</object>
<reference key="parent" ref="418996424"/>
</object>
@ -1837,6 +1931,21 @@
<reference key="object" ref="169016076"/>
<reference key="parent" ref="208921964"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">234</int>
<reference key="object" ref="535920858"/>
<reference key="parent" ref="321775728"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">237</int>
<reference key="object" ref="78663493"/>
<reference key="parent" ref="321775728"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">238</int>
<reference key="object" ref="838391207"/>
<reference key="parent" ref="321775728"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -1893,11 +2002,16 @@
<string>19.IBPluginDependency</string>
<string>20.IBPluginDependency</string>
<string>21.IBPluginDependency</string>
<string>234.IBPluginDependency</string>
<string>237.IBPluginDependency</string>
<string>238.IBPluginDependency</string>
<string>3.IBEditorWindowLastContentRect</string>
<string>3.IBPluginDependency</string>
<string>3.IBWindowTemplateEditedContentRect</string>
<string>3.NSWindowTemplate.visibleAtLaunch</string>
<string>3.windowTemplate.hasMinSize</string>
<string>3.windowTemplate.minSize</string>
<string>4.IBEditorWindowLastContentRect</string>
<string>4.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>6.IBPluginDependency</string>
@ -1963,10 +2077,15 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{1059, 381}, {256, 408}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{514, 590}, {256, 408}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{514, 590}, {256, 408}}</string>
<boolean value="NO"/>
<boolean value="YES"/>
<string>{256, 408}</string>
<string>{{334, 998}, {616, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -1996,7 +2115,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">233</int>
<int key="maxID">245</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -2022,6 +2141,7 @@
<string>changeDisplayOrder:</string>
<string>changeDisplayOrientation:</string>
<string>changeHardwareMicGain:</string>
<string>changeHardwareMicMute:</string>
<string>changeRotation:</string>
<string>changeRotationRelative:</string>
<string>changeScale:</string>
@ -2029,12 +2149,22 @@
<string>changeVideoPixelScaler:</string>
<string>changeVolume:</string>
<string>copy:</string>
<string>frameAdvance:</string>
<string>openRom:</string>
<string>reset:</string>
<string>saveScreenshotAs:</string>
<string>toggleExecutePause:</string>
<string>toggleFullScreenDisplay:</string>
<string>toggleHUDVisibility:</string>
<string>toggleKeepMinDisplaySizeAtNormal:</string>
<string>toggleNDSDisplays:</string>
<string>toggleShowHUDCPULoadAverage:</string>
<string>toggleShowHUDFrameIndex:</string>
<string>toggleShowHUDInput:</string>
<string>toggleShowHUDLagFrameCount:</string>
<string>toggleShowHUDRealTimeClock:</string>
<string>toggleShowHUDRender3DFPS:</string>
<string>toggleShowHUDVideoFPS:</string>
<string>toggleStatusBar:</string>
<string>toggleVerticalSync:</string>
<string>toggleVideoFiltersPreferGPU:</string>
@ -2073,6 +2203,17 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@ -2085,6 +2226,7 @@
<string>changeDisplayOrder:</string>
<string>changeDisplayOrientation:</string>
<string>changeHardwareMicGain:</string>
<string>changeHardwareMicMute:</string>
<string>changeRotation:</string>
<string>changeRotationRelative:</string>
<string>changeScale:</string>
@ -2092,12 +2234,22 @@
<string>changeVideoPixelScaler:</string>
<string>changeVolume:</string>
<string>copy:</string>
<string>frameAdvance:</string>
<string>openRom:</string>
<string>reset:</string>
<string>saveScreenshotAs:</string>
<string>toggleExecutePause:</string>
<string>toggleFullScreenDisplay:</string>
<string>toggleHUDVisibility:</string>
<string>toggleKeepMinDisplaySizeAtNormal:</string>
<string>toggleNDSDisplays:</string>
<string>toggleShowHUDCPULoadAverage:</string>
<string>toggleShowHUDFrameIndex:</string>
<string>toggleShowHUDInput:</string>
<string>toggleShowHUDLagFrameCount:</string>
<string>toggleShowHUDRealTimeClock:</string>
<string>toggleShowHUDRender3DFPS:</string>
<string>toggleShowHUDVideoFPS:</string>
<string>toggleStatusBar:</string>
<string>toggleVerticalSync:</string>
<string>toggleVideoFiltersPreferGPU:</string>
@ -2133,6 +2285,10 @@
<string key="name">changeHardwareMicGain:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">changeHardwareMicMute:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">changeRotation:</string>
<string key="candidateClassName">id</string>
@ -2161,6 +2317,10 @@
<string key="name">copy:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">frameAdvance:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">openRom:</string>
<string key="candidateClassName">id</string>
@ -2181,10 +2341,46 @@
<string key="name">toggleFullScreenDisplay:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleHUDVisibility:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleKeepMinDisplaySizeAtNormal:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleNDSDisplays:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleShowHUDCPULoadAverage:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleShowHUDFrameIndex:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleShowHUDInput:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleShowHUDLagFrameCount:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleShowHUDRealTimeClock:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleShowHUDRender3DFPS:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleShowHUDVideoFPS:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleStatusBar:</string>
<string key="candidateClassName">id</string>
@ -2836,12 +3032,15 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Icon_DisplayToggle_420x420</string>
<string>Icon_Execute_420x420</string>
<string>Icon_FrameAdvance_420x420</string>
<string>Icon_MicrophoneBlack_256x256</string>
<string>Icon_OpenROM_420x420</string>
<string>Icon_Reset_420x420</string>
<string>Icon_RotateCCW_420x420</string>
<string>Icon_RotateCW_420x420</string>
<string>Icon_ShowHUD_420x420</string>
<string>Icon_Speed2x_420x420</string>
<string>Icon_VolumeFull_16x16</string>
<string>NSMenuCheckmark</string>
@ -2851,12 +3050,15 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{420, 420}</string>
<string>{420, 420}</string>
<string>{420, 420}</string>
<string>{256, 256}</string>
<string>{420, 420}</string>
<string>{420, 420}</string>
<string>{420, 420}</string>
<string>{420, 420}</string>
<string>{420, 420}</string>
<string>{420, 420}</string>
<string>{16, 16}</string>
<string>{11, 11}</string>
<string>{10, 3}</string>

2
desmume/src/cocoa/userinterface/DisplayWindowController.h
View File

@ -168,6 +168,7 @@ class OGLVideoOutput;
- (IBAction) changeVolume:(id)sender;
- (IBAction) toggleExecutePause:(id)sender;
- (IBAction) frameAdvance:(id)sender;
- (IBAction) reset:(id)sender;
- (IBAction) changeCoreSpeed:(id)sender;
- (IBAction) openRom:(id)sender;
@ -194,6 +195,7 @@ class OGLVideoOutput;
- (IBAction) toggleShowHUDInput:(id)sender;
- (IBAction) toggleShowHUDCPULoadAverage:(id)sender;
- (IBAction) toggleShowHUDRealTimeClock:(id)sender;
- (IBAction) toggleNDSDisplays:(id)sender;
- (IBAction) toggleKeepMinDisplaySizeAtNormal:(id)sender;
- (IBAction) toggleStatusBar:(id)sender;
- (IBAction) toggleFullScreenDisplay:(id)sender;

34
desmume/src/cocoa/userinterface/DisplayWindowController.mm
View File

@ -823,6 +823,11 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
[emuControl toggleExecutePause:sender];
}
- (IBAction) frameAdvance:(id)sender
{
[emuControl frameAdvance:sender];
}
- (IBAction) reset:(id)sender
{
[emuControl reset:sender];
@ -941,6 +946,11 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
[self setVideoPixelScaler:[CocoaDSUtil getIBActionSenderTag:sender]];
}
- (IBAction) toggleNDSDisplays:(id)sender
{
[self setDisplayOrder:([self displayOrder] == DS_DISPLAY_ORDER_MAIN_FIRST) ? DS_DISPLAY_ORDER_TOUCH_FIRST : DS_DISPLAY_ORDER_MAIN_FIRST];
}
- (IBAction) writeDefaultsDisplayRotation:(id)sender
{
[[NSUserDefaults standardUserDefaults] setDouble:[self displayRotation] forKey:@"DisplayView_Rotation"];
@ -1467,6 +1477,16 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
[theItem setLabel:NSSTRING_TITLE_PAUSE_CONTROL];
[theItem setImage:[emuControl iconPause]];
}
}
else if (theAction == @selector(frameAdvance:))
{
if (![emuControl masterExecuteFlag] ||
[emuControl currentRom] == nil ||
[emuControl isUserInterfaceBlockingExecution] ||
[emuControl executionState] != CORESTATE_PAUSE)
{
enable = NO;
}
}
else if (theAction == @selector(reset:))
{
@ -1479,7 +1499,7 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
{
NSInteger speedScalar = (NSInteger)([emuControl speedScalar] * 100.0);
if (speedScalar == (NSInteger)(SPEED_SCALAR_DOUBLE * 100.0))
if (speedScalar != (NSInteger)(SPEED_SCALAR_NORMAL * 100.0))
{
[theItem setLabel:NSSTRING_TITLE_SPEED_1X];
[theItem setTag:100];
@ -1499,6 +1519,18 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
enable = NO;
}
}
else if (theAction == @selector(toggleHUDVisibility:))
{
if ([[self view] isHUDVisible])
{
[theItem setLabel:NSSTRING_TITLE_DISABLE_HUD];
}
else
{
[theItem setLabel:NSSTRING_TITLE_ENABLE_HUD];
}
}
return enable;
}