From ddcd76c67793d29ae34040a19284e44054afac55 Mon Sep 17 00:00:00 2001
From: Tim Moore <timoore33@gmail.com>
Date: Sun, 26 Dec 2010 18:21:26 +0100
Subject: [PATCH 1/2] Issue 181: add object-name to binding of snow level
 slider

The dialog-apply binding was setting all the properties in the
rendering dialog, including ones that are tested in technique
predicates. This was causing effects to be reinitialized.
---
 gui/dialogs/rendering.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index e7b99d922..e99ed3042 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -377,13 +377,14 @@
         <layout>hbox</layout>
         <halign>right</halign>
         <text>
-		  <label>Snow Level</label>
-		  <enable>
+          <label>Snow Level</label>
+          <enable>
             <property>/sim/rendering/shader-effects</property>
           </enable>
-		</text>
+        </text>
         <slider>
-		  <enable>
+          <name>snow-level</name>
+          <enable>
             <property>/sim/rendering/shader-effects</property>
           </enable>
           <min>0.0</min>
@@ -391,10 +392,11 @@
           <property>/sim/rendering/snow-level-m</property>
           <binding>
             <command>dialog-apply</command>
+            <object-name>snow-level</object-name>
           </binding>
         </slider>
         <text>
-		  <enable>
+          <enable>
             <property>/sim/rendering/shader-effects</property>
           </enable>
           <label>12345678</label>

From 72f0ea1feaba25a339165d4278fd440b9b70ace1 Mon Sep 17 00:00:00 2001
From: Gijs de Rooy <gijsrooy@hotmail.com>
Date: Sun, 26 Dec 2010 19:26:05 +0100
Subject: [PATCH 2/2] Issue 181: add object-name to all rendering options.
 Rename snow level to snow line. Snow dependant on crop, landmass or urban
 shaders.

---
 gui/dialogs/rendering.xml | 76 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 8 deletions(-)

diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index e99ed3042..0590ee7fd 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -40,7 +40,11 @@
 	  
       <text>
         <halign>left</halign>
-	    <label>"Material shaders" must be enabled for certain options</label>
+	    <label>"Material shaders" must be enabled for most options.</label>
+      </text>
+	  <text>
+        <halign>left</halign>
+	    <label>Snow is dependant on crop, landmass and urban shaders.</label>
       </text>
 	  
 	  <group>
@@ -122,18 +126,22 @@
       <checkbox>
         <halign>left</halign>
         <label>Particles (smoke, dust, spray)</label>
+		<name>particles</name>
         <property>/sim/rendering/particles</property>
         <binding>
           <command>dialog-apply</command>
+		  <object-name>particles</object-name>
         </binding>
       </checkbox>
 
       <checkbox>
         <halign>left</halign>
         <label>Precipitation</label>
+		<name>precipitation</name>
         <property>/sim/rendering/precipitation-gui-enable</property>
         <binding>
           <command>dialog-apply</command>
+		  <object-name>precipitation</object-name>
         </binding>
       </checkbox>
 	  
@@ -162,12 +170,14 @@
       <checkbox>
         <halign>left</halign>
         <label>Random vegetation</label>
+		<name>random-vegetation</name>
 		<enable>
           <property>/sim/rendering/shader-effects</property>
         </enable>
         <property>/sim/rendering/random-vegetation</property>
         <binding>
           <command>dialog-apply</command>
+		  <object-name>random-vegetation</object-name>
         </binding>
       </checkbox>
 	  
@@ -198,12 +208,14 @@
       <checkbox>
 	    <halign>left</halign>
         <label>3D clouds</label>
+		<name>3d-clouds</name>
 		<enable>
           <property>/sim/rendering/shader-effects</property>
         </enable>
         <property>/sim/rendering/clouds3d-enable</property>
         <binding>
           <command>dialog-apply</command>
+		  <object-name>3d-clouds</object-name>
         </binding>
       </checkbox>
 	  
@@ -239,23 +251,34 @@
         <text>
 		  <label>Cloud visibility range</label>
 		  <enable>
-            <property>/sim/rendering/shader-effects</property>
+            <and>
+              <property>/sim/rendering/shader-effects</property>
+			  <property>/sim/rendering/clouds3d-enable</property>
+			</and>
           </enable>
 		</text>
         <slider>
+		  <name>cloud-vis-range</name>
           <enable>
-            <property>/sim/rendering/shader-effects</property>
+            <and>
+              <property>/sim/rendering/shader-effects</property>
+			  <property>/sim/rendering/clouds3d-enable</property>
+			</and>
           </enable>
 		  <min>100.0</min>
           <max>20000.0</max>
           <property>/sim/rendering/clouds3d-vis-range</property>
           <binding>
             <command>dialog-apply</command>
+			<object-name>cloud-vis-range</object-name>
           </binding>
         </slider>
         <text>
           <enable>
