From b6d3f56829715ffbb541813190dda5f30f321654 Mon Sep 17 00:00:00 2001
From: david <david>
Date: Sun, 9 Mar 2003 03:41:48 +0000
Subject: [PATCH] Modified to work with changed "switch" layer.

---
 Aircraft/Instruments/adf-radio.xml            |  6 ++++--
 Aircraft/Instruments/autopilot.xml            | 20 ++++++++++++++-----
 Aircraft/Instruments/brakes.xml               |  4 +++-
 Aircraft/Instruments/dme.xml                  | 12 ++++++++---
 Aircraft/Instruments/gear-indicator.xml       |  4 +++-
 Aircraft/Instruments/hsi-hi.xml               |  8 ++++++--
 Aircraft/Instruments/hsi.xml                  |  8 ++++++--
 Aircraft/Instruments/hsi2.xml                 |  8 ++++++--
 Aircraft/Instruments/magneto-switch.xml       |  8 ++++++--
 Aircraft/Instruments/markerbeacon.xml         | 12 ++++++++---
 Aircraft/Instruments/nav1-hi.xml              |  8 ++++++--
 Aircraft/Instruments/nav1.xml                 |  8 ++++++--
 Aircraft/Instruments/nav3.xml                 | 12 ++++++++---
 Aircraft/Instruments/navcom-radio.xml         |  4 +++-
 .../Instruments/single-magneto-switch.xml     |  4 +++-
 Aircraft/Instruments/switch.xml               |  4 +++-
 Aircraft/Instruments/twin-magneto-switch.xml  |  8 ++++++--
 17 files changed, 103 insertions(+), 35 deletions(-)

diff --git a/Aircraft/Instruments/adf-radio.xml b/Aircraft/Instruments/adf-radio.xml
index 830a15c09..2b7a004de 100644
--- a/Aircraft/Instruments/adf-radio.xml
+++ b/Aircraft/Instruments/adf-radio.xml
@@ -215,8 +215,10 @@ properties' values.
   <layer>
    <name>voice/ident toggle</name>
     <type>switch</type>
-    <property alias="../../../params/adf-morse-ident-toggle-prop"/>
-      <layer>
+     <layer>
+      <condition>
+       <property alias="../../../../../params/adf-morse-ident-toggle-prop"/>
+      </condition>
       <name>voice on</name>
       <texture>
       <path>Aircraft/Instruments/Textures/switches.rgb</path>
diff --git a/Aircraft/Instruments/autopilot.xml b/Aircraft/Instruments/autopilot.xml
index 6375f19cb..bd297e29c 100644
--- a/Aircraft/Instruments/autopilot.xml
+++ b/Aircraft/Instruments/autopilot.xml
@@ -52,8 +52,10 @@ properties' values.
   <layer>
    <name>WL button</name>
    <type>switch</type>
-   <property>/autopilot/locks/wing-leveler</property>
    <layer>
+    <condition>
+     <property>/autopilot/locks/wing-leveler</property>
+    </condition>
     <name>WL on</name>
     <texture>
      <path>Aircraft/Instruments/Textures/blister.rgb</path>
@@ -124,8 +126,10 @@ properties' values.
   <layer>
    <name>HDG button</name>
    <type>switch</type>
-   <property>/autopilot/locks/heading</property>
    <layer>
+    <condition>
+     <property>/autopilot/locks/heading</property>
+    </condition>
     <name>HDG on</name>
     <texture>
      <path>Aircraft/Instruments/Textures/blister.rgb</path>
@@ -196,8 +200,10 @@ properties' values.
   <layer>
    <name>NAV button</name>
    <type>switch</type>
-   <property>/autopilot/locks/nav[0]</property>
    <layer>
+    <condition>
+     <property>/autopilot/locks/nav[0]</property>
+    </condition>
     <name>NAV on</name>
     <texture>
      <path>Aircraft/Instruments/Textures/blister.rgb</path>
@@ -268,8 +274,10 @@ properties' values.
   <layer>
    <name>APR button</name>
    <type>switch</type>
