marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac: Make Screenshot (of whole map) in main menu

stable-5.4
Martin Plicht 2013-09-02 20:47:44 +02:00
parent 0351eb2cdb
commit 8e387dd05a
3 changed files with 120 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/C4AppDelegate+MainMenuActions.h
View File

@ -21,4 +21,6 @@
- (IBAction) suggestQuitting:(id)sender;
- (IBAction) simulateKeyPressed:(C4KeyCode)key;
- (IBAction) visitWebsite:(id)sender;
- (IBAction) makeScreenshot:(id)sender;
- (IBAction) makeScreenshotOfWholeMap:(id)sender;
@end

30
src/platform/C4AppDelegate+MainMenuActions.mm
View File

@ -142,9 +142,19 @@
if ([item action] == @selector(toggleFullScreen:))
return !Application.isEditor;
// game running no matter whether console or fullscreen
if ([item action] == @selector(togglePause:))
return Game.IsRunning;
SEL s;
int i;
SEL gameRunningSelectors[] =
{
@selector(togglePause:),
@selector(makeScreenshot:),
@selector(makeScreenshotOfWholeMap:),
nil
};
for (i = 0; (s = gameRunningSelectors[i]) != nil; i++)
if ([item action] == s)
return Game.IsRunning;
// enabled when game running and console mode
SEL gameRunningInConsoleModeSelectors[] =
@ -162,9 +172,7 @@
@selector(setDrawingTool:),
nil
};
int i = 0;
SEL s;
while ((s = gameRunningInConsoleModeSelectors[i++]) != nil)
for (i = 0; (s = gameRunningInConsoleModeSelectors[i]) != nil; i++)
{
if (s == [item action])
return Application.isEditor && Game.IsRunning;
@ -185,4 +193,14 @@
Game.DoKeyboardInput(key, KEYEV_Up, false, false, false, false, NULL);
}
- (IBAction) makeScreenshot:(id)sender;
{
::GraphicsSystem.SaveScreenshot(false);
}
- (IBAction) makeScreenshotOfWholeMap:(id)sender;
{
::GraphicsSystem.SaveScreenshot(true);
}
@end

158
src/res/MainMenu.xib
View File

@ -2,20 +2,20 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">11D50</string>
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
<string key="IBDocument.AppKitVersion">1138.32</string>
<string key="IBDocument.HIToolboxVersion">568.00</string>
<string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.39</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">2182</string>
<string key="NS.object.0">3084</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSUserDefaultsController</string>
<string>NSCustomObject</string>
<string>NSMenu</string>
<string>NSMenuItem</string>
<string>NSCustomObject</string>
<string>NSUserDefaultsController</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -879,6 +879,35 @@
<reference key="NSOnImage" ref="236001633"/>
<reference key="NSMixedImage" ref="855621955"/>
</object>
<object class="NSMenuItem" id="607917536">
<reference key="NSMenu" ref="781362651"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="236001633"/>
<reference key="NSMixedImage" ref="855621955"/>
</object>
<object class="NSMenuItem" id="629201653">
<reference key="NSMenu" ref="781362651"/>
<string key="NSTitle">Make Screenshot</string>
<string key="NSKeyEquiv">s</string>
<int key="NSKeyEquivModMask">1310720</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="236001633"/>
<reference key="NSMixedImage" ref="855621955"/>
</object>
<object class="NSMenuItem" id="40418259">
<reference key="NSMenu" ref="781362651"/>
<bool key="NSIsAlternate">YES</bool>
<string key="NSTitle">Make Screenshot of whole map</string>
<string key="NSKeyEquiv">s</string>
<int key="NSKeyEquivModMask">1835008</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="236001633"/>
<reference key="NSMixedImage" ref="855621955"/>
</object>
</object>
</object>
</object>
@ -1564,6 +1593,22 @@
</object>
<int key="connectionID">718</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">makeScreenshotOfWholeMap:</string>
<reference key="source" ref="898186092"/>
<reference key="destination" ref="40418259"/>
</object>
<int key="connectionID">722</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">makeScreenshot:</string>
<reference key="source" ref="898186092"/>
<reference key="destination" ref="629201653"/>
</object>
<int key="connectionID">723</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -1947,6 +1992,9 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="303302462"/>
<reference ref="629201653"/>
<reference ref="607917536"/>
<reference ref="40418259"/>
</object>
<reference key="parent" ref="282287040"/>
</object>
@ -2378,6 +2426,21 @@
<reference key="object" ref="595292667"/>
<reference key="parent" ref="594976293"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">719</int>
<reference key="object" ref="629201653"/>
<reference key="parent" ref="781362651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">720</int>
<reference key="object" ref="607917536"/>
<reference key="parent" ref="781362651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">721</int>
<reference key="object" ref="40418259"/>
<reference key="parent" ref="781362651"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -2501,6 +2564,9 @@
<string>703.IBPluginDependency</string>
<string>704.IBPluginDependency</string>
<string>716.IBPluginDependency</string>
<string>719.IBPluginDependency</string>
<string>720.IBPluginDependency</string>
<string>721.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -2621,6 +2687,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@ -2635,7 +2704,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">718</int>
<int key="maxID">723</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -2649,6 +2718,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>closeScenario:</string>
<string>joinPlayer:</string>
<string>makeScreenshot:</string>
<string>makeScreenshotOfWholeMap:</string>
<string>newViewport:</string>
<string>newViewportForPlayer:</string>
<string>openPropTools:</string>
@ -2662,7 +2733,7 @@
<string>setDrawingTool:</string>
<string>showAbout:</string>
<string>suggestQuitting:</string>
<string>toggleFullscreen:</string>
<string>toggleFullScreen:</string>
<string>togglePause:</string>
<string>visitWebsite:</string>
</object>
@ -2686,6 +2757,8 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@ -2694,6 +2767,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>closeScenario:</string>
<string>joinPlayer:</string>
<string>makeScreenshot:</string>
<string>makeScreenshotOfWholeMap:</string>
<string>newViewport:</string>
<string>newViewportForPlayer:</string>
<string>openPropTools:</string>
@ -2707,7 +2782,7 @@
<string>setDrawingTool:</string>
<string>showAbout:</string>
<string>suggestQuitting:</string>
<string>toggleFullscreen:</string>
<string>toggleFullScreen:</string>
<string>togglePause:</string>
<string>visitWebsite:</string>
</object>
@ -2721,6 +2796,14 @@
<string key="name">joinPlayer:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">makeScreenshot:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">makeScreenshotOfWholeMap:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">newViewport:</string>
<string key="candidateClassName">id</string>
@ -2774,7 +2857,7 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleFullscreen:</string>
<string key="name">toggleFullScreen:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
@ -2787,59 +2870,6 @@
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addViewportForPlayerMenuItem</string>
<string>kickPlayerMenuItem</string>
<string>netMenu</string>
<string>recordMenuItem</string>
<string>toggleFullScreen</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addViewportForPlayerMenuItem</string>
<string>kickPlayerMenuItem</string>
<string>netMenu</string>
<string>recordMenuItem</string>
<string>toggleFullScreen</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">addViewportForPlayerMenuItem</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">kickPlayerMenuItem</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">netMenu</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">recordMenuItem</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toggleFullScreen</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/C4AppDelegate.h</string>