From d6db41f31d00dae7861a8bf60f71d6556c6b4bbc Mon Sep 17 00:00:00 2001
From: sydadams <sydadams>
Date: Thu, 15 Oct 2009 03:25:05 +0000
Subject: [PATCH] Reorganized the rendering menu

---
 gui/dialogs/display.xml        | 104 ++++++++++++++++++++++++++
 gui/dialogs/rendering.xml      | 103 ++++++++++++++++++++------
 gui/dialogs/shader-options.xml | 131 ++++++---------------------------
 gui/dialogs/view.xml           |  13 +---
 gui/menubar.xml                |  20 +----
 5 files changed, 209 insertions(+), 162 deletions(-)
 create mode 100644 gui/dialogs/display.xml

diff --git a/gui/dialogs/display.xml b/gui/dialogs/display.xml
new file mode 100644
index 000000000..73c9c07db
--- /dev/null
+++ b/gui/dialogs/display.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+  <name>display</name>
+  <modal>false</modal>
+  <layout>vbox</layout>
+
+  <text>
+    <label>Display Options</label>
+  </text>
+
+  <hrule/>
+
+  <group>
+    <layout>vbox</layout>
+    <halign>center</halign>
+
+    <checkbox>
+      <halign>left</halign>
+      <label>Show frame rate</label>
+      <property>/sim/rendering/fps-display</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </checkbox>
+
+    <checkbox>
+      <halign>left</halign>
+      <label>Show chat messages</label>
+      <property>/sim/multiplay/chat-display</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </checkbox>
+
+    <checkbox>
+        <halign>left</halign>
+        <label>Enable view name popup</label>
+        <property>/sim/view-name-popup</property>
+        <binding>
+            <command>dialog-apply</command>
+        </binding>
+    </checkbox>
+
+    <checkbox>
+        <halign>left</halign>
+        <label>Toggle 2D Panel</label>
+        <binding>
+            <command>property-toggle</command>
+            <property>/sim/panel/visibility</property>
+        </binding>
+    </checkbox>
+
+    <checkbox>
+        <halign>left</halign>
+        <label>Allow 3d cockpit toggle</label>
+        <property>/sim/allow-toggle-cockpit</property>
+        <binding>
+            <command>dialog-apply</command>
+        </binding>
+    </checkbox>
+
+    <button>
+        <halign>center</halign>
+        <legend>Cycle HUD</legend>
+        <binding>
+            <command>nasal</command>
+            <script>aircraft.HUD.cycle_color()</script>
+        </binding>
+    </button>
+
+    <button>
+        <halign>center</halign>
+        <legend>Configure views</legend>
+        <binding>
+            <command>dialog-show</command>
+            <dialog-name>view</dialog-name>
+        </binding>
+    </button>
+
+    </group>
+
+  <hrule/>
+
+<group>
+    <layout>hbox</layout>
+    <empty><stretch>true</stretch></empty>
+
+    <button>
+      <legend>Close</legend>
+      <default>true</default>
+      <key>Esc</key>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+
+    <empty><stretch>true</stretch></empty>
+  </group>
+
+</PropertyList>
diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index 3b90ab927..cde74d930 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -15,24 +15,6 @@
     <layout>vbox</layout>
     <halign>center</halign>
 
-    <checkbox>
-      <halign>left</halign>
-      <label>Show frame rate</label>
-      <property>/sim/rendering/fps-display</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </checkbox>
-
-    <checkbox>
-      <halign>left</halign>
-      <label>Show chat messages</label>
-      <property>/sim/multiplay/chat-display</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </checkbox>
-
     <checkbox>
       <halign>left</halign>
       <label>Sun/Moon horizon effect</label>
@@ -98,21 +80,39 @@
 
     <checkbox>
       <halign>left</halign>
-      <label>Lightning</label>
-      <property>/sim/rendering/lightning-enable</property>
+      <label>Random vegetation</label>
+      <property>/sim/rendering/random-vegetation</property>
       <binding>
         <command>dialog-apply</command>
       </binding>
     </checkbox>
 
-    <checkbox>
+    <button>
+        <halign>center</halign>
+        <legend>Configure shader effects </legend>
+        <binding>
+            <command>dialog-show</command>
+            <dialog-name>shader-options</dialog-name>
+        </binding>
+    </button>
+
+    <!--checkbox>
+      <halign>left</halign>
+      <label>Lightning</label>
+      <property>/sim/rendering/lightning-enable</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </checkbox-->
+
+    <!--checkbox>
       <halign>left</halign>
       <label>Bump mapped clouds</label>
       <property>/sim/rendering/bump-mapping</property>
       <binding>
         <command>dialog-apply</command>
       </binding>
-    </checkbox>
+    </checkbox-->
   </group>
 
   <hrule/>
@@ -154,13 +154,70 @@
              <command>dialog-apply</command>
           </binding>
         </checkbox>
-
       </group>
     </group>
   </group>
 
   <hrule/>
 
+  <group>
+    <padding>8</padding>
+    <layout>vbox</layout>
+
+    <checkbox>
+      <padding>8</padding>
+      <halign>left</halign>
+      <label>Enable 3d clouds</label>
+      <property>/sim/rendering/clouds3d-enable</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </checkbox>
+
+    <group>
+      <layout>hbox</layout>
+      <halign>right</halign>
+      <text><label>Cloud density</label></text>
+      <slider>
+        <min>0</min>
+        <max>1.0</max>
+        <property>/sim/rendering/clouds3d-density</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </slider>
+      <text>
+        <label>12345678</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/clouds3d-density</property>
+      </text>
+    </group>
+
+    <group>
+      <layout>hbox</layout>
+      <halign>right</halign>
+      <text><label>Cloud visibility range</label></text>
+      <slider>
+        <min>100.0</min>
+        <max>20000.0</max>
+        <property>/sim/rendering/clouds3d-vis-range</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </slider>
+      <text>
+        <label>12345678</label>
+        <format>%.fm</format>
+        <live>true</live>
+        <property>/sim/rendering/clouds3d-vis-range</property>
+      </text>
+    </group>
+  </group>
+
+
+  <hrule/>
+
 <group>
     <layout>hbox</layout>
     <empty><stretch>true</stretch></empty>
