fly/fgdata
1
0
Fork 0
Code Activity

Merge commit 'refs/merge-requests/44' of git://gitorious.org/fg/fgdata into integration

Browse source
This commit is contained in:
Vivian Meazza 2010-09-18 11:55:45 +01:00
commit 9fe2172791
6 changed files with 503 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
gui/FG-menu-structure.ods Normal file
View file

Binary file not shown.

221
gui/dialogs/AIcarrier.xml Normal file
View file

@ -0,0 +1,221 @@
<?xml version="1.0"?>
<PropertyList>
<name>AIcarrier</name>
<modal>false</modal>
<layout>vbox</layout>
<!-- AI Carrier options -->
<text>
<halign>left</halign>
<label>AI Carrier</label>
<color>
<red>0.9</red>
<green>0.9</green>
<blue>0.9</blue>
<alpha>1</alpha>
</color>
</text>
<group>
<layout>hbox</layout>
<empty>
<pref-width>10</pref-width>
</empty>
<group>
<layout>vbox</layout>
<radio>
<halign>left</halign>
<label>Turn to launch course</label>
<property>/ai/models/carrier/controls/turn-to-launch-hdg</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>nasal</command>
<script>
var v = getprop("/ai/models/carrier/controls/turn-to-launch-hdg");
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier")){
c.getNode("controls/turn-to-launch-hdg").setBoolValue(v);
c.getNode("controls/turn-to-recovery-hdg").setBoolValue(0);
c.getNode("controls/turn-to-base-course").setBoolValue(0);
}
</script>
</binding>
</radio>
<radio>
<halign>left</halign>
<label>Turn to recovery course</label>
<property>/ai/models/carrier/controls/turn-to-recovery-hdg</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>nasal</command>
<script>
var v = getprop("/ai/models/carrier/controls/turn-to-recovery-hdg");
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier")){
c.getNode("controls/turn-to-recovery-hdg").setBoolValue(v);
c.getNode("controls/turn-to-launch-hdg").setBoolValue(0);
c.getNode("controls/turn-to-base-course").setBoolValue(0);
}
</script>
</binding>
</radio>
<radio>
<halign>left</halign>
<label>Turn to base course</label>
<property>/ai/models/carrier/controls/turn-to-base-course</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>nasal</command>
<script>
var v = getprop("/ai/models/carrier/controls/turn-to-base-course");
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier")){
c.getNode("controls/turn-to-base-course").setBoolValue(v);
c.getNode("controls/turn-to-recovery-hdg").setBoolValue(0);
c.getNode("controls/turn-to-launch-hdg").setBoolValue(0);
}
</script>
</binding>
</radio>
<checkbox>
<halign>left</halign>
<label>Operate Deck Elevators</label>
<property>/ai/models/carrier/controls/elevators</property>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>nasal</command>
<script>
var v = getprop("/ai/models/carrier/controls/elevators");
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier"))
c.getNode("controls/elevators").setBoolValue(v);
</script>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Enable LSO Communications</label>
<property>/sim/current-view/lso-commentary</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Enable Deck Park</label>
<property>/sim/current-view/deck-park</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Deck Lights</label>
<property>/ai/models/carrier/controls/lighting/deck-lights</property>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>nasal</command>
<script>
var v = getprop("/ai/models/carrier/controls/lighting/deck-lights");
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier"))
c.getNode("controls/lighting/deck-lights",1).setBoolValue(v);
</script>
</binding>
</checkbox>
<text>
<halign>left</halign>
<label>Discrete Flightdeck Floodlights (Red)</label>
</text>
<slider>
<halign>left</halign>
<width>75</width>
<height>25</height>
<property>/ai/models/carrier/controls/lighting/flood-lights-red-norm</property>
<binding>
<command>nasal</command>
<script>
var v = getprop("/ai/models/carrier/controls/lighting/flood-lights-red-norm");
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier"))
c.getNode("controls/lighting/flood-lights-red-norm",1).setDoubleValue(v);
</script>
</binding>
</slider>
</group>
<empty>
<stretch>true</stretch>
</empty>
</group>
<group>
<layout>hbox</layout>
<default-padding>6</default-padding>
<empty>
<stretch>true</stretch>
</empty>
<button>
<legend>OK</legend>
<default>true</default>
<equal>true</equal>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>dialog-close</command>
</binding>
</button>
<button>
<legend>Apply</legend>
<equal>true</equal>
<binding>
<command>dialog-apply</command>
</binding>
</button>
<button>
<legend>Reset</legend>
<equal>true</equal>
<binding>
<command>dialog-update</command>
</binding>
</button>
<button>
<legend>Cancel</legend>
<equal>true</equal>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>
<empty>
<stretch>true</stretch>
</empty>
</group>
</PropertyList>

