fly/fgdata
1
0
Fork 0
Code Activity

#365: names missing for some menu items which should be customizable

Browse source 
Some white-space clean-up.
This commit is contained in:
ThorstenB 2011-07-08 00:26:41 +02:00
parent 5fcbc61892
commit ae5f44dfe1
1 changed files with 71 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
gui/menubar.xml
View file

@ -21,12 +21,12 @@
</item> </item>
<item> <item>
<label>Scenario</label> <label>Scenario</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>
--> -->
<item> <item>
<label>Reset (Shift-Esc)</label> <label>Reset (Shift-Esc)</label>
@ -36,15 +36,15 @@
</item> </item>
<!-- <item> <!-- <item>
<label>Set Lat/Lon Format</label> <label>Set Lat/Lon Format</label>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
var f = getprop(var d = "/sim/lon-lat-format") + 1; var f = getprop(var d = "/sim/lon-lat-format") + 1;
setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f); setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
</script> </script>
</binding> </binding>
</item> </item>
<label>High-Res Snapshot</label> <label>High-Res Snapshot</label>
<enabled>false</enabled> <enabled>false</enabled>
<binding> <binding>
@ -64,15 +64,15 @@
</item> </item>
<!-- <!--
<item> <item>
<label>Last snapshot</label> <label>Last snapshot</label>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
var path = getprop("/sim/paths/screenshot-last"); var path = getprop("/sim/paths/screenshot-last");
if (path != nil) gui.popupTip(...) else gui.popupTip("no screenshots yet in this session") if (path != nil) gui.popupTip(...) else gui.popupTip("no screenshots yet in this session")
gui.popupTip("Screenshot written to '" ~ path ~ "'"); gui.popupTip("Screenshot written to '" ~ path ~ "'");
</script> </script>
</binding> </binding>
</item> </item>
@ -120,16 +120,16 @@
</item> </item>
<item> <item>
<!-- <item> <!-- <item>
<label>Set Lat/Lon Format</label> <label>Set Lat/Lon Format</label>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
var f = getprop(var d = "/sim/lon-lat-format") + 1; var f = getprop(var d = "/sim/lon-lat-format") + 1;
setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f); setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
</script> </script>
</binding> </binding>
</item> --> </item> -->
<label>View Options</label> <label>View Options</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
@ -277,6 +277,7 @@
<item> <item>
<label>Route Manager</label> <label>Route Manager</label>
<name>route-manager</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>route-manager</dialog-name> <dialog-name>route-manager</dialog-name>
@ -285,6 +286,7 @@
<item> <item>
<label>Previous Waypoint</label> <label>Previous Waypoint</label>
<name>previous-waypoint</name>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>setprop("/autopilot/route-manager/input", "@previous")</script> <script>setprop("/autopilot/route-manager/input", "@previous")</script>
@ -293,6 +295,7 @@
<item> <item>
<label>Next Waypoint</label> <label>Next Waypoint</label>
<name>next-waypoint</name>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>setprop("/autopilot/route-manager/input", "@next")</script> <script>setprop("/autopilot/route-manager/input", "@next")</script>
@ -302,6 +305,7 @@
<menu> <menu>
<label>Environment</label> <label>Environment</label>
<name>environment</name>
<!--<item> <!--<item>
<label>Weather Scenario</label> <label>Weather Scenario</label>
@ -321,6 +325,7 @@
<item> <item>
<label>Global Weather</label> <label>Global Weather</label>
<name>global-weather</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>weather</dialog-name> <dialog-name>weather</dialog-name>
@ -348,6 +353,7 @@
<item> <item>
<label>Time Settings</label> <label>Time Settings</label>
<name>time-settings</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>timeofday</dialog-name> <dialog-name>timeofday</dialog-name>
@ -356,6 +362,7 @@
<item> <item>
<label>Wildfire Settings</label> <label>Wildfire Settings</label>
<name>wildfire-settings</name>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>wildfire.dialog.show()</script> <script>wildfire.dialog.show()</script>
@ -364,6 +371,7 @@
<item> <item>
<label>Scenery Download</label> <label>Scenery Download</label>
<name>terrasync</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>terrasync</dialog-name> <dialog-name>terrasync</dialog-name>
@ -374,6 +382,7 @@
<menu> <menu>
<label>Equipment</label> <label>Equipment</label>
<name>equipment</name>
<item> <item>
<label>Map</label> <label>Map</label>
@ -386,6 +395,7 @@
<item> <item>
<label>Stopwatch</label> <label>Stopwatch</label>
<name>stopwatch</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>stopwatch-dialog</dialog-name> <dialog-name>stopwatch-dialog</dialog-name>
@ -421,14 +431,13 @@
<item> <item>
<label>Instrument Settings</label> <label>Instrument Settings</label>
<name>instrument-settings</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>instruments</dialog-name> <dialog-name>instruments</dialog-name>
</binding> </binding>
</item> </item>
<item> <item>
<label> --- Failures ---</label> <label> --- Failures ---</label>
<enabled>false</enabled> <enabled>false</enabled>
@ -436,6 +445,7 @@
<item> <item>
<label>Random Failures</label> <label>Random Failures</label>
<name>random-failures</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>random-failures</dialog-name> <dialog-name>random-failures</dialog-name>
@ -444,6 +454,7 @@
<item> <item>
<label>System Failures</label> <label>System Failures</label>
<name>system-failures</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>system-failures</dialog-name> <dialog-name>system-failures</dialog-name>
@ -452,6 +463,7 @@
<item> <item>
<label>Instrument Failures</label> <label>Instrument Failures</label>
<name>instrument-failures</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>instrument-failures</dialog-name> <dialog-name>instrument-failures</dialog-name>
@ -468,10 +480,11 @@
<command>ATC-freq-search</command> <command>ATC-freq-search</command>
</binding> </binding>
</item> </item>
--> -->
<item> <item>
<label>Wingman Controls</label> <label>Wingman Controls</label>
<name>wingman</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>formation</dialog-name> <dialog-name>formation</dialog-name>
@ -490,6 +503,7 @@
<item> <item>
<label>Carrier Controls</label> <label>Carrier Controls</label>
<name>carrier</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>AIcarrier</dialog-name> <dialog-name>AIcarrier</dialog-name>
@ -498,24 +512,21 @@
<item> <item>
<label>Scenario Select (requires restart)</label> <label>Scenario Select (requires restart)</label>
<name>scenario</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>scenario</dialog-name> <dialog-name>scenario</dialog-name>
</binding> </binding>
</item> </item>
<item> <item>
<label>Jetway Settings</label> <label>Jetway Settings</label>
<!-- <binding> <name>jetway</name>
<command>nasal</command>
<script>jetways.jetways.dialog()</script>
</binding>-->
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>jetways</dialog-name> <dialog-name>jetways</dialog-name>
</binding> </binding>
</item> </item>
</menu> </menu>
@ -523,8 +534,9 @@
<label>Multiplayer</label> <label>Multiplayer</label>
<name>multiplayer</name> <name>multiplayer</name>
<item> <item>
<label>Multiplayer settings</label> <label>Multiplayer settings</label>
<name>mp-settings</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>multiplayer</dialog-name> <dialog-name>multiplayer</dialog-name>
@ -533,6 +545,7 @@
<item> <item>
<label>Chat Dialog</label> <label>Chat Dialog</label>
<name>mp-chat</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>chat-full</dialog-name> <dialog-name>chat-full</dialog-name>
@ -541,6 +554,7 @@
<item> <item>
<label>Chat Menu (-)</label> <label>Chat Menu (-)</label>
<name>mp-chat-menu</name>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>chat-menu</dialog-name> <dialog-name>chat-menu</dialog-name>
@ -549,6 +563,7 @@
<item> <item>
<label>Pilot List</label> <label>Pilot List</label>
<name>mp-list</name>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>multiplayer.dialog.show()</script> <script>multiplayer.dialog.show()</script>
@ -557,6 +572,7 @@
<item> <item>
<label>MPCarrier Selection</label> <label>MPCarrier Selection</label>
<name>mp-carrier</name>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
@ -569,7 +585,6 @@
</binding> </binding>
</item> </item>
</menu> </menu>
<menu> <menu>
@ -726,13 +741,13 @@
</menu> </menu>
<menu> <menu>
<label>Help</label> <label>Help</label>
<name>help</name>
<item> <item>
<label>Help (opens in browser)</label> <label>Help (opens in browser)</label>
<name>help-browser</name>
<binding> <binding>
<command>old-help-dialog</command> <command>old-help-dialog</command>
</binding> </binding>
@ -740,6 +755,7 @@
<item> <item>
<label>Aircraft Help (?)</label> <label>Aircraft Help (?)</label>
<name>aircraft-keys</name>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>gui.showHelpDialog("/sim/help")</script> <script>gui.showHelpDialog("/sim/help")</script>
@ -757,19 +773,21 @@
<item> <item>
<label>Basic Simulator Keys</label> <label>Basic Simulator Keys</label>
<name>basic-keys</name>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>gui.showHelpDialog("/sim/help/basic")</script> <script>gui.showHelpDialog("/sim/help/basic")</script>
</binding> </binding>
</item> </item>
<item> <item>
<label>Common Aircraft Keys</label> <label>Common Aircraft Keys</label>
<binding> <name>common-keys</name>
<command>nasal</command> <binding>
<script>gui.showHelpDialog("/sim/help/common")</script> <command>nasal</command>
</binding> <script>gui.showHelpDialog("/sim/help/common")</script>
</item> </binding>
</item>
<item> <item>
<label>------------------</label> <label>------------------</label>