diff --git a/gui/dialogs/shader-options.xml b/gui/dialogs/shader-options.xml
index fc58c114d..b76e572cb 100644
--- a/gui/dialogs/shader-options.xml
+++ b/gui/dialogs/shader-options.xml
@@ -17,127 +17,40 @@
     <hrule/>
 
     <group>
-        <text>
-            <label>Terrain Effects</label>
-        </text>
-
         <layout>vbox</layout>
         <halign>center</halign>
-
-        <checkbox>
-            <halign>left</halign>
-            <label>Random vegetation</label>
-            <property>/sim/rendering/random-vegetation</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-        </checkbox>
-
-        <checkbox>
-            <halign>left</halign>
-            <label>Crop texture</label>
-            <property>/sim/rendering/crop-shader</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-        </checkbox>
-
-        <checkbox>
-            <halign>left</halign>
-            <label>Landmass effects</label>
-            <property>/sim/rendering/landmass-shader</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-        </checkbox>
-    </group>
-
-    <hrule/>
-
-    <group>
-        <text>
-            <label>Atmosphere Effects</label>
-        </text>
-
-        <padding>8</padding>
-        <layout>vbox</layout>
-
-        <checkbox>
-            <padding>8</padding>
-            <halign>left</halign>
-            <label>Enable 3d clouds</label>
-            <property>/sim/rendering/clouds3d-enable</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-        </checkbox>
-
         <group>
             <layout>hbox</layout>
-            <halign>right</halign>
-            <text><label>Cloud density</label></text>
-            <slider>
-                <min>0</min>
-                <max>1.0</max>
-                <property>/sim/rendering/clouds3d-density</property>
+            <halign>left</halign>
+            <checkbox>
+                <halign>left</halign>
+                <label>Crop texture</label>
+                <property>/sim/rendering/crop-shader</property>
                 <binding>
                     <command>dialog-apply</command>
                 </binding>
-            </slider>
-            <text>
-                <label>12345678</label>
-                <format>%.2f</format>
-                <live>true</live>
-                <property>/sim/rendering/clouds3d-density</property>
-            </text>
-        </group>
-
-        <group>
-            <layout>hbox</layout>
-            <halign>right</halign>
-            <text><label>Cloud visibility range</label></text>
-            <slider>
-                <min>100.0</min>
-                <max>20000.0</max>
-                <property>/sim/rendering/clouds3d-vis-range</property>
+            </checkbox>
+            <checkbox>
+                <halign>left</halign>
+                <label>Landmass effects</label>
+                <property>/sim/rendering/landmass-shader</property>
                 <binding>
                     <command>dialog-apply</command>
                 </binding>
-            </slider>
-            <text>
-                <label>12345678</label>
-                <format>%.fm</format>
-                <live>true</live>
-                <property>/sim/rendering/clouds3d-vis-range</property>
-            </text>
+            </checkbox>
         </group>
-    </group>
-
-    <hrule/>
-
-    <group>
-        <text>
-            <label>Water Effects</label>
-        </text>
-        <layout>vbox</layout>
-        <halign>center</halign>
-
-        <checkbox>
+        <group>
+            <layout>hbox</layout>
             <halign>left</halign>
-            <label>Light reflection</label>
-            <property>/sim/rendering/water-shader</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-        </checkbox>
-    </group>
-
-    <hrule/>
-
-    <group>
-        <text>
-            <label>Model Effects</label>
-        </text>
+            <checkbox>
+                <halign>left</halign>
+                <label>Water reflection</label>
+                <property>/sim/rendering/water-shader</property>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+            </checkbox>
+        </group>
     </group>
 
     <hrule/>
diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml
index e6823ae19..d1c1a2ad7 100644
--- a/gui/dialogs/view.xml
+++ b/gui/dialogs/view.xml
@@ -11,18 +11,7 @@
 
 	<hrule/>
 
-	<checkbox>
-		<halign>left</halign>
-		<label>Enable view name popup</label>
-		<property>/sim/view-name-popup</property>
-		<binding>
-			<command>dialog-apply</command>
-		</binding>
-	</checkbox>
-
-	<hrule/>
-
-	<nasal>
+		<nasal>
 		<open>
 			var group = cmdarg().getNode("group");
 			var ac = getprop("/sim/aircraft");
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 569a4f224..eee1daa46 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -93,18 +93,10 @@
 		<label>View</label>
 
 		<item>
-			<label>Toggle 2D Panel</label>
-			<binding>
-				<command>property-toggle</command>
-				<property>/sim/panel/visibility</property>
-			</binding>
-		</item>
-
-		<item>
-			<label>View Options</label>
+			<label>Display Options</label>
 			<binding>
 				<command>dialog-show</command>
-				<dialog-name>view</dialog-name>
+				<dialog-name>display</dialog-name>
 			</binding>
 		</item>
 
@@ -116,14 +108,6 @@
 			</binding>
 		</item>
 
-		<item>
-			<label>Effects</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>shader-options</dialog-name>
-			</binding>
-		</item>
-
 		<item>
 			<label>Cockpit View Options</label>
 			<binding>