From ed068bef821b79f5c8fc9e82b5d13d2f541177a2 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Tue, 7 Aug 2012 21:27:29 +0100
Subject: [PATCH] Unification of Weather UI.

---
 Environment/environment.xml         |   10 +-
 gui/dialogs/local_weather_tiles.xml | 1188 +++++++------
 gui/dialogs/weather.xml             | 2408 +++++----------------------
 gui/menubar.xml                     |   12 +-
 4 files changed, 1042 insertions(+), 2576 deletions(-)

diff --git a/Environment/environment.xml b/Environment/environment.xml
index dd6a4a33d..6e3a8c38b 100644
--- a/Environment/environment.xml
+++ b/Environment/environment.xml
@@ -17,25 +17,24 @@
 -->
 <PropertyList>
   <weather-scenarios>
-    <scenario>
-      <name type="string">Disabled</name>
-      <description type="string">METAR weather generation is disabled. Use the above controls to setup your weather.</description>
-    </scenario>
     <scenario>
       <name type="string">Live data</name>
       <description type="string">
         Fetch live weather data for your nearest airport from noaa.gov. You need a working internet connection.
         All the controls in this dialog are computed automatically, once a valid METAR is received.
       </description>
+      <tile>live</tile>
     </scenario>
     <scenario>
       <name type="string">Manual input</name>
-      <description type="string">Enter your favorite METAR weather in the textbox below. A valid METAR syntax is required.</description>
+      <description type="string">Enter your favorite METAR weather in the textbox above. A valid METAR syntax is required.</description>
+      <tile>manual</tile>
     </scenario>
     <scenario>
       <name type="string">Fair weather</name>
       <metar type="string">XXXX 012345Z 15003KT 12SM SCT041 FEW200 20/08 Q1015 NOSIG</metar>
       <description type="string">A lovely day for trip to your favorite 100$ hamburger airfield</description>
+      <tile>High-pressure-core</tile>
     </scenario>
     <scenario>
       <name type="string">Thunderstorm</name>
@@ -45,6 +44,7 @@
         Be prepared for reduction of visibility in showers and strong gusts
         near thunderstorms
       </description>
+      <tile>Thunderstorms</tile>
     </scenario>
     <scenario>
       <name type="string">Stormy Monday</name>
diff --git a/gui/dialogs/local_weather_tiles.xml b/gui/dialogs/local_weather_tiles.xml
index a9c5bc0ef..2db727b86 100644
--- a/gui/dialogs/local_weather_tiles.xml
+++ b/gui/dialogs/local_weather_tiles.xml
@@ -1,636 +1,598 @@
 <?xml version="1.0"?>
 
 <PropertyList>
+  <name>local-weather</name>
+  <modal>false</modal>
+  <resizable>false</resizable>
+  <layout>vbox</layout>
+  <default-padding>3</default-padding>
 
- <!-- Weather tiles -->
+  <!-- Title bar with close button -->
+  <group>
+    <layout>hbox</layout>
+    <default-padding>1</default-padding>
 
- <name>local_weather_tiles</name>
- <width>470</width>
- <height>410</height>
- <modal>false</modal>
+    <empty>
+      <stretch>true</stretch>
+    </empty>
 
+    <text>
+      <label>Advanced Weather Configuration</label>
+    </text>
 
-<text>
-  <x>5</x>
-  <y>380</y>
-  <label>Select initial weather scenario tile</label>
-</text>
+    <empty>
+      <stretch>true</stretch>
+    </empty>
 
+    <button>
+      <legend/>
+      <key>Esc</key>
+      <pref-width>16</pref-width>
+      <pref-height>16</pref-height>
+      <border>2</border>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+  </group>
 
-<combo>
-   <x>10</x>
-   <y>355</y>
-   <width>280</width>
-   <height>25</height>
-   <live>true</live>
-   <property>/local-weather/tmp/tile-type</property>
-   <value>High-pressure-core</value>
-   <value>High-pressure</value>
-   <value>High-pressure-border</value>
-   <value>Low-pressure-border</value>
-   <value>Low-pressure</value>
-   <value>Low-pressure-core</value>
-   <value>Cold-sector</value>
-   <value>Warm-sector</value>
-   <value>Coldfront</value>
-   <value>Warmfront</value>
-   <value>Tropical</value>
-   <value>Thunderstorms</value>
-   <value>Test tile</value>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-   <!--<enable>
-    <not>
-     <equals>
-      <property>/local-weather/tmp/tile-management</property>
-      <value type="string">METAR</value>
-     </equals>
-    </not>
-   </enable>-->
-  </combo>
+  <hrule/>
 
+  <group>
+    <layout>vbox</layout>
+      
+    <text>
+      <halign>left</halign>
+      <label>General Settings</label>
+    </text>
+    
+    <group>
+      <layout>table</layout>
+      
+      <text>
+        <row>0</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>Tile selection mode</label>
+      </text>
 
-<text>
-   <x>300</x>
-   <y>355</y>
-   <label>alt. offset (ft)</label>
-  </text>
+      <combo>
+        <row>0</row>
+        <col>1</col>
+        <halign>left</halign>
+        <pref-width>150</pref-width>
+        <live>true</live>
+        <property>/local-weather/tmp/tile-management</property>
+        <value>single tile</value>
+        <value>repeat tile</value>
+        <value>realistic weather</value>
+        <value>METAR</value>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </combo>
 
+      
+    
+      <text>
+        <row>1</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>Altitude offset (ft)</label>
+      </text>
 
+      <input>
+        <row>1</row>
+        <col>1</col>
+        <halign>left</halign>
+        <property>/local-weather/tmp/tile-alt-offset-ft</property>
+      </input>
+      
+      <text>
+        <row>2</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>Temperature offset (C)</label>
+      </text>
 
-<input>
-   <x>390</x>
-   <y>355</y>
-   <width>50</width>
-   <height>25</height>
-   <property>/local-weather/tmp/tile-alt-offset-ft</property>
-  </input>
+      <input>
+        <row>2</row>
+        <col>1</col>
+        <halign>left</halign>
+        <property>/local-weather/config/temperature-offset-degc</property>
+      </input>
 
+      <checkbox>
+        <row>3</row>
+        <col>0</col>
+        <halign>left</halign>
+        <label>debug output</label>
+        <property>/local-weather/config/debug-output-flag</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </checkbox>
 
- <text>
-   <x>5</x>
-   <y>320</y>
-   <label>wind deg</label>
-  </text>
+      <checkbox>
+        <row>3</row>
+        <col>1</col>
+        <halign>left</halign>
+        <label>terrain effects</label>
+        <property>/local-weather/config/detailed-terrain-interaction-flag</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </checkbox>
 
- <input>
-   <x>67</x>
-   <y>320</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/tile-orientation-deg</property>
-  </input>
+      <checkbox>
+        <row>3</row>
+        <col>2</col>
+        <halign>left</halign>
+        <label>realistic visibility</label>
+        <property>/local-weather/config/realistic-visibility-flag</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </checkbox>
 
- <text>
-   <x>105</x>
-   <y>320</y>
-   <label>kt</label>
-  </text>
+      <checkbox>
+        <row>4</row>
+        <col>1</col>
+        <halign>left</halign>
+        <label>terrain presampling</label>
+        <property>/local-weather/config/presampling-flag</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </checkbox>
+    </group>
+    
+    <hrule/>
+    
+    <text>
+      <halign>left</halign>
+      <label>Wind Settings</label>
+    </text>
+    
+    <group>
+      <layout>vbox</layout>
+      
+      <group>
+        <layout>hbox</layout>
+        
+        <empty>
+          <stretch>true</stretch>
+        </empty>
 
-<input>
-   <x>125</x>
-   <y>320</y>
-   <width>30</width>
-   <height>25</height>
-   <property>/local-weather/tmp/windspeed-kt</property>
-  </input>
+        <text>
+          <label>Wind:</label>
+        </text>
 