-   <property>/autopilot/locks/glide-slope[0]</property>
    <layer>
+    <condition>
+     <property>/autopilot/locks/glide-slope[0]</property>
+    </condition>
     <name>APR on</name>
     <texture>
      <path>Aircraft/Instruments/Textures/blister.rgb</path>
@@ -340,8 +348,10 @@ properties' values.
   <layer>
    <name>ALT button</name>
    <type>switch</type>
-   <property>/autopilot/locks/altitude</property>
    <layer>
+    <condition>
+     <property>/autopilot/locks/altitude</property>
+    </condition>
     <name>ALT on</name>
     <texture>
      <path>Aircraft/Instruments/Textures/blister.rgb</path>
diff --git a/Aircraft/Instruments/brakes.xml b/Aircraft/Instruments/brakes.xml
index 0be97c71e..8a4a2992a 100644
--- a/Aircraft/Instruments/brakes.xml
+++ b/Aircraft/Instruments/brakes.xml
@@ -14,8 +14,10 @@
  <layer>
    <name>Brake light</name>
    <type>switch</type>
-   <property>/controls[0]/parking-brake</property> <!-- nose brake -->
     <layer>
+     <condition>
+      <property>/controls[0]/parking-brake</property> <!-- nose brake -->
+     </condition>
      <name>on</name>
      <texture>
      <path>Aircraft/Instruments/Textures/warning-lamps.rgb</path>
diff --git a/Aircraft/Instruments/dme.xml b/Aircraft/Instruments/dme.xml
index 6122e44d2..e6d38e7dd 100644
--- a/Aircraft/Instruments/dme.xml
+++ b/Aircraft/Instruments/dme.xml
@@ -44,10 +44,12 @@ properties' values.
   <layer>
    <name>distance to station</name>
    <type>switch</type>
-   <property>/radios/dme/in-range</property>
    <w>128</w>
    <h>64</h>
    <layer>
+    <condition>
+     <property>/radios/dme/in-range</property>
+    </condition>
     <name>display</name>
     <type>text</type>
     <font>led</font>
@@ -97,8 +99,10 @@ properties' values.
   <layer>
    <name>ground speed towards station</name>
    <type>switch</type>
-   <property>/radios/dme/in-range</property>
    <layer>
+    <condition>
+     <property>/radios/dme/in-range</property>
+    </condition>
     <type>text</type>
     <font>led</font>
     <point-size>6</point-size>
@@ -143,8 +147,10 @@ properties' values.
   <layer>
    <name>time to station</name>
    <type>switch</type>
-   <property>/radios/dme/in-range</property>
    <layer>
+    <condition>
+     <property>/radios/dme/in-range</property>
+    </condition>
     <type>text</type>
     <font>led</font>
     <point-size>6</point-size>
diff --git a/Aircraft/Instruments/gear-indicator.xml b/Aircraft/Instruments/gear-indicator.xml
index 9f9fe35ed..4cc69f556 100644
--- a/Aircraft/Instruments/gear-indicator.xml
+++ b/Aircraft/Instruments/gear-indicator.xml
@@ -14,8 +14,10 @@
  <layer>
    <name>Brake light</name>
    <type>switch</type>
-   <property>/controls[0]/gear-down</property> <!-- nose brake -->
     <layer>
+     <condition>
+      <property>/controls[0]/gear-down</property> <!-- nose brake -->
+     </condition>
      <name>on</name>
      <texture>
      <path>Aircraft/Instruments/Textures/warning-lamps.rgb</path>
diff --git a/Aircraft/Instruments/hsi-hi.xml b/Aircraft/Instruments/hsi-hi.xml
index 9fcbade1b..6c4ae9e62 100644
--- a/Aircraft/Instruments/hsi-hi.xml
+++ b/Aircraft/Instruments/hsi-hi.xml
@@ -43,8 +43,10 @@ Started 24-7-01 by Timothy Gale
   <layer>
    <name>TO/FROM/OFF flag</name>
    <type>switch</type>
-   <property>/radios/nav[0]/to-flag</property>
    <layer>