74
gui/dialogs/ai.xml Normal file
View file

@ -0,0 +1,74 @@
<?xml version="1.0"?>
<!-- General ATC/AI options -->
<PropertyList>
<name>ai</name>
<modal>false</modal>
<layout>vbox</layout>
<button>
<legend>-</legend>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<halign>right</halign>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
</button>
<text>
<!-- <label>ATC/AI Options</label> -->
<label>AI Options</label>
</text>
<hrule/>
<group>
<layout>hbox</layout>
<empty>
<pref-width>10</pref-width>
</empty>
<group>
<layout>vbox</layout>
<!-- <checkbox>
<halign>left</halign>
<label>Enable ATC</label>
<property>/sim/atc/enabled</property>
</checkbox> -->
<checkbox>
<halign>left</halign>
<label>Enable AI traffic</label>
<property>/sim/ai-traffic/enabled</property>
</checkbox>
<group>
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>AI traffic density:</label>
</text>
<combo>
<halign>left</halign>
<property>/sim/ai-traffic/level</property>
<value>1</value>
<value>2</value>
<value>3</value>
</combo>
</group>
</group>
<empty>
<stretch>true</stretch>
</empty>
</group>
</PropertyList>

2
gui/dialogs/view.xml
View file

@ -6,7 +6,7 @@
<layout>vbox</layout> <layout>vbox</layout>
<text> <text>
<label>Configure Active Views</label> <label>Choose Active Views</label>
</text> </text>
<hrule/> <hrule/>

305
gui/menubar.xml
View file