- 
+        <input>
+          <pref-width>50</pref-width>
+          <property>/local-weather/tmp/tile-orientation-deg</property>
+        </input>
+
+        <text>
+          <label>degrees at</label>
+        </text>
+
+        <input>
+          <pref-width>30</pref-width>
+          <property>/local-weather/tmp/windspeed-kt</property>
+        </input>
+
+        <text>
+          <label>kts</label>
+        </text>
+
+        
+        <empty>
+          <stretch>true</stretch>
+        </empty>
+        
+      </group>
+      
+      <group>
+        <layout>table</layout>
+            
+        <text>
+          <row>0</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Gust frequency (Hz)</label>
+        </text>
+
+        <slider>
+          <row>0</row>
+          <col>1</col>
+          <halign>fill</halign>
+          <min>0.0</min>
+          <max>2.0</max>
+          <property>/local-weather/tmp/gust-frequency-hz</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </slider>
+
+        <text>
+          <row>0</row>
+          <col>2</col>
+          <label>1234</label>
+          <halign>left</halign>
+          <format>%.1f</format>
+          <property>/local-weather/tmp/gust-frequency-hz</property>
+          <live>true</live>
+        </text>
+
+        <text>
+          <row>1</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Gust factor</label>
+        </text>
+
+        <slider>
+          <row>1</row>
+          <col>1</col>
+          <halign>fill</halign>
+          <min>0.0</min>
+          <max>1.5</max>
+          <property>/local-weather/tmp/gust-relative-strength</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </slider>
+
+        <text>
+          <row>1</row>
+          <col>2</col>
+          <halign>left</halign>
+          <label>1234</label>
+          <format>%.1f</format>
+          <property>/local-weather/tmp/gust-relative-strength</property>
+          <live>true</live>
+        </text>
+      
+        <text>
+          <row>2</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Gust direction variation</label>
+        </text>
+
+        <slider>
+          <row>2</row>
+          <col>1</col>
+          <halign>fill</halign>
+          <min>0.0</min>
+          <max>45.0</max>
+          <property>/local-weather/tmp/gust-angular-variation-deg</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </slider>
+
+        <text>
+          <row>2</row>
+          <col>2</col>
+          <halign>left</halign>
+          <label>1234</label>
+          <format>%.1f</format>
+          <property>/local-weather/tmp/gust-angular-variation-deg</property>
+          <live>true</live>
+        </text>
+
+        <text>
+          <row>3</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Wind model</label>
+        </text>
+
+        <combo>
+          <row>3</row>
+          <col>1</col>
+          <halign>fill</halign>
+          <live>true</live>
+          <property>/local-weather/config/wind-model</property>
+          <value>constant</value>
+          <value>constant in tile</value>
+          <value>aloft interpolated</value>
+          <value>aloft waypoints</value>
+          <!-- <value>airmass interpolated</value> -->
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </combo>
+      </group>
+    </group>
+    
+    <hrule/>
+    
+    <text>
+      <halign>left</halign>
+      <label>Thermic and Visibility Settings</label>
+    </text>
+      
+    <group>
+      <layout>table</layout>
+
+      <checkbox>
+        <row>0</row>
+        <col>0</col>
+        <halign>left</halign>
+        <label>Generate thermals</label>
+        <property>/local-weather/config/generate-thermal-lift-flag</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </checkbox>
+
+      <text>
+        <row>0</row>
+        <col>1</col>
+        <halign>right</halign>
+        <enable>
+          <property>/local-weather/config/generate-thermal-lift-flag</property>
+        </enable>
+        <label>rough day</label>
+      </text>
+
+      <slider>
+        <row>0</row>
+        <col>2</col>
+        <min>0.3</min>
+        <max>1.5</max>
+        <property>/local-weather/config/thermal-properties</property>
+        <enable>
+          <property>/local-weather/config/generate-thermal-lift-flag</property>
+        </enable>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </slider>
+
+      <text>
+        <row>0</row>
+        <col>3</col>
+        <halign>left</halign>
+        <enable>
+          <property>/local-weather/config/generate-thermal-lift-flag</property>
+        </enable>
+        <label>low convection</label>
+      </text>
+
+      <text>
+        <row>1</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>Ground haze</label>
+      </text>
+
+      <text>
+        <row>1</row>
+        <col>1</col>
+        <label>thick</label>
+      </text>
+
+      <slider>
+        <row>1</row>
+        <col>2</col>
+        <min>0.1</min>
+        <max>1.0</max>
+        <property>/local-weather/config/ground-haze-factor</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </slider>
+
+      <text>
+        <row>1</row>
+        <col>3</col>
+        <halign>left</halign>
+        <label>thin</label>
+      </text>
+
+      <text>
+        <row>2</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>Air pollution</label>
+      </text>
+
+      <text>
+        <row>2</row>
+        <col>1</col>
+        <halign>right</halign>
+        <label>clean</label>
+      </text>
+
+      <slider>
+        <row>2</row>
+        <col>2</col>
+        <min>0.0</min>
+        <max>1.0</max>
+        <property>/environment/air-pollution-norm</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </slider>
+
+      <text>
+        <row>2</row>
+        <col>3</col>
+        <halign>left</halign>
+        <label>smog</label>
+      </text>
+
+      <text>
+        <row>3</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>Max. visibility</label>
+      </text>
+
+      <text>
+        <row>3</row>
+        <col>1</col>
+        <halign>right</halign>
+        <label>20 km</label>
+      </text>
+
+      <slider>
+        <row>3</row>
+        <col>2</col>
+        <min>9.90348</min>
+        <max>12.429216196</max>
+        <property>/local-weather/config/aux-max-vis-range-m</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </slider>
+
+      <text>
+        <row>3</row>
+        <col>3</col>
+        <halign>left</halign>
+        <label>250 km</label>
+      </text>
+
+      <text>
+        <row>3</row>
+        <col>4</col>
+        <halign>left</halign>
+        <label>12345678</label>
+        <format>%.fm</format>
+        <live>true</live>
+        <property>/local-weather/config/max-vis-range-m</property>
+      </text>
+    </group>
+      
+    <hrule/>
+    
+    <group>
+      <layout>vbox</layout>
+
+      <text>
+        <halign>left</halign>
+        <label>Weather Pattern Scales</label>
+      </text>
+      
+      <group>
+        <layout>table</layout>
+        <halign>center</halign>
+
+        <text>
+          <row>0</row>
+          <col>1</col>
+          <halign>left</halign>
+          <label>small</label>
+        </text>
+
+        <text>
+          <row>0</row>
+          <col>2</col>
+          <halign>right</halign>
+          <label>large</label>
+        </text>
+
+        <text>
+          <row>1</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Airmass</label>
+        </text>
+
+        <slider>
+          <row>1</row>
+          <col>1</col>
+          <colspan>2</colspan>
+          <halign>fill</halign>
+          <min>0.5</min>
+          <max>2.0</max>
+          <property>/local-weather/config/large-scale-persistence</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </slider>
+
+        <text>
+          <row>2</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Cloud patterns</label>
+        </text>
+
+        <slider>
+          <row>2</row>
+          <col>1</col>
+          <colspan>2</colspan>
+          <halign>fill</halign>
+          <min>0.0</min>
+          <max>1.0</max>
+          <property>/local-weather/config/small-scale-persistence</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </slider>
+      </group>
+    </group>
+  </group>
   
