From bddac3cb7868d4af787ace320d10beda608fb54f Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Fri, 29 Jul 2011 20:54:56 +0200
Subject: [PATCH 1/2] Minor dialog text updates - Add unit of OSG display
 settings (unit is meters according to OSG docs). - "frame spacing" is more
 comprehensible

---
 gui/dialogs/display.xml                   | 2 +-
 gui/dialogs/stereoscopic-view-options.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gui/dialogs/display.xml b/gui/dialogs/display.xml
index f909dabc7..70657d8b3 100644
--- a/gui/dialogs/display.xml
+++ b/gui/dialogs/display.xml
@@ -45,7 +45,7 @@
 
     <checkbox>
       <halign>left</halign>
-      <label>Show worst-case frame latency</label>
+      <label>Show frame spacing</label>
       <property>/sim/rendering/frame-latency-display</property>
       <binding>
         <command>dialog-apply</command>
diff --git a/gui/dialogs/stereoscopic-view-options.xml b/gui/dialogs/stereoscopic-view-options.xml
index 537c4c052..19e7a1f01 100644
--- a/gui/dialogs/stereoscopic-view-options.xml
+++ b/gui/dialogs/stereoscopic-view-options.xml
@@ -77,7 +77,7 @@
       </slider>
       <text>
         <label>12345678</label>
-        <format>%.2f</format>
+        <format>%.2f m</format>
         <live>true</live>
         <property>/sim/rendering/osg-displaysettings/screen-distance</property>
       </text>
@@ -98,7 +98,7 @@
       </slider>
       <text>
         <label>12345678</label>
-        <format>%.2f</format>
+        <format>%.2f m</format>
         <live>true</live>
         <property>/sim/rendering/osg-displaysettings/eye-separation</property>
       </text>

From faa27266dcff80961b58b569213dde54d9154a35 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sun, 31 Jul 2011 13:13:37 +0200
Subject: [PATCH 2/2] #232: reintroduce "point sprites for runway lights"
 switch Make runway lights work when point sprites aren't enabled (mainly ATI)
 (also requires fg/sg update). Some white-space cleanup.

---
 gui/dialogs/rendering.xml | 164 +++++++++++++++++++-------------------
 1 file changed, 81 insertions(+), 83 deletions(-)

diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index e64e98e79..2bdd750cd 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -73,64 +73,64 @@
 			</checkbox>
 
 			<!--
+			<group>
+				<layout>hbox</layout>
+				<text>
+				<label>Lighting</label>
+				<halign>left</halign>
+				</text>
+				<hrule>
+				<stretch>true</stretch>
+				</hrule>
+			</group>
 
-	  <group>
-        <layout>hbox</layout>
-	    <text>
-          <label>Lighting</label>
-          <halign>left</halign>
-        </text>
-	    <hrule>
-          <stretch>true</stretch>
-        </hrule>
-	  </group>
+			<checkbox>
+				<halign>left</halign>
+				<label>Sun/Moon horizon effect</label>
+				<property>/sim/rendering/horizon-effect</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+			</checkbox>
+			-->
 
-      <checkbox>
-        <halign>left</halign>
-        <label>Sun/Moon horizon effect</label>
-        <property>/sim/rendering/horizon-effect</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
+			<checkbox>
+				<halign>left</halign>
+				<label>Use point sprites for runway lights (requires restart)</label>
+				<property>/sim/rendering/point-sprites</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+			</checkbox>
 
-      <checkbox>
-        <halign>left</halign>
-        <label>Use point sprites for runway lights</label>
-        <property>/sim/rendering/point-sprites</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
+			<!--
+			<checkbox>
+				<halign>left</halign>
+				<label>Enhanced runway lighting</label>
+				<property>/sim/rendering/enhanced-lighting</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+			</checkbox>
 
-      <checkbox>
-        <halign>left</halign>
-        <label>Enhanced runway lighting</label>
-        <property>/sim/rendering/enhanced-lighting</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
+			<checkbox>
+				<halign>left</halign>
+				<label>Runway light distance attenuation</label>
+				<property>/sim/rendering/distance-attenuation</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+			</checkbox>
 
-      <checkbox>
-        <halign>left</halign>
-        <label>Runway light distance attenuation</label>
-        <property>/sim/rendering/distance-attenuation</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-
-      <checkbox>
-        <halign>left</halign>
-        <label>Specular reflections on objects</label>
-        <property>/sim/rendering/specular-highlight</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-
-	  -->
+			<checkbox>
+				<halign>left</halign>
+				<label>Specular reflections on objects</label>
+				<property>/sim/rendering/specular-highlight</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+			</checkbox>
+			-->
 
 			<group>
 				<layout>hbox</layout>
@@ -167,16 +167,16 @@
 
 			<!--
 
-	  <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>Lightning</label>
+				<property>/sim/rendering/lightning-enable</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+			</checkbox>
 
-	  -->
+			-->
 
 			<checkbox>
 				<halign>left</halign>
@@ -207,16 +207,16 @@
 				</binding>
 			</checkbox>
 
-                        <checkbox>
-                                <halign>left</halign>
-                                <label>Animated jetways</label>
-                                <name>jetways</name>
-                                <property>/sim/jetways/enabled</property>
-                                <binding>
-                                        <command>dialog-apply</command>
-                                        <object-name>jetways</object-name>
-                                </binding>
-                        </checkbox>
+			<checkbox>
+				<halign>left</halign>
+				<label>Animated jetways</label>
+				<name>jetways</name>
+				<property>/sim/jetways/enabled</property>
+				<binding>
+					<command>dialog-apply</command>
+					<object-name>jetways</object-name>
+				</binding>
+			</checkbox>
 
 			<group>
 				<layout>hbox</layout>
@@ -231,16 +231,16 @@
 
 			<!--
 
-	  <checkbox>
-        <halign>left</halign>
-        <label>2D clouds</label>
-        <property>/sim/rendering/bump-mapping</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
+			<checkbox>
+				<halign>left</halign>
+				<label>2D clouds</label>
+				<property>/sim/rendering/bump-mapping</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+			</checkbox>
 
-	  -->
+			-->
 
 			<checkbox>
 				<halign>left</halign>
@@ -690,8 +690,6 @@
 				</text>
 			</group>
 
-
-
 		</group>
 	</group>