From d51a79ba5bf9d28264a1a1945a8f566b9e108b9d Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Tue, 1 May 2012 11:10:37 +0200
Subject: [PATCH] Improve MP dialog and add option to configure AI traffic

---
 Translations/de/menu.xml    |  3 +-
 Translations/de/options.xml |  2 +-
 Translations/en/menu.xml    |  3 +-
 gui/dialogs/multiplayer.xml | 68 +++++++++++++++++++++++++++++--------
 gui/dialogs/scenario.xml    | 30 ++++++++++------
 gui/menubar.xml             | 35 ++++++++-----------
 6 files changed, 92 insertions(+), 49 deletions(-)

diff --git a/Translations/de/menu.xml b/Translations/de/menu.xml
index 8bcf5bff2..fc93df00a 100644
--- a/Translations/de/menu.xml
+++ b/Translations/de/menu.xml
@@ -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 -->
diff --git a/Translations/de/options.xml b/Translations/de/options.xml
index d1cc453d5..a739b7012 100644
--- a/Translations/de/options.xml
+++ b/Translations/de/options.xml
@@ -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 -->
diff --git a/Translations/en/menu.xml b/Translations/en/menu.xml
index 215dfa733..8b6c4a0e6 100644
--- a/Translations/en/menu.xml
+++ b/Translations/en/menu.xml
@@ -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 -->
diff --git a/gui/dialogs/multiplayer.xml b/gui/dialogs/multiplayer.xml
index ec3ee8742..2c68f7e80 100644
--- a/gui/dialogs/multiplayer.xml
+++ b/gui/dialogs/multiplayer.xml
@@ -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,22 +132,23 @@
             <value>mpserver12.flightgear.org (Amsterdam, Netherlands)</value>
             <value>mpserver13.flightgear.org (Grenoble, France)</value>
         </combo>
-    <!-- status area -->
+
+        <!-- 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>
+            <label>Not connected</label>
         </text>
-        
+
         <text>
             <visible>
                 <property>/sim/multiplay/online</property>
             </visible>
-            <row>3</row>
+            <row>5</row>
             <col>1</col>
             <halign>left</halign>
             <label>MMMMMMMMMMMMMMMMM</label>
@@ -123,7 +157,8 @@
             <live>true</live>
         </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>
diff --git a/gui/dialogs/scenario.xml b/gui/dialogs/scenario.xml
index abc852a3a..b6c92c2af 100644
--- a/gui/dialogs/scenario.xml
+++ b/gui/dialogs/scenario.xml
@@ -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>
@@ -50,14 +50,25 @@
   <hrule/>
 
   <checkbox>
-	<halign>left</halign>
-	<label>Enable AI scenarios</label>
-	<name>enable-ai-scenarios</name>
-	<property>/sim/ai/scenarios-enabled</property>
-	<binding>
-		<command>dialog-apply</command>
-		<object-name>enable-ai-scenarios</object-name>
-	</binding>
+    <halign>left</halign>
+    <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>
+        <command>dialog-apply</command>
+        <object-name>enable-ai-scenarios</object-name>
+    </binding>
   </checkbox>
 
   <text><label/></text>
@@ -71,7 +82,6 @@
 
   <hrule/>
 
-
   <group>
     <layout>hbox</layout>
 
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 01444638b..20acca9b6 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -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>
@@ -521,7 +515,7 @@
 				<dialog-name>multiplayer</dialog-name>
 			</binding>
 		</item>
-		
+
 		<item>
 			<label>Chat Dialog</label>
 			<name>mp-chat</name>
@@ -598,7 +592,6 @@
 			</binding>
 		</item>
 
-
 		<item>
 			<name>reload-panel</name>
 			<label>Reload Panel</label>