-<text>
-   <x>157</x>
-   <y>320</y>
-   <label>gust freq.</label>
-  </text>
-
-
-
-<slider>
-   <x>225</x>
-   <y>320</y>
-   <width>50</width>
-   <height>20</height>
-   <min>0.0</min>
-   <max>2.0</max>
-   <property>/local-weather/tmp/gust-frequency-hz</property>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-</slider>
-
-
-
-<text>
-   <x>275</x>
-   <y>320</y>
-   <label>strength</label>
-  </text>
-
-
-<slider>
-   <x>333</x>
-   <y>320</y>
-   <width>50</width>
-   <height>20</height>
-   <min>0.0</min>
-   <max>1.5</max>
-   <property>/local-weather/tmp/gust-relative-strength</property>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-</slider>
-
-<text>
-   <x>380</x>
-   <y>320</y>
-   <label>dir.</label>
-  </text>
-
-
-<slider>
-   <x>410</x>
-   <y>320</y>
-   <width>50</width>
-   <height>20</height>
-   <min>0.0</min>
-   <max>45.0</max>
-   <property>/local-weather/tmp/gust-angular-variation-deg</property>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-</slider>
-
-
-
-
-<text>
-   <x>5</x>
-   <y>290</y>
-   <label>wind model</label>
-  </text>
-
-
-<combo>
-   <x>150</x>
-   <y>290</y>
-   <width>140</width>
-   <height>25</height>
-   <live>true</live>
-   <property>/local-weather/config/wind-model</property>
-   <value>constant</value>
-   <value>constant in tile</value>
-   <value>aloft interpolated</value>
-   <value>aloft waypoints</value>
-   <!-- <value>airmass interpolated</value> -->
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-  </combo>
-
-
-<text>
-   <x>300</x>
-   <y>290</y>
-   <label>T offset (C)</label>
-  </text>
-
-
-
-<input>
-   <x>390</x>
-   <y>290</y>
-   <width>50</width>
-   <height>25</height>
-   <property>/local-weather/config/temperature-offset-degc</property>
-  </input>
-
-
-<text>
-   <x>5</x>
-   <y>260</y>
-   <label>tile selection mode</label>
-</text>
-
-<combo>
-   <x>150</x>
-   <y>260</y>
-   <width>140</width>
-   <height>25</height>
-   <live>true</live>
-   <property>/local-weather/tmp/tile-management</property>
-   <value>single tile</value>
-   <value>repeat tile</value>
-   <value>realistic weather</value>
-   <value>METAR</value>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-  </combo>
-
-
-<checkbox>
-   <x>10</x>
-   <y>230</y>
-   <width>15</width>
-   <height>15</height>
-   <label>debug output</label>
-   <property>/local-weather/config/debug-output-flag</property>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-</checkbox>
-
-<!--<checkbox>
-   <x>150</x>
-   <y>150</y>
-   <width>15</width>
-   <height>15</height>
-   <label>detailed clouds</label>
-   <property>/local-weather/config/detailed-clouds-flag</property>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-</checkbox>-->
-
-<!--<checkbox>
-   <x>10</x>
-   <y>125</y>
-   <width>15</width>
-   <height>15</height>
-   <label>dynamical weather</label>
-   <property>/local-weather/config/dynamics-flag</property>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-</checkbox>-->
-
-<!--<checkbox>
-   <x>150</x>
-   <y>125</y>
-   <width>15</width>
-   <height>15</height>
-   <label>dynamical convection</label>
-   <property>/local-weather/config/dynamical-convection-flag</property>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-</checkbox>-->
-
-<checkbox>
-   <x>150</x>
-   <y>230</y>
-   <width>15</width>
-   <height>15</height>
-   <label>terrain effects</label>
-   <property>/local-weather/config/detailed-terrain-interaction-flag</property>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-</checkbox>
-
-<checkbox>
-   <x>290</x>
-   <y>230</y>
-   <width>15</width>
-   <height>15</height>
-   <label>realistic visibility</label>
-   <property>/local-weather/config/realistic-visibility-flag</property>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-</checkbox>
-
-<checkbox>
-   <x>10</x>
-   <y>205</y>
-   <width>15</width>
-   <height>15</height>
-   <label>generate thermals</label>
-   <property>/local-weather/config/generate-thermal-lift-flag</property>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-</checkbox>
-
-<checkbox>
-   <x>150</x>
-   <y>205</y>
-   <width>15</width>
-   <height>15</height>
-   <label>terrain presampling</label>
-   <property>/local-weather/config/presampling-flag</property>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-</checkbox>
-
-
-<text>
-   <x>5</x>
-   <y>175</y>
-   <label>Thermal properties:</label>
-</text>
-
-<text>
-   <x>160</x>
-   <y>175</y>
-   <label>rough day</label>
-</text>
-
-<slider>
-   <x>230</x>
-   <y>175</y>
-   <width>90</width>
-   <height>20</height>
-   <min>0.3</min>
-   <max>1.5</max>
-   <property>/local-weather/config/thermal-properties</property>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-</slider>
-
-<text>
-   <x>330</x>
-   <y>175</y>
-   <label>low convection</label>
-</text>
-
-
-<text>
-   <x>5</x>
-   <y>150</y>
-   <label>Ground haze:</label>
-</text>
-
-<text>
-   <x>160</x>
-   <y>150</y>
-   <label>thick</label>
-</text>
-
-<slider>
-   <x>230</x>
-   <y>150</y>
-   <width>90</width>
-   <height>20</height>
-   <min>0.1</min>
-   <max>1.0</max>
-   <property>/local-weather/config/ground-haze-factor</property>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-</slider>
-
-<text>
-   <x>330</x>
-   <y>150</y>
-   <label>thin</label>
-</text>
-
-<text>
-   <x>5</x>
-   <y>125</y>
-   <label>Air pollution:</label>
-</text>
-
-<text>
-   <x>160</x>
-   <y>125</y>
-   <label>clean</label>
-</text>
-
-<slider>
-   <x>230</x>
-   <y>125</y>
-   <width>90</width>
-   <height>20</height>
-   <min>0.0</min>
-   <max>1.0</max>
-   <property>/environment/air-pollution-norm</property>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-</slider>
-
-<text>
-   <x>330</x>
-   <y>125</y>
-   <label>smog</label>
-</text>
-
-
-<text>
-   <x>5</x>
-   <y>100</y>
-   <label>Max. visibility:</label>
-</text>
-
-<text>
-   <x>160</x>
-   <y>100</y>
-   <label>20 km</label>
-</text>
-
-<slider>
-   <x>230</x>
-   <y>100</y>
-   <width>90</width>
-   <height>20</height>
-   <min>9.90348</min>
-   <max>12.429216196</max>
-   <property>/local-weather/config/aux-max-vis-range-m</property>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-</slider>
-
-<text>
-   <x>330</x>
-   <y>100</y>
-   <label>250 km</label>
-</text>
-
-
-<text>
-   <x>380</x>
-   <y>100</y>
-   <label>12345678</label>
-   <format>%.fm</format>
-   <live>true</live>
-   <property>/local-weather/config/max-vis-range-m</property>
-</text>
-
-
-<text>
-  <x>5</x>
-  <y>75</y>
-  <label>Weather pattern scales</label>
-</text>
-
-
-<text>
-   <x>15</x>
-   <y>45</y>
-   <label>small</label>
-</text>
-
-<text>
-   <x>78</x>
-   <y>60</y>
-   <label>airmass</label>
-</text>
-
-<slider>
-   <x>60</x>
-   <y>45</y>
-   <width>100</width>
-   <height>20</height>
-   <min>0.5</min>
-   <max>2.0</max>
-   <property>/local-weather/config/large-scale-persistence</property>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-</slider>
-
-<text>
-   <x>165</x>
-   <y>45</y>
-   <label>large</label>
-</text>
-
-
-<text>
-   <x>205</x>
-   <y>45</y>
-   <label>small</label>
-</text>
-
-<text>
-   <x>257</x>
-   <y>60</y>
-   <label>cloud patterns</label>
-</text>
-
-<slider>
-   <x>250</x>
-   <y>45</y>
-   <width>100</width>
-   <height>20</height>
-   <min>0.0</min>
-   <max>1.0</max>
-   <property>/local-weather/config/small-scale-persistence</property>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-</slider>
-
-<text>
-   <x>355</x>
-   <y>45</y>
-   <label>large</label>
-</text>
-
-
-<group>
-  <x>10</x>
-  <y>10</y>
-
-  <button>
-   <x>0</x>
-   <y>0</y>
-   <legend>OK</legend>
-   <!--<default>true</default>-->
-   <equal>true</equal>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-   <binding>
-    <command>nasal</command>
-     <script>local_weather.set_tile()</script>
-   </binding>
-   <binding>
-    <command>dialog-close</command>
-   </binding>
-  </button>
-
-
-<button>
-   <x>40</x>
-   <y>0</y>
-   <legend>Clear / End</legend>
-   <!--<default>true</default>-->
-   <!--<equal>true</equal>-->
-   <binding>
-     <command>nasal</command>
-     <script>local_weather.clear_all()</script>
-   </binding>
-  </button>
-
-  <button>
-   <x>125</x>
-   <y>0</y>
-   <legend>Close</legend>
-   <!--<equal>true</equal>-->
-   <key>Esc</key>
-   <binding>
-    <command>dialog-close</command>
-   </binding>
-  </button>
-
-  <button>
-   <x>180</x>
-   <y>0</y>
-   <legend>Winds</legend>
-   <!--<equal>true</equal>-->
-   <binding>
-    <command>dialog-show</command>
-   <dialog-name>local_weather_winds</dialog-name>
-   </binding>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-  </button>
-  
- <button>
-   <x>235</x>
-   <y>0</y>
-   <legend>Advanced</legend>
-   <!--<equal>true</equal>-->
-   <binding>
-    <command>dialog-show</command>
-   <dialog-name>local_weather_environment</dialog-name>
-   </binding>
-   <binding>
-     <command>dialog-apply</command>
-   </binding>
-  </button>
-
-  <button>
-   <x>330</x>
-   <y>0</y>
-    <legend>Basic Weather --></legend>
-    <default>false</default>
-    <binding>
-      <command>nasal</command>
-      <script>if (getprop("/nasal/local_weather/loaded",0)) local_weather.clear_all()</script>
-    </binding>
-    <binding>
-      <command>property-assign</command>
-      <property>/nasal/local_weather/enabled</property>
-      <value type="bool">false</value>
-    </binding>
-    <binding>
-      <command>dialog-show</command>
-      <dialog-name>weather</dialog-name>
-    </binding>
-    <binding>
-      <command>dialog-close</command>
-    </binding>
-  </button>
- </group>
-
+  <hrule/>
+
+  <group>  
+    <layout>hbox</layout>
+    
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+    
+    <button>
+      <legend>OK</legend>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+
+    <button>
+      <legend>Close</legend>
+      <default>true</default>
+      <key>Esc</key>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+
+    <button>
+      <legend>Wind Configuration...</legend>
+      <binding>
+        <command>dialog-show</command>
+        <dialog-name>local_weather_winds</dialog-name>
+      </binding>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </button>
+
+    <button>
+      <legend>Advanced...</legend>
+      <binding>
+        <command>dialog-show</command>
+        <dialog-name>local_weather_environment</dialog-name>
+      </binding>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </button>
+    
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+  </group>
 
 </PropertyList>
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 81155653f..1af7bb11a 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -1,6 +1,245 @@
 <?xml version="1.0"?>
 
 <PropertyList>