-            <property>/sim/rendering/shader-effects</property>
+		    <and>
+              <property>/sim/rendering/shader-effects</property>
+			  <property>/sim/rendering/clouds3d-enable</property>
+			</and>
           </enable>
 		  <label>12345678</label>
           <format>%.fm</format>
@@ -290,9 +313,11 @@
       <checkbox>
         <halign>left</halign>
         <label>Material shaders</label>
+		<name>material-shaders</name>
         <property>/sim/rendering/shader-effects</property>
         <binding>
           <command>dialog-apply</command>
+		  <object-name>material-shaders</object-name>
         </binding>
       </checkbox>
 
@@ -303,72 +328,84 @@
         <checkbox>
           <halign>left</halign>
           <label>Crop texture</label>
+		  <name>crop-texture</name>
 		  <enable>
             <property>/sim/rendering/shader-effects</property>
           </enable>
           <property>/sim/rendering/crop-shader</property>
           <binding>
             <command>dialog-apply</command>
+			<object-name>crop-texture</object-name>
           </binding>
         </checkbox>
 
         <checkbox>
           <halign>left</halign>
           <label>Landmass effects</label>
+		  <name>landmass-effects</name>
 		  <enable>
             <property>/sim/rendering/shader-effects</property>
           </enable>
           <property>/sim/rendering/landmass-shader</property>
           <binding>
             <command>dialog-apply</command>
+			<object-name>landmass-effects</object-name>
           </binding>
         </checkbox>
 
         <checkbox>
           <halign>left</halign>
           <label>Water reflection</label>
+		  <name>water-reflection</name>
 		  <enable>
             <property>/sim/rendering/shader-effects</property>
           </enable>
           <property>/sim/rendering/water-shader</property>
           <binding>
             <command>dialog-apply</command>
+			<object-name>water-reflection</object-name>
           </binding>
         </checkbox>
 
         <checkbox>
           <halign>left</halign>
           <label>Urban effects</label>
+		  <name>urban-effects</name>
 		  <enable>
             <property>/sim/rendering/shader-effects</property>
           </enable>
           <property>/sim/rendering/urban-shader</property>
           <binding>
             <command>dialog-apply</command>
+			<object-name>urban-effects</object-name>
           </binding>
         </checkbox>
         
         <checkbox>
           <halign>left</halign>
           <label>Transition effects</label>
+		  <name>transition-effects</name>
 		  <enable>
             <property>/sim/rendering/shader-effects</property>
           </enable>
           <property>/sim/rendering/transition-shader</property>
           <binding>
             <command>dialog-apply</command>
+			<object-name>transition-effects</object-name>
           </binding>
         </checkbox>
 
         <checkbox>
           <halign>left</halign>
           <label>Persistent contrails</label>
+		  <name>persistent-contrails</name>
 		  <enable>
             <property>/sim/rendering/shader-effects</property>
           </enable>
           <property>/sim/rendering/contrail-shader</property>
           <binding>
             <command>dialog-apply</command>
+			<object-name>persistent-contrails</object-name>
           </binding>
         </checkbox>
       </group>
@@ -377,15 +414,29 @@
         <layout>hbox</layout>
         <halign>right</halign>
         <text>
-          <label>Snow Level</label>
+          <label>Snow line</label>
           <enable>
-            <property>/sim/rendering/shader-effects</property>
+            <and>
+			  <property>/sim/rendering/shader-effects</property>
+			  <or>
+			    <property>/sim/rendering/crop-shader</property>
+			    <property>/sim/rendering/landmass-shader</property>
+			    <property>/sim/rendering/urban-shader</property>
+			  </or>
+			</and>
           </enable>
         </text>
         <slider>
           <name>snow-level</name>
           <enable>
-            <property>/sim/rendering/shader-effects</property>
+			<and>
+			  <property>/sim/rendering/shader-effects</property>
+			  <or>
+			    <property>/sim/rendering/crop-shader</property>
+			    <property>/sim/rendering/landmass-shader</property>
+			    <property>/sim/rendering/urban-shader</property>
+			  </or>
+			</and>
           </enable>
           <min>0.0</min>
           <max>5000.0</max>
@@ -397,7 +448,14 @@
         </slider>
         <text>
           <enable>
-            <property>/sim/rendering/shader-effects</property>
+            <and>
+			  <property>/sim/rendering/shader-effects</property>
+			  <or>
+			    <property>/sim/rendering/crop-shader</property>
+			    <property>/sim/rendering/landmass-shader</property>
+			    <property>/sim/rendering/urban-shader</property>
+			  </or>
+			</and>
           </enable>
           <label>12345678</label>
           <format>%.fm</format>
@@ -416,6 +474,7 @@
           </enable>
 		</text>
         <slider>
+		  <name>quality-level</name>
 		  <enable>
             <property>/sim/rendering/shader-effects</property>
           </enable>
@@ -425,6 +484,7 @@
           <property>/sim/rendering/quality-level</property>
           <binding>
             <command>dialog-apply</command>
+			<object-name>quality-level</object-name>
           </binding>
         </slider>
         <text>