+    <condition>
+     <property>/radios/nav[0]/to-flag</property>
+    </condition>
     <name>TO flag</name>
     <texture>
      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
@@ -59,8 +61,10 @@ Started 24-7-01 by Timothy Gale
    <layer>
     <name>FROM/OFF flag</name>
     <type>switch</type>
-    <property>/radios/nav[0]/from-flag</property>
     <layer>
+     <condition>
+      <property>/radios/nav[0]/from-flag</property>
+     </condition>
      <name>FROM flag</name>
      <texture>
       <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
diff --git a/Aircraft/Instruments/hsi.xml b/Aircraft/Instruments/hsi.xml
index e961b5690..ef6e902f2 100644
--- a/Aircraft/Instruments/hsi.xml
+++ b/Aircraft/Instruments/hsi.xml
@@ -43,8 +43,10 @@ Started 24-7-01 by Timothy Gale
   <layer>
    <name>TO/FROM/OFF flag</name>
    <type>switch</type>
-   <property>/radios/nav[0]/to-flag</property>
    <layer>
+    <condition>
+     <property>/radios/nav[0]/to-flag</property>
+    </condition>
     <name>TO flag</name>
     <texture>
      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
@@ -59,8 +61,10 @@ Started 24-7-01 by Timothy Gale
    <layer>
     <name>FROM/OFF flag</name>
     <type>switch</type>
-    <property>/radios/nav[0]/from-flag</property>
     <layer>
+     <condition>
+      <property>/radios/nav[0]/from-flag</property>
+     </condition>
      <name>FROM flag</name>
      <texture>
       <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
diff --git a/Aircraft/Instruments/hsi2.xml b/Aircraft/Instruments/hsi2.xml
index cf504d795..17f9cd06f 100644
--- a/Aircraft/Instruments/hsi2.xml
+++ b/Aircraft/Instruments/hsi2.xml
@@ -75,8 +75,10 @@ Started 24-7-01 by Timothy Gale
   <layer>
    <name>TO/FROM/OFF flag</name>
    <type>switch</type>
-   <property>/radios/nav[0]/to-flag</property>
    <layer>
+    <condition>
+     <property>/radios/nav[0]/to-flag</property>
+    </condition>
     <name>TO flag</name>
     <texture>
      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
@@ -91,8 +93,10 @@ Started 24-7-01 by Timothy Gale
    <layer>
     <name>FROM/OFF flag</name>
     <type>switch</type>
-    <property>/radios/nav[0]/from-flag</property>
     <layer>
+     <condition>
+      <property>/radios/nav[0]/from-flag</property>
+     </condition>
      <name>FROM flag</name>
      <texture>
       <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
diff --git a/Aircraft/Instruments/magneto-switch.xml b/Aircraft/Instruments/magneto-switch.xml
index 3037b3be9..f98e330d2 100644
--- a/Aircraft/Instruments/magneto-switch.xml
+++ b/Aircraft/Instruments/magneto-switch.xml
@@ -58,8 +58,10 @@
  <layer>
   <name>magneto 0 switch</name>
   <type>switch</type>
-  <property alias="../../../params/starter0-select"/>
   <layer>
+   <condition>
+    <property alias="../../../../../params/starter0-select"/>
+   </condition>
   <name>starter engage</name>
   <texture>
     <path>Aircraft/c172/Instruments/Textures/radios-1.rgb</path>
@@ -151,8 +153,10 @@
  <layer>
   <name>magneto 1 switch</name>
   <type>switch</type>
-  <property alias="../../../params/starter1-select"/>
   <layer>
+  <condition>
+   <property alias="../../../../../params/starter1-select"/>
+  </condition>
   <name>starter engage</name>
   <texture>
     <path>Aircraft/c172/Instruments/Textures/radios-1.rgb</path>
diff --git a/Aircraft/Instruments/markerbeacon.xml b/Aircraft/Instruments/markerbeacon.xml
index 7eb24fc10..5526a5e81 100644
--- a/Aircraft/Instruments/markerbeacon.xml
+++ b/Aircraft/Instruments/markerbeacon.xml
@@ -44,10 +44,12 @@ properties' values.
  <layer>
    <name>lamp</name>
    <type>switch</type>