+  <nasal>
+    <open><![CDATA[
+        var normalize_string = func(src) {
+          if( src == nil ) src = "";
+          var dst = "";
+          for( var i = 0; i < size(src); i+=1 ) {
+            if( src[i] == `\n` or src[i] == `\r` )
+              src[i] = ` `;
+              
+            if (i == 0 and src[i] == ` `)
+              continue;
+
+            if( i != 0 and src[i] == ` ` and src[i-1] == ` ` )
+              continue;
+
+            dst = dst ~ " ";
+            dst[size(dst)-1] = src[i];
+          }
+          return dst;
+        }
+
+      var GlobalWeatherDialogController = {
+
+        new : func( dlgRoot ) {
+          var obj = { parents: [GlobalWeatherDialogController] };
+          obj.dlgRoot = dlgRoot;
+          obj.base = "sim/gui/dialogs/metar";
+          obj.baseN = props.globals.getNode( obj.base, 1 );
+
+          return obj;
+        },
+
+        refresh : func {
+        
+          var scenarioName = getprop( me.base ~ "/source-selection");
+                
+          if (getprop( me.base ~ "/mode/manual-weather")) {
+            # In manual weather mode we have to diable live weather
+            # fetch so the weather can be changed by the user in the
+            # weather configuration dialog.  
+            setprop( "/environment/params/metar-updates-environment", 0 );
+            setprop( "/environment/realwx/enabled", 0 );
+            setprop( "/environment/config/enabled", 0 );
+          } else if( scenarioName == "Live data" ) {
+            # If we've selected Live Data we need to force
+            # a refresh of the Live Data setting.
+            setprop( "/environment/realwx/enabled", 1 );
+          }
+        },
+
+        open : func {
+        
+          # Determine the weather mode.
+          if ( getprop("/nasal/local_weather/enabled") == 1) {
+            # Local weather mode
+            setprop( me.base ~ "/mode/global-weather", "0" );
+            setprop( me.base ~ "/mode/local-weather", "1" );
+            setprop( me.base ~ "/mode/manual-weather", "0" );          
+          } else if ( getprop( "environment/params/metar-updates-environment" ) == 0 ) {
+            # Manual weather mode
+            setprop( me.base ~ "/mode/global-weather", "0" );
+            setprop( me.base ~ "/mode/local-weather", "0" );
+            setprop( me.base ~ "/mode/manual-weather", "1" );
+          } else {
+            # Global weather mode
+            setprop( me.base ~ "/mode/global-weather", "1" );
+            setprop( me.base ~ "/mode/local-weather", "0" );
+            setprop( me.base ~ "/mode/manual-weather", "0" );
+          }
+           
+          # initialize the METAR source selection
+          if( getprop( "environment/realwx/enabled" ) ) {
+            setprop( me.base ~ "/source-selection", "Live data" );
+          } else {
+            # preset configured scenario
+            var wsn = props.globals.getNode( "/environment/weather-scenarios" );
+            var found = 0;
+            if( wsn != nil ) {
+              var scenarios = wsn.getChildren("scenario");
+              forindex (var i; scenarios ) {
+                var metarN = scenarios[i].getNode("metar");
+                metarN == nil and continue;
+                if( metarN.getValue() == getprop("/environment/metar/data","") ) {
+                  setprop( me.base ~ "/source-selection", scenarios[i].getNode("name").getValue() );
+                  found = 1;
+                  break;
+                }
+              }
+            }
+            if( found == 0 )
+              setprop( me.base ~ "/source-selection", "Manual input" );
+          }
+          
+          setprop( me.base ~ "/metar-string", normalize_string(getprop("environment/metar/data")) );
+          gui.findElementByName( me.dlgRoot, "metar-string" ).getNode("legend", 1).setValue(normalize_string(getprop("environment/metar/data")));
+
+          # fill the METAR source combo box
+          var combo = gui.findElementByName( me.dlgRoot, "source-selection" );
+          var wsn = props.globals.getNode( "/environment/weather-scenarios" );
+          if( wsn != nil ) {
+            var scenarios = wsn.getChildren("scenario");
+            forindex (var i; scenarios ) {
+              combo.getChild("value", i, 1).setValue(scenarios[i].getNode("name").getValue());
+            }
+          }
+
+          me.scenarioListenerId = setlistener( me.base ~ "/source-selection", func(n) { me.scenarioListener(n); }, 1, 1 );
+          me.metarListenerId = setlistener( "environment/metar/valid", func(n) { me.metarListener(n); }, 1, 1 );
+          
+          # Update the dialog itself
+          me.refresh();
+        },
+
+        close : func {
+          removelistener( me.scenarioListenerId );
+          removelistener( me.metarListenerId );
+        },
+
+        apply : func {
+          var scenarioName = getprop( me.base ~ "/source-selection");
+          var metar = getprop( "environment/metar/data" );
+          var tile = getprop( me.base ~ "/tile");
+          var global_weather_enabled = getprop( me.base ~ "/mode/global-weather");
+          var local_weather_enabled = getprop( me.base ~ "/mode/local-weather");
+          var manual_weather_enabled = getprop( me.base ~ "/mode/manual-weather");
+          
+          # General weather settings based on scenario          
+          if (manual_weather_enabled == 1) {
+            setprop( "/environment/params/metar-updates-environment", 0 );
+            setprop( "/environment/realwx/enabled", 0 );
+            setprop( "/environment/config/enabled", 0 );
+            metar = "";
+          } else if( scenarioName == "Live data" ) {
+            setprop( "/environment/params/metar-updates-environment", 1 );
+            setprop( "/environment/realwx/enabled", 1 );
+            setprop( "/environment/config/enabled", 1 );
+          } else if( scenarioName == "Manual input" ) {
+            setprop( "/environment/params/metar-updates-environment", 1 );
+            setprop( "/environment/realwx/enabled", 0 );
+            setprop( "/environment/config/enabled", 1 );
+            metar = getprop( me.base ~ "/metar-string" );
+          } else {
+            setprop( "/environment/params/metar-updates-environment", 1 );
+            setprop( "/environment/realwx/enabled", 0 );
+            setprop( "/environment/config/enabled", 1 );
+            metar = getprop( me.base ~ "/metar-string" );
+          }
+          
+          if( metar != nil ) {
+            setprop( "environment/metar/data", normalize_string(metar) );
+          }
+          
+          # Clear any local weather that might be running
+          if (getprop("/nasal/local_weather/loaded")) local_weather.clear_all();
+          setprop("/nasal/local_weather/enabled", "false");
+          
+          if (local_weather_enabled) {
+            # If Local Weather is enabled, re-initialize with updated 
+            # initial tile and tile selection.
+            setprop("/nasal/local_weather/enabled", "true");
+            setprop("/local-weather/tmp/tile-type", tile);
+            
+            if ((scenarioName == "Live data"   ) or
+                (scenarioName == "Manual input")   ) {
+              # If using Live data, or a manually entered METAR string, the 
+              # only sensible tile selection mode is "METAR"
+              setprop("/local-weather/tmp/tile-management", "METAR");
+            } else if (tile != "") {
+              # Use Realistic Weather for defined tiles
+              setprop("/local-weather/tmp/tile-management", "realistic weather");
+            } else {
+              # Otherwise repeat the tile
+              setprop("/local-weather/tmp/tile-management", "repeat-tile");
+            }
+            
+            # Re-initialize local weather.
+            local_weather.set_tile();            
+          } 
+        },
+
+        findScenarioByName : func(name) {
+          var wsn = props.globals.getNode( "/environment/weather-scenarios" );
+          if( wsn != nil ) {
+            var scenarios = wsn.getChildren("scenario");
+            foreach (var scenario; scenarios ) {
+              if( scenario.getNode("name").getValue() == name )
+                return scenario;
+            }
+          }
+          return nil;
+        },
+
+        scenarioListener : func( n ) {
+          description = "";
+          metar = "nil";
+          tile = "";
+          var scenario = me.findScenarioByName( n.getValue() );
+          if( scenario != nil ) {
+            description = normalize_string(scenario.getNode("description", 1 ).getValue());
+            metar = normalize_string(scenario.getNode("metar", 1 ).getValue());
+            tile = normalize_string(scenario.getNode("tile", 1 ).getValue());
+          }
+          
+          if (n.getValue() == "Live data") {
+            # Special case - retrieve live data
+            var metar = getprop( "environment/metar/data" );
+          }
+          
+          if (n.getValue() == "Manual input") {
+            # Special case - retain current values
+            var metar = getprop( me.base ~ "/metar-string" );
+          }
+          
+
+          setprop(me.base ~ "/description", description );
+          setprop(me.base ~ "/metar-string", metar );
+          setprop(me.base ~ "/tile", tile);
+          me.refresh();
+        },
+
+        metarListener : func( n ) {
+          var metar = getprop("environment/metar/data");            
+          if( metar == nil or metar == "" ) metar = "NIL";
+          metar = normalize_string(metar);
+          printlog( "info", "new METAR: " ~ metar );
+          setprop( me.base ~ "/metar-string", metar );
+          gui.dialog_update( "weather-conditions", "metar-string" );
+        },
+        
+      };
+
+      var controller = GlobalWeatherDialogController.new( cmdarg() );
+      controller.open();
+    ]]></open>
+
+    <close><![CDATA[
+      controller.close();
+    ]]></close>
+  </nasal>
 
   <!-- Control the weather -->
   <name>weather</name>
