fly/fgdata
1
0
Fork 0
Code Activity

Local/Global Weather Menu cleanup

Browse source 
- use just a single "Weather" menu item
- add buttons to switch between global and local weather dialogs
- Rename Global Weather to Basic Weather
- Rename Local Weather to Advanced Weather
This commit is contained in:
Torsten Dreyer 2012-01-22 18:29:11 +01:00
parent 1d3df86609
commit d63d9c98e7
3 changed files with 65 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gui/dialogs/local_weather_tiles.xml
View file

@ -539,7 +539,7 @@
</binding>
</button>
<button>
<button>
<x>200</x>
<y>0</y>
<legend>Show winds</legend>
@ -553,6 +553,28 @@
</binding>
</button>
<button>
<x>290</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>

44
gui/dialogs/weather.xml
View file

@ -19,7 +19,7 @@
</empty>
<text>
<label>Global Troposphere Weather Conditions</label>
<label>Basic Troposphere Weather Conditions</label>
</text>
<empty>
@ -1862,14 +1862,40 @@
<hrule/>
<button>
<legend>Close</legend>
<default>true</default>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>
<group>
<empty>
<stretch>true</stretch>
</empty>
<layout>hbox</layout>
<button>
<legend>Close</legend>
<default>true</default>
<key>Esc</key>
<binding>
<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[

39
gui/menubar.xml
View file

@ -298,50 +298,25 @@
<label>Environment</label>
<name>environment</name>
<!--<item>
<label>Weather Scenario</label>
<binding>
<command>dialog-show</command>
<dialog-name>weather_scenario</dialog-name>
</binding>
</item>
<item>
<label>Weather Conditions</label>
<binding>
<command>dialog-show</command>
<dialog-name>weather</dialog-name>
</binding>
</item>-->
<item>
<label>Global Weather</label>
<label>Weather</label>
<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>
</item>
<item>
<label>Local Weather</label>
<name>local_weather_tiles</name>
<enabled>false</enabled>
<binding>
<condition>
<property>/nasal/local_weather/enabled</property>
</condition>
<command>dialog-show</command>
<dialog-name>local_weather_tiles</dialog-name>
</binding>
</item>
<item>
<label>Local Weather Settings</label>
<name>local_weather_config</name>
<binding>
<command>dialog-show</command>
<dialog-name>local_weather_config</dialog-name>
</binding>
</item>
<item>
<label>Time Settings</label>
<name>time-settings</name>