-   <property>/radios/marker-beacon/outer</property> 
    <layer>
    <name>on</name>
    <texture>
+    <condition>
+     <property>/radios/marker-beacon/outer</property> 
+    </condition>
     <path>Aircraft/Instruments/Textures/led.rgb</path>
     <x1>0.5</x1>
     <y1>0.75</y1>
@@ -123,8 +125,10 @@ properties' values.
  <layer>
    <name>lamp</name>
    <type>switch</type>
-   <property>/radios/marker-beacon/middle</property> 
    <layer>
+   <condition>
+    <property>/radios/marker-beacon/middle</property> 
+   </condition>
    <name>on</name>
    <texture>
     <path>Aircraft/Instruments/Textures/led.rgb</path>
@@ -204,8 +208,10 @@ properties' values.
  <layer>
    <name>lamp</name>
    <type>switch</type>
-   <property>/radios/marker-beacon/inner</property> 
    <layer>
+   <condition>
+    <property>/radios/marker-beacon/inner</property> 
+   </condition>
    <name>on</name>
    <texture>
     <path>Aircraft/Instruments/Textures/led.rgb</path>
diff --git a/Aircraft/Instruments/nav1-hi.xml b/Aircraft/Instruments/nav1-hi.xml
index cd04db949..2657e8336 100644
--- a/Aircraft/Instruments/nav1-hi.xml
+++ b/Aircraft/Instruments/nav1-hi.xml
@@ -67,8 +67,10 @@ properties' values.
   <layer>
    <name>TO/FROM/OFF flag</name>
    <type>switch</type>
-   <property alias="../../../params/nav-to-flag"/>
    <layer>
+    <condition>
+     <property alias="../../../../../params/nav-to-flag"/>
+    </condition>
     <name>TO flag</name>
     <texture>
      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
@@ -83,8 +85,10 @@ properties' values.
    <layer>
     <name>FROM/OFF flag</name>
     <type>switch</type>
-    <property alias="../../../../params/nav-from-flag"/>
     <layer>
+     <condition>
+      <property alias="../../../../../../params/nav-from-flag"/>
+     </condition>
      <name>FROM flag</name>
      <texture>
       <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
diff --git a/Aircraft/Instruments/nav1.xml b/Aircraft/Instruments/nav1.xml
index 3d88a8756..0b6404c91 100644
--- a/Aircraft/Instruments/nav1.xml
+++ b/Aircraft/Instruments/nav1.xml
@@ -67,8 +67,10 @@ properties' values.
   <layer>
    <name>TO/FROM/OFF flag</name>
    <type>switch</type>
-   <property alias="../../../params/nav-to-flag"/>
    <layer>
+    <condition>
+     <property alias="../../../../../params/nav-to-flag"/>
+    </condition>
     <name>TO flag</name>
     <texture>
      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
@@ -83,8 +85,10 @@ properties' values.
    <layer>
     <name>FROM/OFF flag</name>
     <type>switch</type>
-    <property alias="../../../../params/nav-from-flag"/>
     <layer>
+     <condition>
+      <property alias="../../../../../../params/nav-from-flag"/>
+     </condition>
      <name>FROM flag</name>
      <texture>
       <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
diff --git a/Aircraft/Instruments/nav3.xml b/Aircraft/Instruments/nav3.xml
index 364c0ec92..13f8f632d 100644
--- a/Aircraft/Instruments/nav3.xml
+++ b/Aircraft/Instruments/nav3.xml
@@ -56,10 +56,12 @@ properties' values.
   <layer>
    <name>distance to station</name>
    <type>switch</type>
-   <property>/radios/dme/in-range</property>
    <w>96</w>
    <h>64</h>
    <layer>
+    <condition>
+     <property>/radios/dme/in-range</property>
+    </condition>
     <name>display</name>
     <type>text</type>
     <point-size>10</point-size>
