fly/fgdata
1
0
Fork 0
Code Activity

Improve MP dialog and add option to configure AI traffic

Browse source
This commit is contained in:
ThorstenB 2012-05-01 11:10:37 +02:00
parent 6775ecdfd2
commit d51a79ba5b
6 changed files with 92 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Translations/de/menu.xml
View file

@ -59,10 +59,11 @@
<!-- AI menu -->
<ai>KI</ai>
<scenario>Flugverkehr und Szenarien</scenario>
<atc-in-range>ATC Stationen in der Nähe</atc-in-range>
<wingman>Steuerung Flügelmann</wingman>
<tanker>Steuerung Tanker</tanker>
<carrier>Steuerung Flugzeugträger</carrier>
<scenario>Auswahl der KI Szenarien (Neustart notwendig)</scenario>
<jetway>Steuerung Fluggastbrücke</jetway>
<!-- Equipment -->

2
Translations/de/options.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!-- FlightGear options translations for German -->
<!-- FlightGear options: German language resource -->
<PropertyList>
<!-- Fall back -->

3
Translations/en/menu.xml
View file

@ -62,10 +62,11 @@
<!-- AI menu -->
<ai>AI</ai>
<scenario>Traffic and Scenario Settings</scenario>
<atc-in-range>ATC Services in Range</atc-in-range>
<wingman>Wingman Controls</wingman>
<tanker>Tanker Controls</tanker>
<carrier>Carrier Controls</carrier>
<scenario>Scenario Select (requires restart)</scenario>
<jetway>Jetway Settings</jetway>
<!-- Multiplayer menu -->

60
gui/dialogs/multiplayer.xml
View file

@ -51,16 +51,52 @@
</group>
<hrule/>
<!-- main dialog area -->
<group>
<layout>table</layout>
<halign>center</halign>
<text>
<row>0</row><col>0</col>
<row>0</row>
<col>0</col>
<label>Options:</label>
<halign>right</halign>
</text>
<checkbox>
<row>0</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<name>hide-replay</name>
<label>Hide replay sessions over MP (less annoying to other players)</label>
<property>/sim/multiplay/freeze-on-replay</property>
<binding>
<command>dialog-apply</command>
<object-name>hide-replay</object-name>
</binding>
</checkbox>
<checkbox>
<row>1</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<name>ai-traffic</name>
<label>Show AI Traffic (mixing MP and AI traffic may be confusing)</label>
<property>/sim/traffic-manager/enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>ai-traffic</object-name>
</binding>
</checkbox>
<text>
<row>2</row><col>0</col>
<halign>right</halign>
<label>Callsign:</label>
</text>
<input>
<row>0</row><col>1</col>
<row>2</row><col>1</col>
<halign>left</halign>
<property>/sim/multiplay/callsign</property>
<enable>
@ -69,19 +105,16 @@
</not>
</enable>
</input>
<text>
<row>0</row><col>2</col>
<halign>left</halign>
<label>(requires reconnect)</label>
</text>
<text>
<row>1</row><col>0</col>
<row>3</row><col>0</col>
<halign>right</halign>
<label>Server:</label>
</text>
<combo>
<name>host</name>
<row>1</row><col>1</col>
<halign>left</halign>
<row>3</row><col>1</col>
<colspan>2</colspan>
<pref-width>350</pref-width>
<property>/sim/multiplay/selected-server</property>
@ -99,12 +132,13 @@
<value>mpserver12.flightgear.org (Amsterdam, Netherlands)</value>
<value>mpserver13.flightgear.org (Grenoble, France)</value>
</combo>
<!-- status area -->
<text>
<visible>
<not><property>/sim/multiplay/online</property></not>
</visible>
<row>3</row>
<row>5</row>
<col>1</col>
<halign>left</halign>
<label>Not connected</label>
@ -114,7 +148,7 @@
<visible>
<property>/sim/multiplay/online</property>
</visible>
<row>3</row>
<row>5</row>
<col>1</col>
<halign>left</halign>
<label>MMMMMMMMMMMMMMMMM</label>
@ -124,6 +158,7 @@
</text>
</group>
<!-- button area -->
<hrule/>
<group>
<layout>hbox</layout>
@ -160,6 +195,7 @@
<subsystem>mp</subsystem>
</binding>
</button>
<button>
<legend>Disconnect</legend>
<equal>true</equal>
@ -180,6 +216,7 @@
<subsystem>mp</subsystem>
</binding>
</button>
<button>
<row>1</row><col>2</col>
<legend>Server Status</legend>
@ -188,6 +225,7 @@
<path>http://mpmap01.flightgear.org/mpstatus/</path>
</binding>
</button>
<button>
<legend>Close</legend>
<default>true</default>

16
gui/dialogs/scenario.xml
View file

@ -30,7 +30,7 @@
<empty><stretch>true</stretch></empty>
<text>
<label>AI Scenario Selection</label>
<label>AI Traffic and Scenario Settings</label>
</text>
<empty><stretch>true</stretch></empty>
@ -51,7 +51,18 @@
<checkbox>
<halign>left</halign>
<label>Enable AI scenarios</label>
<label>Enable AI traffic</label>
<name>enable-ai-traffic</name>
<property>/sim/traffic-manager/enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>enable-ai-traffic</object-name>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Enable AI scenarios (requires restart)</label>
<name>enable-ai-scenarios</name>
<property>/sim/ai/scenarios-enabled</property>
<binding>
@ -71,7 +82,6 @@
<hrule/>
<group>
<layout>hbox</layout>

33
gui/menubar.xml
View file

@ -22,14 +22,6 @@
<script>gui.save_flight()</script>
</binding>
</item>
<item>
<label>Scenario</label>
<binding>
<command>dialog-show</command>
<dialog-name>scenario</dialog-name>
</binding>
</item>
-->
<item>
<name>reset</name>
@ -39,8 +31,8 @@
<command>reset</command>
</binding>
</item>
<!-- <item>
<!--
<item>
<label>High-Res Snapshot</label>
<enabled>false</enabled>
<binding>
@ -60,6 +52,7 @@
</script>
</binding>
</item>
<item>
<name>snap-shot-dir</name>
<label>Screenshot Directory</label>
@ -452,6 +445,16 @@
<menu>
<name>ai</name>
<label>AI</label>
<item>
<label>Traffic and Scenario Settings</label>
<name>scenario</name>
<binding>
<command>dialog-show</command>
<dialog-name>scenario</dialog-name>
</binding>
</item>
<!-- Not working at present
<item>
<label>ATC Services in range</label>
@ -489,15 +492,6 @@
</binding>
</item>
<item>
<label>Scenario Select (requires restart)</label>
<name>scenario</name>
<binding>
<command>dialog-show</command>
<dialog-name>scenario</dialog-name>
</binding>
</item>
<item>
<label>Jetway Settings</label>
<name>jetway</name>
@ -598,7 +592,6 @@
</binding>
</item>
<item>
<name>reload-panel</name>
<label>Reload Panel</label>