@@ -19,7 +258,7 @@
     </empty>
 
     <text>
-      <label>Basic Troposphere Weather Conditions</label>
+      <label>Weather Conditions</label>
     </text>
 
     <empty>
@@ -41,1754 +280,185 @@
   <hrule/>
 
   <group>
-    <layout>hbox</layout>
-    <default-padding>0</default-padding>
-
-    <!-- Left Column -->
+    <layout>vbox</layout>
+  
+    <text>
+      <halign>left</halign>
+      <label>Weather Modeling</label>
+    </text>
+    
     <group>
-      <layout>vbox</layout>
+      <layout>hbox</layout>
+      <empty><stretch>true</stretch></empty>  
       <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <!-- Cloud Layers -->
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Cloud Layers (All Altitudes ft-AMSL)</label>
-            <enable>
-              <property>/sim/gui/dialogs/weather-scenario/state</property>
-            </enable>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <group>
-            <layout>table</layout>
-
-            <text>
-              <label>Altitude (ft)</label>
-              <row>0</row>
-              <col>1</col>
-              <enable>
-                <property>/sim/gui/dialogs/weather-scenario/state</property>
-              </enable>
-            </text>
-
-            <text>
-              <label>Coverage</label>
-              <row>0</row>
-              <col>2</col>
-              <width>80</width>
-              <enable>
-                <property>/sim/gui/dialogs/weather-scenario/state</property>
-              </enable>
-            </text>
-
-            <text>
-              <label>Thickness (ft)</label>
-              <row>0</row>
-              <col>3</col>
-              <enable>
-                <property>/sim/gui/dialogs/weather-scenario/state</property>
-              </enable>
-            </text>
-
-
-            <!-- Layer 4 -->
-
-            <input>
-              <row>1</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[4]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-            <combo>
-              <row>1</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[4]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </combo>
-
-            <input>
-              <row>1</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[4]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-
-            <!-- Layer 3 -->
-
-            <input>
-              <row>2</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[3]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-            <combo>
-              <row>2</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[3]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </combo>
-
-            <input>
-              <row>2</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[3]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-
-            <!-- Layer 2 -->
-
-            <input>
-              <row>3</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[2]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-            <combo>
-              <row>3</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[2]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </combo>
-
-            <input>
-              <row>3</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[2]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-
-            <!-- Layer 1 -->
-
-            <input>
-              <row>4</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[1]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-            <combo>
-              <row>4</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[1]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </combo>
-
-            <input>
-              <row>4</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[1]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-
-            <!-- Layer 0 -->
-
-            <input>
-              <row>5</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[0]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-            <combo>
-              <row>5</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <editable>false</editable>
-              <property>/environment/clouds/layer[0]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </combo>
-
-            <input>
-              <row>5</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[0]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-          </group>
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-      </group>
-      <!-- Cloud Layers End -->
-
-      <!-- Precipitation -->
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Precipitation</label>
-        <enable>
-              <property>/sim/gui/dialogs/weather-scenario/state</property>
-            </enable>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>vbox</layout>
+        <layout>table</layout>
+        <radio>
+          <row>0</row>
+          <col>0</col>
+          <halign>left</halign>
+          <name>simple-weather</name>
+          <property>sim/gui/dialogs/metar/mode/global-weather</property>
+          <live>true</live>
+          <label>Interpret METAR directly</label>
+          <binding>
+            <command>property-assign</command>
+            <property>sim/gui/dialogs/metar/mode/global-weather</property>
+            <value>1</value>
+          </binding>        
+          <binding>
+            <command>property-assign</command>
+            <property>sim/gui/dialogs/metar/mode/local-weather</property>
+            <value>0</value>
+          </binding>        
+          <binding>
+            <command>property-assign</command>
+            <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+            <value>0</value>
+          </binding>        
+          <binding>
+            <command>nasal</command>
+            <script>
+              controller.refresh();
+            </script>
+          </binding>        
+          
+        </radio>
+        <radio>
+          <row>1</row>
+          <col>0</col>
+          <halign>left</halign>
+          <name>simple-weather</name>
+          <property>sim/gui/dialogs/metar/mode/local-weather</property>
+          <live>true</live>
+          <label>Model overall weather conditions based on METAR</label>
+          <binding>
+            <command>property-assign</command>
+            <property>sim/gui/dialogs/metar/mode/local-weather</property>
+            <value>1</value>
+          </binding>        
+          <binding>
+            <command>property-assign</command>
+            <property>sim/gui/dialogs/metar/mode/global-weather</property>
+            <value>0</value>
+          </binding>        
+          <binding>
+            <command>property-assign</command>
+            <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+            <value>0</value>
+          </binding>        
+          <binding>
+            <command>nasal</command>
+            <script>
+              controller.refresh();
+            </script>
+          </binding>        
+          
+        </radio>
+        <button>
+          <row>1</row>
+          <col>2</col>
           <halign>fill</halign>
-          <group>
-            <layout>table</layout>
-            <text>
-              <row>0</row>
-              <col>0</col>
-              <label>Rain</label>
-              <halign>left</halign>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </text>
+          <stretch>true</stretch>
+          <legend>Advanced Settings...</legend>
+          <enable>
+              <property>sim/gui/dialogs/metar/mode/local-weather</property>
+              <value>1</value>
+          </enable>
+          <binding>
+            <command>dialog-show</command>
+            <dialog-name>local-weather</dialog-name>
+          </binding>        
+        </button>    
 
