From a8ab993ef2c8c68151a73532eb7094e4db105166 Mon Sep 17 00:00:00 2001
From: david <david>
Date: Fri, 24 Jan 2003 03:20:11 +0000
Subject: [PATCH] Use an XML-configured exit dialog.

---
 gui/dialogs/exit.xml | 38 +++++++++++++++++++++++++++++
 gui/menubar.xml      | 58 ++++----------------------------------------
 keyboard.xml         |  3 ++-
 3 files changed, 45 insertions(+), 54 deletions(-)
 create mode 100644 gui/dialogs/exit.xml

diff --git a/gui/dialogs/exit.xml b/gui/dialogs/exit.xml
new file mode 100644
index 000000000..ba3c79e0a
--- /dev/null
+++ b/gui/dialogs/exit.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+ <name>exit</name>
+ <width>180</width>
+ <height>100</height>
+ <modal>true</modal>
+
+ <text>
+  <x>10</x>
+  <y>70</y>
+  <label>Exit FlightGear?</label>
+ </text>
+
+ <button>
+  <x>10</x>
+  <y>10</y>
+  <legend>Exit</legend>
+  <default>true</default>
+  <binding>
+   <command>exit</command>
+  </binding>
+  <binding>
+   <command>dialog-close</command>
+  </binding>
+ </button>
+
+ <button>
+  <x>100</x>
+  <y>10</y>
+  <legend>Cancel</legend>
+  <binding>
+   <command>dialog-close</command>
+  </binding>
+ </button>
+
+</PropertyList>
\ No newline at end of file
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 6a4366f78..9795e046d 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -48,7 +48,8 @@
   <item>
    <label>Quit</label>
    <binding>
-    <command>exit</command>
+    <command>dialog-show</command>
+    <dialog-name>exit</dialog-name>
    </binding>
   </item>
 
@@ -79,17 +80,10 @@
    </binding>
   </item>
 
-  <item>
-   <label>Browse Internal Properties</label>
-   <binding>
-    <command>old-properties-dialog</command>
-   </binding>
-  </item>
-
  </menu>
 
  <menu>
-  <label>Presets</label>
+  <label>State</label>
 
   <item>
    <label>Preset Values</label>
@@ -98,53 +92,11 @@
     <dialog-name>presets</dialog-name>
    </binding>
   </item>
-  
-  <item>
-   <label>Preset Airport</label>
-   <binding>
-    <command>old-preset-airport-dialog</command>
-   </binding>
-  </item>
 
   <item>
-   <label>Preset Runway</label>
+   <label>Browse Internal Properties</label>
    <binding>
-    <command>old-preset-runway-dialog</command>
-   </binding>
-  </item>
-
-  <item>
-   <label>Preset Offset Distance</label>
-   <binding>
-    <command>old-preset-offset-distance-dialog</command>
-   </binding>
-  </item>
-
-  <item>
-   <label>Preset Altitude</label>
-   <binding>
-    <command>old-preset-altitude-dialog</command>
-   </binding>
-  </item>
-
-  <item>
-   <label>Preset Glideslope</label>
-   <binding>
-    <command>old-preset-glideslope-dialog</command>
-   </binding>
-  </item>
-
-  <item>
-   <label>Preset Airspeed</label>
-   <binding>
-    <command>old-preset-airspeed-dialog</command>
-   </binding>
-  </item>
-
-  <item>
-   <label>Commit Presets</label>
-   <binding>
-    <command>old-preset-commit-dialog</command>
+    <command>old-properties-dialog</command>
    </binding>
   </item>
 
diff --git a/keyboard.xml b/keyboard.xml
index 1f37828f9..fc66eb89b 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -116,7 +116,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <name>ESC</name>
   <desc>Prompt and quit FlightGear.</desc>
   <binding>
-    <command>exit</command>
+    <command>dialog-show</command>
+    <dialog-name>exit</dialog-name>
   </binding>
  </key>