@@ -147,8 +149,10 @@ properties' values.
   <layer>
    <name>TO/FROM/OFF flag</name>
    <type>switch</type>
-   <property>/radios/nav[0]/to-flag</property>
    <layer>
+    <condition>
+     <property>/radios/nav[0]/to-flag</property>
+    </condition>
     <name>TO flag</name>
     <texture>
      <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
@@ -163,8 +167,10 @@ properties' values.
    <layer>
     <name>FROM/OFF flag</name>
     <type>switch</type>
-    <property>/radios/nav[1]/from-flag</property>
     <layer>
+     <condition>
+      <property>/radios/nav[1]/from-flag</property>
+     </condition>
      <name>FROM flag</name>
      <texture>
       <path>Aircraft/Instruments/Textures/misc-1.rgb</path>
diff --git a/Aircraft/Instruments/navcom-radio.xml b/Aircraft/Instruments/navcom-radio.xml
index b5759f2c4..1ffd51b5a 100644
--- a/Aircraft/Instruments/navcom-radio.xml
+++ b/Aircraft/Instruments/navcom-radio.xml
@@ -230,8 +230,10 @@ properties' values.
   <layer>
    <name>voice/ident toggle</name>
    <type>switch</type>
-   <property alias="../../../params/nav-morse-ident-toggle-prop"/>
    <layer>
+   <condition>
+    <property alias="../../../../../params/nav-morse-ident-toggle-prop"/>
+   </condition>
    <name>voice on</name>
    <texture>
     <path>Aircraft/Instruments/Textures/switches.rgb</path>
diff --git a/Aircraft/Instruments/single-magneto-switch.xml b/Aircraft/Instruments/single-magneto-switch.xml
index 83e8b442f..22c120d99 100644
--- a/Aircraft/Instruments/single-magneto-switch.xml
+++ b/Aircraft/Instruments/single-magneto-switch.xml
@@ -55,8 +55,10 @@
  <layer>
   <name>magneto switch</name>
   <type>switch</type>
-  <property alias="../../../params/starter-select"/>
   <layer>
+  <condition>
+   <property alias="../../../../../params/starter-select"/>
+  </condition>
   <name>starter engage</name>
   <texture>
     <path>Aircraft/Instruments/Textures/navcom-radios.rgb</path>
diff --git a/Aircraft/Instruments/switch.xml b/Aircraft/Instruments/switch.xml
index 6820d79e4..285f40f66 100644
--- a/Aircraft/Instruments/switch.xml
+++ b/Aircraft/Instruments/switch.xml
@@ -4,8 +4,10 @@
 
   <name>voice/ident toggle</name>
   <type>switch</type>
-  <property alias="../../../params/"/>
   <layer>
+   <condition>
+    <property alias="../../../params/"/>
+   </condition>
      <name>voice on</name>
      <texture>
      <path>Aircraft/Instruments/Textures/switches.rgb</path>
diff --git a/Aircraft/Instruments/twin-magneto-switch.xml b/Aircraft/Instruments/twin-magneto-switch.xml
index 9ca3f955a..ef01debc4 100644
--- a/Aircraft/Instruments/twin-magneto-switch.xml
+++ b/Aircraft/Instruments/twin-magneto-switch.xml
@@ -58,8 +58,10 @@
  <layer>
   <name>magneto 0 switch</name>
   <type>switch</type>
-  <property alias="../../../params/starter0-select"/>
   <layer>
+   <condition>
+    <property alias="../../../../../params/starter0-select"/>
+   </condition>
   <name>starter engage</name>
   <texture>
     <path>Aircraft/Instruments/Textures/navcom-radios.rgb</path>
@@ -151,8 +153,10 @@
  <layer>
   <name>magneto 1 switch</name>
   <type>switch</type>
-  <property alias="../../../params/starter1-select"/>
   <layer>
+  <condition>
+   <property alias="../../../../../params/starter1-select"/>
+  </condition>
   <name>starter engage</name>
   <texture>
     <path>Aircraft/Instruments/Textures/navcom-radios.rgb</path>