-            <slider>
-              <row>0</row>
-              <col>1</col>
-              <live>true</live>
-              <halign>fill</halign>
-              <property>/environment/rain-norm</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <stretch>true</stretch>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </slider>
-			
-            <text>
-              <row>1</row>
-              <col>0</col>
-              <label>Snow</label>
-              <halign>left</halign>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </text>
-
-            <slider>
-              <row>1</row>
-              <col>1</col>
-              <halign>fill</halign>
-              <property>/environment/snow-norm</property>
-              <live>true</live>
-              <pref-height>30</pref-height>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </slider>
-
-            <text>
-              <row>0</row>
-              <col>3</col>
-              <label>QNH (inHg)</label>
-              <enable>
-                <property>/sim/gui/dialogs/weather-scenario/state</property>
-              </enable>
-            </text>
-
-            <input>
-              <name>pressure-sea-level-inhg</name>
-              <row>1</row>
-              <col>3</col>
-              <pref-width>50</pref-width>
-              <property>/environment/config/boundary/entry[0]/pressure-sea-level-inhg</property>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>pressure-sea-level-inhg</object-name>
-              </binding>
-            </input>
-			
-            <text>
-              <label>Snow line</label>
-              <row>2</row>
-              <col>0</col>
-              <enable>
-                <and>
-                  <property>/sim/rendering/shaders/quality-level</property>
-                  <or>
-                    <property>/sim/rendering/shaders/crop</property>
-                    <property>/sim/rendering/shaders/landmass</property>
-                    <property>/sim/rendering/shaders/transition</property>
-                    <property>/sim/rendering/shaders/urban</property>
-                  </or>
-                </and>
-              </enable>
-            </text>
-            
-            <slider>
-              <name>snow-level</name>
-              <row>2</row>
-              <col>1</col>
-              <enable>
-                <and>
-                  <property>/sim/rendering/shaders/quality-level</property>
-                  <or>
-                    <property>/sim/rendering/shaders/crop</property>
-                    <property>/sim/rendering/shaders/landmass</property>
-                    <property>/sim/rendering/shaders/transition</property>
-                    <property>/sim/rendering/shaders/urban</property>
-                  </or>
-                </and>
-              </enable>
-              <min>-425.0</min>
-              <max>5000.0</max>
-              <live>true</live>
-              <property>/environment/snow-level-m</property>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>snow-level</object-name>
-              </binding>
-            </slider>
-            
-            <text>
-              <row>2</row>
-              <col>2</col>
-              <enable>
-                <and>
-                  <property>/sim/rendering/shaders/quality-level</property>
-                  <or>
-                    <property>/sim/rendering/shaders/crop</property>
-                    <property>/sim/rendering/shaders/landmass</property>
-                    <property>/sim/rendering/shaders/transition</property>
-                    <property>/sim/rendering/shaders/urban</property>
-                  </or>
-                </and>
-              </enable>
-              <label>12345678</label>
-              <format>%.fm</format>
-              <live>true</live>
-              <property>/environment/snow-level-m</property>
-            </text>
-
-          </group>
-		  
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-
-          <text>
-            <visible>
-              <not>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </not>
-            </visible>
-            <label>Disable METAR to manually edit weather settings.</label>
-            <halign>left</halign>
-            <color>
-              <red>1.0</red>
-              <green>0.6</green>
-              <blue>0.6</blue>
-            </color>
-          </text>
-
-        </group>
+        <radio>
+          <row>2</row>
+          <col>0</col>
+          <halign>left</halign>
+          <name>simple-weather</name>
+          <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+          <live>true</live>
+          <label>Configure weather manually</label>
+          <binding>
+            <command>property-assign</command>
+            <property>sim/gui/dialogs/metar/mode/local-weather</property>
+            <value>0</value>
+          </binding>        
+          <binding>
+            <command>property-assign</command>
+            <property>sim/gui/dialogs/metar/mode/global-weather</property>
+            <value>0</value>
+          </binding>        
+          <binding>
+            <command>property-assign</command>
+            <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+            <value>1</value>
+          </binding>        
+          <binding>
+            <command>nasal</command>
+            <script>
+              controller.refresh();
+            </script>
+          </binding>                  
+        </radio>
+        
+        <button>
+          <row>2</row>
+          <col>2</col>
+          <halign>fill</halign>
+          <stretch>true</stretch>
+          <legend>Weather Configuration...</legend>
+          <enable>
+              <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+          </enable>
+          <binding>
+            <command>dialog-show</command>
+            <dialog-name>weather-configuration</dialog-name>
+          </binding>        
+        </button>    
       </group>
-      <!-- Precipitation End  -->
+      
     </group>
-    <!-- Left Column End -->
-
-    <vrule>
-      <stretch>true</stretch>
-    </vrule>
-
-    <!-- Right Column -->
-    <group>
-      <layout>vbox</layout>
-
-      <!-- Aloft -->
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Aloft (All Altitudes ft-AMSL)</label>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <group>
-            <layout>table</layout>
-            <text>
-              <row>0</row>
-              <col>0</col>
-              <label>Altitude</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>1</col>
-              <colspan>2</colspan>
-              <label>Wind (dir/kt)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>3</col>
-              <label>Vis (m)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>4</col>
-              <label>Temp (C)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>5</col>
-              <label>Dewpt (C)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>6</col>
-              <label>Turbulence</label>
-            </text>
-
-            <input>
-              <name>aloft-4-elevation-ft</name>
-              <row>1</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-4-wind-from-heading-deg</name>
-              <row>1</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-4-wind-speed-kt</name>
-              <row>1</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-4-visibility-m</name>
-              <row>1</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/aloft/entry[4]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-4-temperature-degc</name>
-              <row>1</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-4-dewpoint-degc</name>
-              <row>1</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <combo>
-              <name>aloft-4-turbulence</name>
-              <row>1</row>
-              <col>6</col>
-              <pref-width>90</pref-width>
-              <live>true</live>
-              <property>/environment/config/aloft/entry[4]/turbulence-name</property>
-              <value>none</value>
-              <value>light</value>
-              <value>moderate</value>
-              <value>severe</value>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-turbulence</object-name>
-              </binding>
-              <binding>
-                <command>nasal</command>
-                <script>controller.setTurbulence("aloft",4);</script>
-              </binding>
-              <!--enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable-->
-            </combo>
-
-            <input>
-              <name>aloft-3-elevation-ft</name>
-              <row>2</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-wind-from-heading-deg</name>
-              <row>2</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-wind-speed-kt</name>
-              <row>2</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-visibility-m</name>
-              <row>2</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/aloft/entry[3]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-temperature-degc</name>
-              <row>2</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-dewpoint-degc</name>
-              <row>2</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <combo>
-              <name>aloft-3-turbulence</name>
-              <row>2</row>
-              <col>6</col>
-              <pref-width>90</pref-width>
-              <live>true</live>
-              <property>/environment/config/aloft/entry[3]/turbulence-name</property>
-              <value>none</value>
-              <value>light</value>
-              <value>moderate</value>
-              <value>severe</value>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-turbulence</object-name>
-              </binding>
-              <binding>
-                <command>nasal</command>
-                <script>controller.setTurbulence("aloft",3);</script>
-              </binding>
-              <!--enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable-->
-            </combo>
-
-            <input>
-              <name>aloft-2-elevation-ft</name>
-              <row>3</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-wind-from-heading-deg</name>
-              <row>3</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-wind-speed-kt</name>
-              <row>3</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-visibility-m</name>
-              <row>3</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/aloft/entry[2]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-temperature-degc</name>
-              <row>3</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-dewpoint-degc</name>
-              <row>3</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <combo>
-              <name>aloft-2-turbulence</name>
-              <row>3</row>
-              <col>6</col>
-              <pref-width>90</pref-width>
-              <live>true</live>
-              <property>/environment/config/aloft/entry[2]/turbulence-name</property>
-              <value>none</value>
-              <value>light</value>
-              <value>moderate</value>
-              <value>severe</value>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-turbulence</object-name>
-              </binding>
-              <binding>
-                <command>nasal</command>
-                <script>controller.setTurbulence("aloft",2);</script>
-              </binding>
-              <!--enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable-->
-            </combo>
-
-
-            <input>
-              <name>aloft-1-elevation-ft</name>
-              <row>4</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-wind-from-heading-deg</name>
-              <row>4</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-wind-speed-kt</name>
-              <row>4</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-visibility-m</name>
-              <row>4</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/aloft/entry[1]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-temperature-degc</name>
-              <row>4</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-dewpoint-degc</name>
-              <row>4</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <combo>
-              <name>aloft-1-turbulence</name>
-              <row>4</row>
-              <col>6</col>
-              <pref-width>90</pref-width>
-              <live>true</live>
-              <property>/environment/config/aloft/entry[1]/turbulence-name</property>
-              <value>none</value>
-              <value>light</value>
-              <value>moderate</value>
-              <value>severe</value>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-turbulence</object-name>
-              </binding>
-              <binding>
-                <command>nasal</command>
-                <script>controller.setTurbulence("aloft",1);</script>
-              </binding>
-              <!--enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable-->
-            </combo>
-
-            <input>
-              <name>aloft-0-elevation-ft</name>
-              <row>5</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-wind-from-heading-deg</name>
-              <row>5</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-wind-speed-kt</name>
-              <row>5</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-visibility-m</name>
-              <row>5</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-temperature-degc</name>
-              <row>5</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-dewpoint-degc</name>
-              <row>5</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <combo>
-              <name>aloft-0-turbulence</name>
-              <row>5</row>
-              <col>6</col>
-              <pref-width>90</pref-width>
-              <live>true</live>
-              <property>/environment/config/aloft/entry[0]/turbulence-name</property>
-              <value>none</value>
-              <value>light</value>
-              <value>moderate</value>
-              <value>severe</value>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-turbulence</object-name>
-              </binding>
-              <binding>
-                <command>nasal</command>
-                <script>controller.setTurbulence("aloft",0);</script>
-              </binding>
-              <!--enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable-->
-            </combo>
-
-          </group>
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-
-      </group>
-      <!-- Aloft End -->
-
-      <!-- Boundary  -->
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Boundary (All Elevations ft-AGL)</label>
-        <enable>
-              <property>/sim/gui/dialogs/weather-scenario/state</property>
-            </enable>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <group>
-
-            <layout>table</layout>
-
-            <text>
-              <row>0</row>
-              <col>0</col>
-              <label>Elevation</label>
-          <enable>
-                <property>/sim/gui/dialogs/weather-scenario/state</property>
-              </enable>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>1</col>
-              <colspan>2</colspan>
-              <label>Wind (dir/kt)</label>
-          <enable>
-                <property>/sim/gui/dialogs/weather-scenario/state</property>
-              </enable>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>3</col>
-              <label>Vis (m)</label>
-          <enable>
-                <property>/sim/gui/dialogs/weather-scenario/state</property>
-              </enable>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>4</col>
-              <label>Temp (C)</label>
-          <enable>
-                <property>/sim/gui/dialogs/weather-scenario/state</property>
-              </enable>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>5</col>
-              <label>Dewpt (C)</label>
-              <enable>
-                <property>/sim/gui/dialogs/weather-scenario/state</property>
-              </enable>
-            </text>
-
-            <input>
-              <name>boundary-1-elevation-ft</name>
-              <row>1</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-1-wind-from-heading-deg</name>
-              <row>1</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-1-wind-speed-kt</name>
-              <row>1</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-1-visibility-m</name>
-              <row>1</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-1-temperature-degc</name>
-              <row>1</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-1-dewpoint-degc</name>
-              <row>1</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <combo>
-              <name>boundary-1-turbulence</name>
-              <row>1</row>
-              <col>6</col>
-              <pref-width>90</pref-width>
-              <live>true</live>
-              <property>/environment/config/boundary/entry[1]/turbulence-name</property>
-              <value>none</value>
-              <value>light</value>
-              <value>moderate</value>
-              <value>severe</value>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-turbulence</object-name>
-              </binding>
-              <binding>
-                <command>nasal</command>
-                <script>controller.setTurbulence("boundary",1);</script>
-              </binding>
-              <!--enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable-->
-            </combo>
-
-            <input>
-              <name>boundary-0-elevation-ft</name>
-              <row>2</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-wind-from-heading-deg</name>
-              <row>2</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-wind-speed-kt</name>
-              <row>2</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-visibility-m</name>
-              <row>2</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-temperature-degc</name>
-              <row>2</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-dewpoint-degc</name>
-              <row>2</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <combo>
-              <name>boundary-0-turbulence</name>
-              <row>2</row>
-              <col>6</col>
-              <pref-width>90</pref-width>
-              <live>true</live>
-              <property>/environment/config/boundary/entry[0]/turbulence-name</property>
-              <value>none</value>
-              <value>light</value>
-              <value>moderate</value>
-              <value>severe</value>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-turbulence</object-name>
-              </binding>
-              <binding>
-                <command>nasal</command>
-                <script>controller.setTurbulence("boundary",0);</script>
-              </binding>
-              <!--enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable-->
-            </combo>
-
-          </group>
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-
-      </group>
-      <!-- Boundary  End -->
-
-    </group>
-    <!-- Right Column -->
-
+    <empty><stretch>true</stretch></empty>  
   </group>