@ -1,10 +1,10 @@
<PropertyList> <PropertyList>
<menu> <menu>
<label>File</label> <label>General</label>
<item> <item>
<label>Load</label> <label>Load Flight (Shift-F1)</label>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>gui.load_flight()</script> <script>gui.load_flight()</script>
@ -12,33 +12,51 @@
</item> </item>
<item> <item>
<label>Save</label> <label>Save Flight (Shift-F2)</label>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>gui.save_flight()</script> <script>gui.save_flight()</script>
</binding> </binding>
</item> </item>
<!--
<item> <item>
<label>Reset</label> <label>Scenario</label>
<binding>
<command>dialog-show</command>
<dialog-name>scenario</dialog-name>
</binding>
</item>
-->
<item>
<label>Reset (Shift-Esc)</label>
<binding> <binding>
<command>reset</command> <command>reset</command>
</binding> </binding>
</item> </item>
<item> <!-- <item>
<label>Set Lat/Lon Format</label>
<binding>
<command>nasal</command>
<script>
var f = getprop(var d = "/sim/lon-lat-format") + 1;
setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
</script>
</binding>
</item>
<label>High-Res Snapshot</label> <label>High-Res Snapshot</label>
<enabled>false</enabled> <enabled>false</enabled>
<binding> <binding>
<command>hires-screen-capture</command> <command>hires-screen-capture</command>
</binding> </binding>
</item> </item>
-->
<item> <item>
<label>Snapshot</label> <label>Screenshot (F3)</label>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
gui.popdown();
var success = fgcommand("screen-capture"); var success = fgcommand("screen-capture");
var path = getprop("/sim/paths/screenshot-last"); var path = getprop("/sim/paths/screenshot-last");
if (success) if (success)
@ -48,14 +66,27 @@
</script> </script>
</binding> </binding>
</item> </item>
<!--
<item>
<label>Last snapshot</label>
<binding>
<command>nasal</command>
<script>
var path = getprop("/sim/paths/screenshot-last");
if (path != nil) gui.popupTip(...) else gui.popupTip("no screenshots yet in this session")
gui.popupTip("Screenshot written to '" ~ path ~ "'");
</script>
</binding>
</item>
<item> <item>
<label>Print Screen</label> <label>Print Screen (F3)</label>
<binding> <binding>
<command>old-print-dialog</command> <command>old-print-dialog</command>
</binding> </binding>
</item> </item>
-->
<item> <item>
<label>Sound Configuration</label> <label>Sound Configuration</label>
<binding> <binding>
@ -65,23 +96,7 @@
</item> </item>
<item> <item>
<label>Browse Internal Properties</label> <label>Quit (Esc)</label>
<binding>
<command>nasal</command>
<script>gui.property_browser()</script>
</binding>
</item>
<item>
<label>Logging</label>
<binding>
<command>dialog-show</command>
<dialog-name>logging</dialog-name>
</binding>
</item>
<item>
<label>Quit</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>exit</dialog-name> <dialog-name>exit</dialog-name>
@ -108,7 +123,16 @@
</binding> </binding>
</item> </item>
<item> <item><!-- <item>
<label>Set Lat/Lon Format</label>
<binding>
<command>nasal</command>
<script>
var f = getprop(var d = "/sim/lon-lat-format") + 1;
setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
</script>
</binding>
</item> -->
<label>View Options</label> <label>View Options</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
@ -124,6 +148,14 @@
</binding> </binding>
</item> </item>
<item>
<label>Adjust LOD Ranges</label>
<binding>
<command>dialog-show</command>
<dialog-name>static-lod</dialog-name>
</binding>
</item>
<item> <item>
<label>Adjust View Position</label> <label>Adjust View Position</label>
<binding> <binding>
@ -141,28 +173,24 @@
</item> </item>
<item> <item>
<label>Instant Replay</label> <label>Toggle Glide Slope Tunnel</label>
<binding>
<command>nasal</command>
<script>
var p = "/sim/rendering/glide-slope-tunnel";
setprop(p, var i = !getprop(p));
gui.popupTip("Glide slope tunnel " ~ (i ? "enabled" : "disabled"));
</script>
</binding>
</item>
<item>
<label>Instant Replay (Ctrl-R)</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>replay</dialog-name> <dialog-name>replay</dialog-name>
</binding> </binding>
</item> </item>
<item>
<label>Adjust LOD Ranges</label>
<binding>
<command>dialog-show</command>
<dialog-name>static-lod</dialog-name>
</binding>
</item>
<item>
<label>OSG Display Settings</label>
<binding>
<command>dialog-show</command>
<dialog-name>osg-display-settings</dialog-name>
</binding>
</item>
</menu> </menu>
<menu> <menu>
@ -193,7 +221,7 @@
</item> </item>
<item> <item>
<label>Random Attitude</label> <label>Random Attitude</label>H
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/presets/trim</property> <property>/sim/presets/trim</property>
@ -234,7 +262,7 @@
<name>autopilot</name> <name>autopilot</name>
<item> <item>
<label>Autopilot Settings</label> <label>Autopilot Settings (F11)</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>autopilot</dialog-name> <dialog-name>autopilot</dialog-name>
@ -264,25 +292,6 @@
<script>setprop("/autopilot/route-manager/input", "@next")</script> <script>setprop("/autopilot/route-manager/input", "@next")</script>
</binding> </binding>
</item> </item>
<item>
<label>Set Lat/Lon Format</label>
<binding>
<command>nasal</command>
<script>
var f = getprop(var d = "/sim/lon-lat-format") + 1;
setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
</script>
</binding>
</item>
<item>
<label>Map</label>
<binding>
<command>dialog-show</command>
<dialog-name>map</dialog-name>
</binding>
</item>
</menu> </menu>
<menu> <menu>
@ -312,14 +321,6 @@
</binding> </binding>
</item> </item>
<item>
<label>Time Settings</label>
<binding>
<command>dialog-show</command>
<dialog-name>timeofday</dialog-name>
</binding>
</item>
<item> <item>
<label>Rain/Snow Settings</label> <label>Rain/Snow Settings</label>
<binding> <binding>
@ -328,14 +329,6 @@
</binding> </binding>
</item> </item>
<item>
<label>Wildfire Settings</label>
<binding>
<command>nasal</command>
<script>wildfire.dialog.show()</script>
</binding>
</item>
<item> <item>
<label>Local Weather</label> <label>Local Weather</label>
<binding> <binding>
@ -351,11 +344,45 @@
<dialog-name>local_weather_tiles</dialog-name> <dialog-name>local_weather_tiles</dialog-name>
</binding> </binding>
</item> </item>
<item>
<label>Time Settings</label>
<binding>
<command>dialog-show</command>
<dialog-name>timeofday</dialog-name>
</binding>
</item>
<item>
<label>Wildfire Settings</label>
<binding>
<command>nasal</command>
<script>wildfire.dialog.show()</script>
</binding>
</item>
</menu> </menu>
<menu> <menu>
<label>Equipment</label> <label>Equipment</label>
<item>
<label>Map</label>
<binding>
<command>dialog-show</command>
<dialog-name>map</dialog-name>
</binding>
</item>
<item>
<label>Stopwatch</label>
<binding>
<command>dialog-show</command>
<dialog-name>stopwatch-dialog</dialog-name>
</binding>
</item>
<item> <item>
<label>Fuel and Payload</label> <label>Fuel and Payload</label>
<name>fuel-and-payload</name> <name>fuel-and-payload</name>
@ -366,7 +393,7 @@
</item> </item>
<item> <item>
<label>Radio Settings</label> <label>Radio Settings (F12)</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>radios</dialog-name> <dialog-name>radios</dialog-name>
@ -389,12 +416,10 @@
</binding> </binding>
</item> </item>
<item> <item>
<label>Stopwatch</label> <label> --- Failures ---</label>
<binding>
<command>dialog-show</command>
<dialog-name>stopwatch-dialog</dialog-name>
</binding>
</item> </item>
<item> <item>
@ -424,24 +449,25 @@
<menu> <menu>
<label>ATC/AI</label> <label>ATC/AI</label>
<item> <item>
<label>Frequencies</label> <label>ATC Options</label>
<binding>
<command>dialog-show</command>
<dialog-name>ai</dialog-name>
</binding>
</item>
<!-- Not working at present
<item>
<label>ATC Services in range</label>
<binding> <binding>
<command>ATC-freq-search</command> <command>ATC-freq-search</command>
</binding> </binding>
</item> </item>
<item> -->
<label>Options</label>
<binding>
<command>dialog-show</command>
<dialog-name>atc-ai</dialog-name>
</binding>
</item>
<item> <item>
<label>Tanker</label> <label>AI Tanker</label>
<name>tanker</name> <name>tanker</name>
<enabled>false</enabled> <enabled>false</enabled>
<binding> <binding>
@ -451,20 +477,31 @@
</item> </item>
<item> <item>
<label>Scenario</label> <label>AI Carrier Options</label>
<binding>
<command>dialog-show</command>
<dialog-name>AIcarrier</dialog-name>
</binding>
</item>
<item>
<label>AI Scenario Select - takes effect on next run </label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>scenario</dialog-name> <dialog-name>scenario</dialog-name>
</binding> </binding>
</item> </item>
</menu> </menu>
<menu> <menu>
<label>Network</label> <label>Multiplayer</label>
<name>multiplayer</name> <name>multiplayer</name>
<item> <item>
<label>Chat</label> <label>Chat Dialog</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>chat-full</dialog-name> <dialog-name>chat-full</dialog-name>
@ -500,6 +537,8 @@
</script> </script>
</binding> </binding>
</item> </item>
</menu> </menu>
<menu> <menu>
@ -600,20 +639,42 @@
<step type="int">1</step> <step type="int">1</step>
</binding> </binding>
</item> </item>
<item>
<label>Browse Internal Properties</label>
<binding>
<command>nasal</command>
<script>gui.property_browser()</script>
</binding>
</item>
<item>
<label>Logging</label>
<binding>
<command>dialog-show</command>
<dialog-name>logging</dialog-name>
</binding>
</item>
<item>
<label>OSG Display Settings</label>
<binding>
<command>dialog-show</command>
<dialog-name>osg-display-settings</dialog-name>
</binding>
</item>
</menu> </menu>
<menu> <menu>
<label>Help</label> <label>Help</label>
<item> <item>
<label>About</label> <label>Help (opens in browser)</label>
<binding>
<command>dialog-show</command>
<dialog-name>about</dialog-name>
</binding>
</item>
<item>
<label>Help</label>
<binding> <binding>
<command>old-help-dialog</command> <command>old-help-dialog</command>
</binding> </binding>
@ -629,7 +690,11 @@
</item> </item>
<item> <item>
<label>Basic Keys</label> <label> --- Key Reference ---</label>
</item>
<item>
<label>Basic Simulator Keys</label>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>gui.showHelpDialog("/sim/help/basic")</script> <script>gui.showHelpDialog("/sim/help/basic")</script>
@ -645,7 +710,7 @@
</item> </item>
<item> <item>
<label>Aircraft Help</label> <label> Current Aircraft Keys (?)</label>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>gui.showHelpDialog("/sim/help")</script> <script>gui.showHelpDialog("/sim/help")</script>
@ -653,15 +718,7 @@
</item> </item>
<item> <item>
<label>Toggle Glide Slope Tunnel</label> <label> ---------------------</label>
<binding>
<command>nasal</command>
<script>
var p = "/sim/rendering/glide-slope-tunnel";
setprop(p, var i = !getprop(p));
gui.popupTip("Glide slope tunnel " ~ (i ? "enabled" : "disabled"));
</script>
</binding>
</item> </item>
<item> <item>
@ -682,6 +739,14 @@
<script>tutorial.stopTutorial()</script> <script>tutorial.stopTutorial()</script>
</binding> </binding>
</item> </item>
<item>
<label>About</label>
<binding>
<command>dialog-show</command>
<dialog-name>about</dialog-name>
</binding>
</item>
</menu> </menu>
</PropertyList> </PropertyList>

2
keyboard.xml
View file

@ -272,7 +272,7 @@ top down before the key bindings are parsed.
<key n="32"> <key n="32">
<name>SPACE</name> <name>SPACE</name>
<desc>PTT - Push To Talk (via VoIP)</desc> <desc>PTT - Push To Talk (via FGCom)</desc>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>space(1, modifiers.getValue())</script> <script>space(1, modifiers.getValue())</script>