From 2a44dba040b88f76c180ad0e7724abd48a9a625d Mon Sep 17 00:00:00 2001
From: Julian Smith <jules@op59.net>
Date: Fri, 19 Jun 2020 23:06:15 +0100
Subject: [PATCH] Created new dialogue to control flight recorder.

New dialogue is accesible from the File menu.

Allows enable/disable of three new features: multiplayer record, continuous
record and recovery snapshot. Also moved load/save tape from the file menu into
the new dialogue.

Also removed recently-added flight recorder items from the multiplayer dialogue.

The recovery snapshot interval is 1s second if enabled. Might be better to make
it longer, e.g. 5s, but don't know how to change checkbox value.
---
 Translations/default/menu.xml   |   1 +
 gui/dialogs/flight-recorder.xml | 115 ++++++++++++++++++++++++++++++++
 gui/dialogs/multiplayer.xml     |  28 --------
 gui/menubar.xml                 |  14 +---
 4 files changed, 118 insertions(+), 40 deletions(-)
 create mode 100644 gui/dialogs/flight-recorder.xml

diff --git a/Translations/default/menu.xml b/Translations/default/menu.xml
index e5ee85f78..65b2e061d 100644
--- a/Translations/default/menu.xml
+++ b/Translations/default/menu.xml
@@ -7,6 +7,7 @@
 	<!-- File menu -->
 	<file>File</file>
 	<reset>Reset</reset>
+        <flight-recorder-control>Flight Recorder Control</flight-recorder-control>
 	<load-tape>Load Flight Recorder Tape</load-tape>
 	<save-tape>Save Flight Recorder Tape</save-tape>
 	<snap-shot>Screenshot</snap-shot>
diff --git a/gui/dialogs/flight-recorder.xml b/gui/dialogs/flight-recorder.xml
new file mode 100644
index 000000000..2affcbca9
--- /dev/null
+++ b/gui/dialogs/flight-recorder.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+    
+    <name>flight-recorder-control</name>
+    <layout>vbox</layout>
+    
+    <!-- titlebar -->
+    <group>
+        <layout>hbox</layout>
+        <empty><stretch>1</stretch></empty>
+
+        <text>
+            <label>Flight Recorder Control</label>
+        </text>
+
+        <empty><stretch>1</stretch></empty>
+
+        <button>
+            <pref-width>16</pref-width>
+            <pref-height>16</pref-height>
+            <legend></legend>
+            <keynum>27</keynum>
+            <border>2</border>
+            <binding>
+                <command>dialog-close</command>
+            </binding>
+        </button>
+    </group>
+
+    <hrule/>
+    
+    <group>
+
+        <layout>table</layout>
+        
+        <checkbox>
+            <row>0</row>
+            <col>0</col>
+            <property>sim/replay/multiplayer</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+        <text>
+            <row>0</row>
+            <col>1</col>
+            <label>Include multiplayer aircraft in recordings</label>
+            <halign>left</halign>
+        </text>
+    
+        <checkbox>
+            <row>1</row>
+            <col>0</col>
+            <property>sim/replay/record-continuous</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+        <text>
+            <row>1</row>
+            <col>1</col>
+            <label>Continuous record to file</label>
+            <halign>left</halign>
+        </text>
+    
+        <checkbox>
+            <row>2</row>
+            <col>0</col>
+            <property>sim/replay/recovery-period</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+        <text>
+            <row>2</row>
+            <col>1</col>
+            <label>Maintain recovery snapshot</label>
+            <halign>left</halign>
+        </text>
+        
+        <button>
+            <row>4</row>
+            <col>0</col>
+            <legend>Load ...</legend>
+            <binding>
+                <command>dialog-show</command>
+                <dialog-name>flight-recorder-load</dialog-name>
+            </binding>
+        </button>
+        <text>
+            <row>4</row>
+            <col>1</col>
+            <label>Load Flight Recorder Tape</label>
+            <halign>left</halign>
+        </text>
+        
+        <button>
+            <row>5</row>
+            <col>0</col>
+            <legend>Save ...</legend>
+            <binding>
+                <command>dialog-show</command>
+                <dialog-name>flight-recorder-save</dialog-name>
+            </binding>
+        </button>
+        <text>
+            <row>5</row>
+            <col>1</col>
+            <label>Save Flight Recorder Tape</label>
+            <halign>left</halign>
+        </text>
+    </group>
+
+</PropertyList>
diff --git a/gui/dialogs/multiplayer.xml b/gui/dialogs/multiplayer.xml
index 67b3c6eaa..1b98dd2a5 100644
--- a/gui/dialogs/multiplayer.xml
+++ b/gui/dialogs/multiplayer.xml
@@ -167,34 +167,6 @@
             </binding>
         </checkbox>
 
-        <checkbox>
-            <row>2</row>
-            <col>1</col>
-            <colspan>2</colspan>
-            <halign>left</halign>
-            <name>multiplayer-record</name>
-            <label>Include multiplayer aircraft in recordings</label>
-            <property>/sim/replay/multiplayer</property>
-            <binding>
-                <command>dialog-apply</command>
-                <object-name>multiplayer-record</object-name>
-            </binding>
-        </checkbox>
-
-        <checkbox>
-            <row>3</row>
-            <col>1</col>
-            <colspan>2</colspan>
-            <halign>left</halign>
-            <name>record-continuous</name>
-            <label>Continuous record to file</label>
-            <property>sim/replay/record-continuous</property>
-            <binding>
-                <command>dialog-apply</command>
-                <object-name>record-continuous</object-name>
-            </binding>
-        </checkbox>
-
         <checkbox>
             <row>4</row>
             <col>1</col>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 885f1346b..3828cb1be 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -13,20 +13,10 @@
 		</item>
 
 		<item>
-			<name>load-tape</name>
-			<key>Shift-F1</key>
+			<name>flight-recorder-control</name>
 			<binding>
 				<command>dialog-show</command>
-				<dialog-name>flight-recorder-load</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<name>save-tape</name>
-			<key>Shift-F2</key>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>flight-recorder-save</dialog-name>
+				<dialog-name>flight-recorder-control</dialog-name>
 			</binding>
 		</item>