+        
+  <hrule/>  
 
   <group>
     <layout>vbox</layout>
 
-    <!-- Automatic Weather -->
     <group>
-      <layout>hbox</layout>
+      <layout>table</layout>
       <text>
-        <label>Automatic Weather Generation</label>
-      </text>
-      <hrule>
-        <stretch>true</stretch>
-      </hrule>
-    </group>
-
-    <group>
-      <layout>hbox</layout>
-      <text>
-        <label>METAR Source</label>
+        <row>0</row>
+        <col>0</col>
+        <label>Weather Conditions</label>
       </text>
       <combo>
+        <row>0</row>
+        <col>1</col>
         <name>source-selection</name>
         <halign>fill</halign>
         <stretch>true</stretch>
-        <property>sim/gui/dialogs/weather-scenario/source-selection</property>
+        <pref-width>400</pref-width>
+        <property>sim/gui/dialogs/metar/source-selection</property>
+        <enable>
+          <equals>
+            <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+            <value>0</value>
+          </equals>
+        </enable>
         <binding>
           <command>dialog-apply</command>
           <object-name>source-selection</object-name>
         </binding>
         <binding>
           <command>dialog-update</command>
-          <object-name>metar</object-name>
-        </binding>
-        <!-- Hack: disable local-weather when the users selects a predefined scenario
-             Fix for #567 -->
-        <binding>
-          <command>nasal</command>
-          <script>if (getprop("/nasal/local_weather/loaded",0)) local_weather.clear_all()</script>
+          <object-name>metar-string</object-name>
         </binding>
       </combo>
 
-      <checkbox>
-        <name>metar-updates-winds-aloft</name>
-        <property>/environment/params/metar-updates-winds-aloft</property>
-        <label>Update winds aloft</label>
-        <live>true</live>
-        <binding>
-          <command>dialog-apply</command>
-          <object-name>metar-updates-winds-aloft</object-name>
-        </binding>
-      </checkbox>
-
     </group>
-
-    <textbox>
-      <name>description</name>
-      <halign>fill</halign>
-      <stretch>true</stretch>
-      <pref-width>180</pref-width>
-      <pref-height>60</pref-height>
-      <slider>20</slider>
-      <editable>false</editable>
-      <wrap>true</wrap>
-      <live>true</live>
-      <property>sim/gui/dialogs/weather-scenario/description</property>
-    </textbox>
-
+    
     <group>
       <layout>hbox</layout>
       <text>
@@ -1811,55 +481,59 @@
     <group>
       <layout>hbox</layout>
       <textbox>
-        <name>metar</name>
+        <name>metar-string</name>
         <halign>fill</halign>
         <stretch>true</stretch>
-        <pref-width>180</pref-width>
-        <pref-height>50</pref-height>
-        <slider>20</slider>
+        <pref-width>250</pref-width>
+        <pref-height>60</pref-height>
         <editable>true</editable>
         <wrap>true</wrap>
         <live>false</live>
-        <property>sim/gui/dialogs/weather-scenario/metar</property>
+        <slider>false</slider>
+        <property>sim/gui/dialogs/metar/metar-string</property>
         <enable>
-          <greater-than>
-            <property>/sim/gui/dialogs/weather-scenario/state</property>
-            <value type="int">1</value>
-          </greater-than>>
+          <and>
+            <equals>
+              <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+              <value>0</value>
+            </equals>
+            <equals>
+              <property>sim/gui/dialogs/metar/source-selection</property>
+              <value>Manual input</value>
+            </equals>
+          </and>
         </enable>
         <binding>
           <command>dialog-apply</command>
-          <object-name>metar</object-name>
-        </binding>
-        <binding>
-          <command>nasal</command>
-          <script>
-            setprop( "/environment/metar/data", getprop( "sim/gui/dialogs/weather-scenario/metar") );
-          </script>
+          <object-name>metar-string</object-name>
         </binding>
       </textbox>
-      <button>
-        <legend>Apply</legend>
-        <pref-width>50</pref-width>
-        <pref-height>50</pref-height>
-        <border>2</border>
-        <binding>
-          <command>dialog-apply</command>
-          <object-name>metar</object-name>
-        </binding>
-        <binding>
-          <command>nasal</command>
-          <script>
-            setprop( "/environment/metar/data", getprop( "sim/gui/dialogs/weather-scenario/metar") );
-          </script>
-        </binding>
-      </button>
     </group>
 
-    <!-- Automatic Weather -->
+    <group>
+      <layout>hbox</layout>
+      <text>
+        <label>Description</label>
+      </text>
+      <empty>
+        <stretch>true</stretch>
+      </empty>
+    </group>
 
+    <textbox>
+      <name>description</name>
+      <halign>fill</halign>
+      <stretch>true</stretch>
+      <pref-width>250</pref-width>
+      <pref-height>150</pref-height>
+      <slider>0</slider>
+      <editable>false</editable>
+      <wrap>true</wrap>
+      <live>true</live>
+      <property>sim/gui/dialogs/metar/description</property>
+    </textbox>
   </group>
-
+  
   <hrule/>
 
   <group>
@@ -1867,6 +541,38 @@
       <stretch>true</stretch>
     </empty>
     <layout>hbox</layout>
+
+    <button>
+      <legend>OK</legend>
+      <binding>
+        <command>dialog-apply</command>
+        <object-name>metar-string</object-name>
+      </binding>
+      <binding>
+        <command>nasal</command>
+        <script>
+          controller.apply();
+        </script>
+      </binding>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+    
+    <button>
+      <legend>Apply</legend>
+      <binding>
+        <command>dialog-apply</command>
+        <object-name>metar-string</object-name>
+      </binding>
+      <binding>
+        <command>nasal</command>
+        <script>
+          controller.apply();
+        </script>
+      </binding>
+    </button>
+
     <button>
       <legend>Close</legend>
       <default>true</default>
@@ -1875,201 +581,9 @@
         <command>dialog-close</command>
       </binding>
     </button>
-
-    <button>
-      <legend>Advanced Weather --></legend>
-      <default>false</default>
-      <binding>
-        <command>property-assign</command>
-        <property>/nasal/local_weather/enabled</property>
-        <value type="bool">true</value>
-      </binding>
-      <binding>
-        <command>dialog-show</command>
-        <dialog-name>local_weather_tiles</dialog-name>
-      </binding>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
-    </button>
     <empty>
       <stretch>true</stretch>
     </empty>
   </group>
 
-  <nasal>
-    <open><![CDATA[
-        var normalize_string = func(src) {
-          if( src == nil ) src = "";
-          var dst = "";
-          for( var i = 0; i < size(src); i+=1 ) {
-            if( src[i] == `\n` or src[i] == `\r` )
-              src[i] = ` `;
-
-            if( i != 0 and src[i] == ` ` and src[i-1] == ` ` )
-              continue;
-
-            dst = dst ~ " ";
-            dst[size(dst)-1] = src[i];
-          }
-          return dst;
-        }
-
-      var GlobalWeatherDialogController = {
-
-        new : func( dlgRoot ) {
-          var obj = { parents: [GlobalWeatherDialogController] };
-          obj.dlgRoot = dlgRoot;
-          obj.base = "sim/gui/dialogs/weather-scenario";
-          obj.baseN = props.globals.getNode( obj.base, 1 );
-
-          return obj;
-        },
-
-        open : func {
-          for( var i = 0; i < 5; i+=1 )
-            me.initTurbulence("aloft", i );
-
-          for( var i = 0; i < 2; i+=1 )
-            me.initTurbulence("boundary", i );
-           
-          #initialize the METAR source selection
-          if( getprop( "environment/params/metar-updates-environment" ) == 0 ) {
-            setprop( me.base ~ "/source-selection", "Disabled" );
-          } else if( getprop( "environment/realwx/enabled" ) ) {
-            setprop( me.base ~ "/source-selection", "Live data" );
-          } else {
-            # preset configured scenario
-            var wsn = props.globals.getNode( "/environment/weather-scenarios" );
-            var found = 0;
-            if( wsn != nil ) {
-              var scenarios = wsn.getChildren("scenario");
-              forindex (var i; scenarios ) {
-                var metarN = scenarios[i].getNode("metar");
-                metarN == nil and continue;
-                if( metarN.getValue() == getprop("/environment/metar/data","") ) {
-                  setprop( me.base ~ "/source-selection", scenarios[i].getNode("name").getValue() );
-                  found = 1;
-                  break;
-                }
-              }
-            }
-            if( found == 0 )
-              setprop( me.base ~ "/source-selection", "Manual input" );
-          }
-          setprop( me.base ~ "/metar", normalize_string(getprop("environment/metar/data")) );
-
-
-          # fill the METAR source combo box
-          var combo = gui.findElementByName( me.dlgRoot, "source-selection" );
-          var wsn = props.globals.getNode( "/environment/weather-scenarios" );
-          if( wsn != nil ) {
-            var scenarios = wsn.getChildren("scenario");
-            forindex (var i; scenarios )
-              combo.getChild("value", i, 1).setValue(scenarios[i].getNode("name").getValue());
-          }
-
-          me.scenarioListenerId = setlistener( me.base ~ "/source-selection", func(n) { me.scenarioListener(n); }, 1, 1 );
-          me.metarListenerId = setlistener( "environment/metar/valid", func(n) { me.metarListener(n); }, 1, 1 );
-        },
-
-        close : func {
-          removelistener( me.scenarioListenerId );
-          removelistener( me.metarListenerId );
-        },
-
-        stateChange : func {
-          var scenarioName = getprop( me.base ~ "/source-selection");
-          var metar = getprop( "environment/metar/data" );
-          if( scenarioName == "Disabled" ) {
-            setprop( "/environment/params/metar-updates-environment", 0 );
-            setprop( "/environment/realwx/enabled", 0 );
-            setprop( "/environment/config/enabled", 0 );
-            me.baseN.getNode("state",1).setIntValue( 1 );
-            metar = "";
-          } else if( scenarioName == "Live data" ) {
-            setprop( "/environment/params/metar-updates-environment", 1 );
-            setprop( "/environment/realwx/enabled", 1 );
-            setprop( "/environment/config/enabled", 1 );
-            me.baseN.getNode("state",1).setIntValue( 0 );
-          } else if( scenarioName == "Manual input" ) {
-            setprop( "/environment/params/metar-updates-environment", 1 );
-            setprop( "/environment/realwx/enabled", 0 );
-            setprop( "/environment/config/enabled", 1 );
-            me.baseN.getNode("state",1).setIntValue( 2 );
-          } else {
-            setprop( "/environment/params/metar-updates-environment", 1 );
-            setprop( "/environment/realwx/enabled", 0 );
-            setprop( "/environment/config/enabled", 1 );
-            metar = getprop( me.base ~ "/metar" );
-            me.baseN.getNode("state",1).setIntValue( 0 );
-          }
-          if( metar != nil )
-            setprop( "environment/metar/data", normalize_string(metar) );
-        },
-
-        findScenarioByName : func(name) {
-          var wsn = props.globals.getNode( "/environment/weather-scenarios" );
-          if( wsn != nil ) {
-            var scenarios = wsn.getChildren("scenario");
-            foreach (var scenario; scenarios ) {
-              if( scenario.getNode("name").getValue() == name )
-                return scenario;
-            }
-          }
-          return nil;
-        },
-
-        scenarioListener : func( n ) {
-          description = "";
-          metar = "nil";
-          var scenario = me.findScenarioByName( n.getValue() );
-          if( scenario != nil ) {
-            description = normalize_string(scenario.getNode("description", 1 ).getValue());
-            metar = normalize_string(scenario.getNode("metar", 1 ).getValue());
-          }
-          setprop(me.base ~ "/description", description );
-          setprop(me.base ~ "/metar", metar );
-          me.stateChange();
-        },
-
-        metarListener : func( n ) {
-          var metar = getprop("environment/metar/data");
-          if( metar == nil or metar == "" ) metar = "NIL";
-          metar = normalize_string(metar);
-          printlog( "info", "new METAR: " ~ metar );
-          setprop( me.base ~ "/metar", metar );
-          gui.dialog_update( "weather", "metar" );
-        },
-
-        setTurbulence : func( where, idx ) {
-          var propPath = "/environment/config/" ~ where ~ "/entry[" ~ idx ~ "]/";
-          setprop( propPath ~ "turbulence/magnitude-norm", 
-            me.turbulenceNames[getprop(propPath ~ "turbulence-name")]/(size(me.turbulenceNames)-1) );
-        },
-
-        initTurbulence : func( where, idx ) {
-          var propPath = "/environment/config/" ~ where ~ "/entry[" ~ idx ~ "]/";
-          var turb = getprop( propPath ~ "turbulence/magnitude-norm" ) * (size(me.turbulenceNames)-1);
-          turb = int(int(10*turb+5)/10); # round to nearest integer
-          foreach( var t; keys(me.turbulenceNames) ) {
-            if( me.turbulenceNames[t] == turb ) {
-              setprop( propPath ~ "turbulence-name", t );
-              break;
-            }
-          }
-        },
-
-        turbulenceNames : { "none" : 0, "light" : 1, "moderate" : 2, "severe" : 3 },
-
-      };
-
-      var controller = GlobalWeatherDialogController.new( cmdarg() );
-      controller.open();
-    ]]></open>
-
-    <close><![CDATA[
-      controller.close();
-    ]]></close>
-  </nasal>
 </PropertyList>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 01be7053c..f58ade722 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -272,23 +272,13 @@
 
 	<menu>
 		<name>environment</name>
-
+		
 		<item>
 			<name>global-weather</name>
 			<binding>
-				<condition>
-					<not><property>/nasal/local_weather/enabled</property></not>
-				</condition>
 				<command>dialog-show</command>
 				<dialog-name>weather</dialog-name>
 			</binding>
-			<binding>
-				<condition>
-					<property>/nasal/local_weather/enabled</property>
-				</condition>
-				<command>dialog-show</command>
-				<dialog-name>local_weather_tiles</dialog-name>
-			</binding>
 		</item>
 
 		<item>