fly/fgdata
1
0
Fork 0
Code Activity

GUI Cleanup from Michael HABARTA. Part 3/3

Browse source
This commit is contained in:
Stuart Buchanan 2015-05-03 17:13:50 +01:00
parent 12166b2ecd
commit b4d16682ce
23 changed files with 3302 additions and 2782 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Nasal/wildfire.nas
View file

@ -1111,7 +1111,7 @@ var dialog = {
var titlebar = me.dialog.addChild("group"); var titlebar = me.dialog.addChild("group");
titlebar.set("layout", "hbox"); titlebar.set("layout", "hbox");
titlebar.addChild("empty").set("stretch", 1); titlebar.addChild("empty").set("stretch", 1);
titlebar.addChild("text").set("label", "Wildfire settings"); titlebar.addChild("text").set("label", "Wildfire Settings");
titlebar.addChild("empty").set("stretch", 1); titlebar.addChild("empty").set("stretch", 1);
var w = titlebar.addChild("button"); var w = titlebar.addChild("button");
w.set("pref-width", 16); w.set("pref-width", 16);

16
gui/dialogs/joystick-config.xml
View file

@ -188,37 +188,37 @@ var updateConfig = func() {
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>To configure your joystick/yoke/pedals:</label> <label> To configure your joystick/yoke/pedals:</label>
</text> </text>
<text> <text>
<halign>left</halign> <halign>left</halign>
<label> 1) Select the device your wish to configure from the drop-down.</label> <label> 1) Select the device your wish to configure from the drop-down.</label>
</text> </text>
<text> <text>
<halign>left</halign> <halign>left</halign>
<label> 2) Identify the control you wish to configure by moving the joystick or pressing the button. The result is shown in the Input column.</label> <label> 2) Identify the control you wish to configure by moving the joystick or pressing the button. The result is shown in the Input column.</label>
</text> </text>
<text> <text>
<halign>left</halign> <halign>left</halign>
<label> 3) Using the drop-down or dialog button, select what you want the control to do. "Custom" indicates a manually configured command.</label> <label> 3) Using the drop-down or dialog button, select what you want the control to do. "Custom" indicates a manually configured command.</label>
</text> </text>
<text> <text>
<halign>left</halign> <halign>left</halign>
<label> Your selection will take effect immediately.</label> <label> Your selection will take effect immediately.</label>
</text> </text>
<text> <text>
<halign>left</halign> <halign>left</halign>
<label> 4) Test your control. Some joystick controls can be "inverted" if you wish the control to take effect in the opposite direction.</label> <label> 4) Test your control. Some joystick controls can be "inverted" if you wish the control to take effect in the opposite direction.</label>
</text> </text>
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>Your modified joystick configuration is saved automatically. You can reset the configuration to the default by pressing Reset Configuration.</label> <label> Your modified joystick configuration is saved automatically. You can reset the configuration to the default by pressing Reset Configuration. </label>
</text> </text>
<hrule/> <hrule/>
@ -291,7 +291,7 @@ var updateConfig = func() {
<row>1</row> <row>1</row>
<col>0</col> <col>0</col>
<halign>right</halign> <halign>right</halign>
<label>Configuration File:</label> <label> Configuration File:</label>
</text> </text>
<text> <text>

821
gui/dialogs/local_weather_tiles.xml
View file

@ -39,116 +39,134 @@
<hrule/> <hrule/>
<group> <group>
<layout>vbox</layout> <layout>hbox</layout>
<!-- gap -->
<text> <text>
<halign>left</halign> <label></label>
<label>General Settings</label>
</text> </text>
<group>
<layout>table</layout>
<text>
<row>0</row>
<col>0</col>
<halign>right</halign>
<label>Tile selection mode</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>
<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>
<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>
<checkbox>
<row>3</row>
<col>2</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> <group>
<layout>vbox</layout> <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>
<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>
<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>
<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>
<checkbox>
<row>3</row>
<col>2</col>
<halign>left</halign>
<label>Terrain Presampling</label>
<property>/local-weather/config/presampling-flag</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
</group>
<empty>
<stretch>true</stretch>
</empty>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<group>
<layout>vbox</layout>
<text>
<halign>left</halign>
<label> Wind Settings</label>
</text>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<empty> <empty>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </empty>
@ -175,21 +193,20 @@
<label>kts</label> <label>kts</label>
</text> </text>
<empty> <empty>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </empty>
</group> </group>
<group> <group>
<layout>table</layout> <layout>table</layout>
<text> <text>
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
<halign>right</halign> <halign>right</halign>
<label>Gust frequency (Hz)</label> <label>Gust Frequency (Hz)</label>
</text> </text>
<slider> <slider>
@ -218,7 +235,7 @@
<row>1</row> <row>1</row>
<col>0</col> <col>0</col>
<halign>right</halign> <halign>right</halign>
<label>Gust factor</label> <label>Gust Factor</label>
</text> </text>
<slider> <slider>
@ -242,12 +259,12 @@
<property>/local-weather/tmp/gust-relative-strength</property> <property>/local-weather/tmp/gust-relative-strength</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>2</row> <row>2</row>
<col>0</col> <col>0</col>
<halign>right</halign> <halign>right</halign>
<label>Gust direction variation</label> <label> Gust Direction Variation</label>
</text> </text>
<slider> <slider>
@ -276,7 +293,7 @@
<row>3</row> <row>3</row>
<col>0</col> <col>0</col>
<halign>right</halign> <halign>right</halign>
<label>Wind model</label> <label>Wind Model</label>
</text> </text>
<combo> <combo>
@ -296,266 +313,303 @@
</combo> </combo>
</group> </group>
</group> </group>
<hrule/> <!-- gap -->
<text> <text>
<halign>left</halign> <label> </label>
<label>Thermic and Visibility Settings</label>
</text> </text>
<group>
<layout>table</layout>
<text> </group>
<row>0</row>
<col>0</col>
<halign>right</halign>
<label>Generate thermals</label>
</text>
<checkbox> <hrule/>
<row>0</row>
<col>2</col>
<halign>left</halign>
<property>/local-weather/config/generate-thermal-lift-flag</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<text>
<row>0</row>
<col>3</col>
<halign>right</halign>
<label>Realistic visibility</label>
</text>
<checkbox>
<row>0</row>
<col>4</col>
<halign>left</halign>
<property>/local-weather/config/realistic-visibility-flag</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<text>
<row>1</row>
<col>0</col>
<halign>right</halign>
<label>Cloud shadows </label>
</text>
<checkbox>
<row>1</row>
<col>2</col>
<halign>left</halign>
<property>/local-weather/config/generate-cloud-shadows</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<text>
<row>1</row>
<col>3</col>
<halign>right</halign>
<label>(needs ALS shaders)</label>
</text>
<text>
<row>2</row>
<col>0</col>
<halign>right</halign>
<label>Convective conditions</label>
</text>
<text>
<row>2</row>
<col>1</col>
<halign>right</halign>
<label>rough day</label>
</text>
<slider>
<row>2</row>
<col>2</col>
<min>0.3</min>
<max>1.5</max>
<property>/local-weather/config/thermal-properties</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<row>2</row>
<col>3</col>
<halign>left</halign>
<label>low convection</label>
</text>
<text>
<row>3</row>
<col>0</col>
<halign>right</halign>
<label>Ground haze</label>
</text>
<text>
<row>3</row>
<col>1</col>
<halign>right</halign>
<label>thick</label>
</text>
<slider>
<row>3</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>3</row>
<col>3</col>
<halign>left</halign>
<label>thin</label>
</text>
<text>
<row>4</row>
<col>0</col>
<halign>right</halign>
<label>Air pollution</label>
</text>
<text>
<row>4</row>
<col>1</col>
<halign>right</halign>
<label>clean</label>
</text>
<slider>
<row>4</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>4</row>
<col>3</col>
<halign>left</halign>
<label>smog</label>
</text>
<text>
<row>5</row>
<col>0</col>
<halign>right</halign>
<label>Fog properties</label>
</text>
<text>
<row>5</row>
<col>1</col>
<halign>right</halign>
<label>smooth</label>
</text>
<slider>
<row>5</row>
<col>2</col>
<min>0.0</min>
<max>12.0</max>
<property>/environment/fog-structure</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<row>5</row>
<col>3</col>
<halign>left</halign>
<label>structured</label>
</text>
<text>
<row>6</row>
<col>0</col>
<halign>right</halign>
<!--<enable>
<equals>
<property>/local-weather/config/realistic-visibility-flag</property>
<value>0</value>
</equals>
</enable>-->
<label>Max. visibility</label>
</text>
<text>
<row>6</row>
<col>1</col>
<halign>right</halign>
<label>20 km</label>
</text>
<slider>
<row>6</row>
<col>2</col>
<!--<enable>
<equals>
<property>/local-weather/config/realistic-visibility-flag</property>
<value>0</value>
</equals>
</enable>-->
<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>6</row>
<col>3</col>
<halign>left</halign>
<label>250 km</label>
</text>
<text>
<row>6</row>
<col>4</col>
<halign>left</halign>
<!--<enable>
<equals>
<property>/local-weather/config/realistic-visibility-flag</property>
<value>0</value>
</equals>
</enable>-->
<label>12345678</label>
<format>%.fm</format>
<live>true</live>
<property>/local-weather/config/max-vis-range-m</property>
</text>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<group>
<layout>vbox</layout>
<text>
<halign>left</halign>
<label> Thermic and Visibility Settings</label>
</text>
<group>
<layout>hbox</layout>
<!-- gap -->
<text>
<label></label>
</text>
<group>
<layout>table</layout>
<!-- gap -->
<text>
<row>0</row>
<col>0</col>
<pref-width>5</pref-width>
<label></label>
</text>
<checkbox>
<row>0</row>
<col>1</col>
<halign>left</halign>
<property>/local-weather/config/generate-thermal-lift-flag</property>
<label> Generate Thermals </label>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<row>0</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>
<checkbox>
<row>1</row>
<col>1</col>
<halign>left</halign>
<label> Cloud Shadows </label>
<property>/local-weather/config/generate-cloud-shadows</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<text>
<row>1</row>
<col>2</col>
<halign>right</halign>
<label> (needs ALS shaders)</label>
</text>
<!-- gap -->
<text>
<row>1</row>
<col>3</col>
<label> </label>
</text>
</group>
</group>
<empty><stretch>1</stretch></empty>
<group>
<layout>table</layout>
<text>
<row>2</row>
<col>0</col>
<halign>right</halign>
<label> Convective Conditions:</label>
</text>
<text>
<row>2</row>
<col>1</col>
<halign>right</halign>
<label>rough day</label>
</text>
<slider>
<row>2</row>
<col>2</col>
<min>0.3</min>
<max>1.5</max>
<property>/local-weather/config/thermal-properties</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<row>2</row>
<col>3</col>
<halign>left</halign>
<label>low convection</label>
</text>
<text>
<row>3</row>
<col>0</col>
<halign>right</halign>
<label>Ground Haze:</label>
</text>
<text>
<row>3</row>
<col>1</col>
<halign>right</halign>
<label>thick</label>
</text>
<slider>
<row>3</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>3</row>
<col>3</col>
<halign>left</halign>
<label>thin</label>
</text>
<text>
<row>4</row>
<col>0</col>
<halign>right</halign>
<label>Air Pollution:</label>
</text>
<text>
<row>4</row>
<col>1</col>
<halign>right</halign>
<label>clean</label>
</text>
<slider>
<row>4</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>4</row>
<col>3</col>
<halign>left</halign>
<label>smog</label>
</text>
<text>
<row>5</row>
<col>0</col>
<halign>right</halign>
<label>Fog Properties:</label>
</text>
<text>
<row>5</row>
<col>1</col>
<halign>right</halign>
<label>smooth</label>
</text>
<slider>
<row>5</row>
<col>2</col>
<min>0.0</min>
<max>12.0</max>
<property>/environment/fog-structure</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<row>5</row>
<col>3</col>
<halign>left</halign>
<label>structured</label>
</text>
<text>
<row>6</row>
<col>0</col>
<halign>right</halign>
<!--<enable>
<equals>
<property>/local-weather/config/realistic-visibility-flag</property>
<value>0</value>
</equals>
</enable>-->
<label>Max. Visibility:</label>
</text>
<text>
<row>6</row>
<col>1</col>
<halign>right</halign>
<label>20 km</label>
</text>
<slider>
<row>6</row>
<col>2</col>
<!--<enable>
<equals>
<property>/local-weather/config/realistic-visibility-flag</property>
<value>0</value>
</equals>
</enable>-->
<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>6</row>
<col>3</col>
<halign>left</halign>
<!--<enable>
<equals>
<property>/local-weather/config/realistic-visibility-flag</property>
<value>0</value>
</equals>
</enable>-->
<label>12345678</label>
<format>250 km %.fm</format>
<live>true</live>
<property>/local-weather/config/max-vis-range-m</property>
</text>
</group>
</group>
<!-- gap -->
<text>
<label> </label>
</text>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<!-- gap -->
<text>
<label></label>
</text>
<group> <group>
<layout>vbox</layout> <layout>vbox</layout>
@ -563,35 +617,41 @@
<halign>left</halign> <halign>left</halign>
<label>Weather Pattern Scales</label> <label>Weather Pattern Scales</label>
</text> </text>
<group> <group>
<layout>table</layout> <layout>table</layout>
<halign>center</halign> <halign>center</halign>
<text> <text>
<row>0</row> <row>0</row>
<col>1</col> <col>0</col>
<label> </label>
</text>
<text>
<row>0</row>
<col>2</col>
<halign>left</halign> <halign>left</halign>
<label>small</label> <label>small</label>
</text> </text>
<text> <text>
<row>0</row> <row>0</row>
<col>2</col> <col>3</col>
<halign>right</halign> <halign>right</halign>
<label>large</label> <label>large</label>
</text> </text>
<text> <text>
<row>1</row> <row>1</row>
<col>0</col> <col>1</col>
<halign>right</halign> <halign>right</halign>
<label>Airmass</label> <label>Airmass</label>
</text> </text>
<slider> <slider>
<row>1</row> <row>1</row>
<col>1</col> <col>2</col>
<colspan>2</colspan> <colspan>2</colspan>
<halign>fill</halign> <halign>fill</halign>
<min>0.5</min> <min>0.5</min>
@ -604,14 +664,14 @@
<text> <text>
<row>2</row> <row>2</row>
<col>0</col> <col>1</col>
<halign>right</halign> <halign>right</halign>
<label>Cloud patterns</label> <label> Cloud Patterns</label>
</text> </text>
<slider> <slider>
<row>2</row> <row>2</row>
<col>1</col> <col>2</col>
<colspan>2</colspan> <colspan>2</colspan>
<halign>fill</halign> <halign>fill</halign>
<min>0.0</min> <min>0.0</min>
@ -623,8 +683,13 @@
</slider> </slider>
</group> </group>
</group> </group>
<empty>
<stretch>true</stretch>
</empty>
</group> </group>
<hrule/> <hrule/>
<group> <group>
@ -635,7 +700,7 @@
</empty> </empty>
<button> <button>
<legend>OK</legend> <legend> OK </legend>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
@ -654,7 +719,7 @@
</button> </button>
<button> <button>
<legend>Wind Configuration...</legend> <legend>Wind Configuration ...</legend>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>local_weather_winds</dialog-name> <dialog-name>local_weather_winds</dialog-name>

603
gui/dialogs/local_weather_winds.xml
View file

@ -2,353 +2,354 @@
<PropertyList> <PropertyList>
<!-- Weather tiles --> <!-- Weather tiles -->
<name>local_weather_winds</name>
<modal>false</modal>
<resizable>false</resizable>
<layout>vbox</layout>
<default-padding>3</default-padding>
<name>local_weather_winds</name> <!-- Title bar with close button -->
<width>500</width> <group>
<height>200</height> <layout>hbox</layout>
<modal>false</modal> <default-padding>3</default-padding>
<empty><stretch>1</stretch></empty>
<text>
<label>Wind Configuration</label>
</text>
<empty><stretch>1</stretch></empty>
<button>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<legend></legend>
<keynum>27</keynum>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<halign>left</halign>
<!-- gap -->
<text>
<label></label>
</text>
<text>
<label>Specify Aloft Wind Layers:</label>
</text>
<text>
<label> Lat:</label>
</text>
<input>
<width>80</width>
<property>/local-weather/tmp/ipoint-latitude-deg</property>
</input>
<text> <text>
<x>10</x> <label> Lon:</label>
<y>170</y> </text>
<label>Specify aloft wind layers</label>
</text>
<text> <input>
<x>220</x> <width>80</width>
<y>170</y> <property>/local-weather/tmp/ipoint-longitude-deg</property>
<label>lat:</label> </input>
</text>
<input> </group>
<x>250</x>
<y>170</y>
<width>80</width>
<height>25</height>
<property>/local-weather/tmp/ipoint-latitude-deg</property>
</input>
<group>
<layout>table</layout>
<halign>center</halign>
<text> <text>
<x>340</x> <row>0</row>
<y>170</y> <col>0</col>
<label>lon:</label> <pref-width>50</pref-width>
</text> <label> </label>
</text>
<input> <text>
<x>370</x> <row>0</row>
<y>170</y> <col>1</col>
<width>80</width> <pref-width>50</pref-width>
<height>25</height> <label> 0 </label>
<property>/local-weather/tmp/ipoint-longitude-deg</property> </text>
</input>
<group> <text>
<x>0</x> <row>0</row>
<y>140</y> <col>2</col>
<halign>center</halign>
<pref-width>50</pref-width>
<label>FL50</label>
</text>
<text> <text>
<x>80</x> <row>0</row>
<y>0</y> <col>3</col>
<label>0</label> <pref-width>50</pref-width>
</text> <label>FL100</label>
</text>
<text> <text>
<x>110</x> <row>0</row>
<y>0</y> <col>4</col>
<label>FL50</label> <pref-width>50</pref-width>
</text> <label>FL180</label>
</text>
<text> <text>
<x>155</x> <row>0</row>
<y>0</y> <col>5</col>
<label>FL100</label> <pref-width>50</pref-width>
</text> <label>FL240</label>
</text>
<text> <text>
<x>200</x> <row>0</row>
<y>0</y> <col>6</col>
<label>FL180</label> <pref-width>50</pref-width>
</text> <label>FL300</label>
</text>
<text> <text>
<x>245</x> <row>0</row>
<y>0</y> <col>7</col>
<label>FL240</label> <pref-width>50</pref-width>
</text> <label>FL340</label>
</text>
<text> <text>
<x>290</x> <row>0</row>
<y>0</y> <col>8</col>
<label>FL300</label> <pref-width>50</pref-width>
</text> <label>FL390</label>
</text>
<text> <text>
<x>335</x> <row>0</row>
<y>0</y> <col>9</col>
<label>FL340</label> <pref-width>50</pref-width>
</text> <label>FL450</label>
</text>
<text> <text>
<x>380</x> <row>1</row>
<y>0</y> <col>0</col>
<label>FL390</label> <label>Direction</label>
</text> </text>
<text> <input>
<x>425</x> <row>1</row>
<y>0</y> <col>1</col>
<label>FL450</label> <pref-width>50</pref-width>
</text> <property>/local-weather/tmp/FL0-wind-from-heading-deg</property>
</input>
</group> <input>
<row>1</row>
<col>2</col>
<pref-width>50</pref-width>
<property>/local-weather/tmp/FL50-wind-from-heading-deg</property>
</input>
<group> <input>
<x>0</x> <row>1</row>
<y>100</y> <col>3</col>
<pref-width>50</pref-width>
<property>/local-weather/tmp/FL100-wind-from-heading-deg</property>
</input>
<text> <input>
<x>5</x> <row>1</row>
<y>0</y> <col>4</col>
<label>direction</label> <pref-width>50</pref-width>
</text> <property>/local-weather/tmp/FL180-wind-from-heading-deg</property>
</input>
<input> <input>
<x>70</x> <row>1</row>
<y>0</y> <col>5</col>
<width>40</width> <pref-width>50</pref-width>
<height>25</height> <property>/local-weather/tmp/FL240-wind-from-heading-deg</property>
<property>/local-weather/tmp/FL0-wind-from-heading-deg</property> </input>
</input>
<input> <input>
<x>115</x> <row>1</row>
<y>0</y> <col>6</col>
<width>40</width> <pref-width>50</pref-width>
<height>25</height> <property>/local-weather/tmp/FL300-wind-from-heading-deg</property>
<property>/local-weather/tmp/FL50-wind-from-heading-deg</property> </input>
</input>
<input> <input>
<x>160</x> <row>1</row>
<y>0</y> <col>7</col>
<width>40</width> <pref-width>50</pref-width>
<height>25</height> <property>/local-weather/tmp/FL340-wind-from-heading-deg</property>
<property>/local-weather/tmp/FL100-wind-from-heading-deg</property> </input>
</input>
<input> <input>
<x>205</x> <row>1</row>
<y>0</y> <col>8</col>
<width>40</width> <pref-width>50</pref-width>
<height>25</height> <property>/local-weather/tmp/FL390-wind-from-heading-deg</property>
<property>/local-weather/tmp/FL180-wind-from-heading-deg</property> </input>
</input>
<input> <input>
<x>250</x> <row>1</row>
<y>0</y> <col>9</col>
<width>40</width> <pref-width>50</pref-width>
<height>25</height> <property>/local-weather/tmp/FL450-wind-from-heading-deg</property>
<property>/local-weather/tmp/FL240-wind-from-heading-deg</property> </input>
</input>
<text>
<row>2</row>
<col>0</col>
<label>Speed (kt)</label>
</text>
<input> <input>
<x>295</x> <row>2</row>
<y>0</y> <col>1</col>
<width>40</width> <pref-width>50</pref-width>
<height>25</height> <property>/local-weather/tmp/FL0-windspeed-kt</property>
<property>/local-weather/tmp/FL300-wind-from-heading-deg</property> </input>
</input>
<input> <input>
<x>340</x> <row>2</row>
<y>0</y> <col>2</col>
<width>40</width> <pref-width>50</pref-width>
<height>25</height> <property>/local-weather/tmp/FL50-windspeed-kt</property>
<property>/local-weather/tmp/FL340-wind-from-heading-deg</property> </input>
</input>
<input> <input>
<x>385</x> <row>2</row>
<y>0</y> <col>3</col>
<width>40</width> <pref-width>50</pref-width>
<height>25</height> <property>/local-weather/tmp/FL100-windspeed-kt</property>
<property>/local-weather/tmp/FL390-wind-from-heading-deg</property> </input>
</input>
<input> <input>
<x>430</x> <row>2</row>
<y>0</y> <col>4</col>
<width>40</width> <pref-width>50</pref-width>
<height>25</height> <property>/local-weather/tmp/FL180-windspeed-kt</property>
<property>/local-weather/tmp/FL450-wind-from-heading-deg</property> </input>
</input>
</group> <input>
<row>2</row>
<col>5</col>
<pref-width>50</pref-width>
<property>/local-weather/tmp/FL240-windspeed-kt</property>
</input>
<input>
<row>2</row>
<col>6</col>
<pref-width>50</pref-width>
<property>/local-weather/tmp/FL300-windspeed-kt</property>
</input>
<group> <input>
<x>0</x> <row>2</row>
<y>60</y> <col>7</col>
<pref-width>50</pref-width>
<property>/local-weather/tmp/FL340-windspeed-kt</property>
</input>
<text> <input>
<x>5</x> <row>2</row>
<y>0</y> <col>8</col>
<label>speed (kt)</label> <pref-width>50</pref-width>
</text> <property>/local-weather/tmp/FL390-windspeed-kt</property>
</input>
<input> <input>
<x>70</x> <row>2</row>
<y>0</y> <col>9</col>
<width>40</width> <pref-width>50</pref-width>
<height>25</height> <property>/local-weather/tmp/FL450-windspeed-kt</property>
<property>/local-weather/tmp/FL0-windspeed-kt</property> </input>
</input>
<input> </group>
<x>115</x>
<y>0</y>
<width>40</width>
<height>25</height>
<property>/local-weather/tmp/FL50-windspeed-kt</property>
</input>
<input> <hrule/>
<x>160</x>
<y>0</y>
<width>40</width>
<height>25</height>
<property>/local-weather/tmp/FL100-windspeed-kt</property>
</input>
<input> <group>
<x>205</x> <layout>hbox</layout>
<y>0</y> <halign>left</halign>
<width>40</width>
<height>25</height>
<property>/local-weather/tmp/FL180-windspeed-kt</property>
</input>
<input> <empty>
<x>250</x> <stretch>true</stretch>
<y>0</y> </empty>
<width>40</width>
<height>25</height>
<property>/local-weather/tmp/FL240-windspeed-kt</property>
</input>
<input> <button>
<x>295</x> <legend> OK </legend>
<y>0</y> <!--<default>true</default>-->
<width>40</width> <equal>true</equal>
<height>25</height> <binding>
<property>/local-weather/tmp/FL300-windspeed-kt</property> <command>dialog-apply</command>
</input> </binding>
<binding>
<command>dialog-close</command>
</binding>
</button>
<input> <button>
<x>340</x> <legend>Set Waypoint</legend>
<y>0</y> <binding>
<width>40</width> <command>dialog-apply</command>
<height>25</height> </binding>
<property>/local-weather/tmp/FL340-windspeed-kt</property> <binding>
</input> <command>nasal</command>
<script>
if (local_weather.wind_model_flag == 5)
{local_weather.set_aloft_wrapper();}
</script>
</binding>
</button>
<input> <button>
<x>385</x> <legend>Clear Waypoints</legend>
<y>0</y> <binding>
<width>40</width> <command>nasal</command>
<height>25</height> <script>
<property>/local-weather/tmp/FL390-windspeed-kt</property> props.globals.getNode("local-weather/interpolation", 1).removeChildren("wind");
</input> setprop("/local-weather/interpolation/ipoint-number",0);
</script>
</binding>
</button>
<input> <button>
<x>430</x> <legend>Cancel</legend>
<y>0</y> <default>true</default>
<width>40</width> <equal>true</equal>
<height>25</height> <key>Esc</key>
<property>/local-weather/tmp/FL450-windspeed-kt</property> <binding>
</input> <command>dialog-close</command>
</binding>
</button>
<text>
<label> Waypoints:</label>
</text>
</group> <text>
<label>MMMM</label>
<live>true</live>
<property>/local-weather/interpolation/ipoint-number</property>
</text>
<group> </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>dialog-close</command>
</binding>
</button>
<button>
<x>45</x>
<y>0</y>
<legend>Set waypoint</legend>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>nasal</command>
<script>
if (local_weather.wind_model_flag == 5)
{local_weather.set_aloft_wrapper();}
</script>
</binding>
</button>
<button>
<x>150</x>
<y>0</y>
<legend>Clear Waypoints</legend>
<binding>
<command>nasal</command>
<script>
props.globals.getNode("local-weather/interpolation", 1).removeChildren("wind");
setprop("/local-weather/interpolation/ipoint-number",0);
</script>
</binding>
</button>
<button>
<x>265</x>
<y>0</y>
<legend>Cancel</legend>
<equal>true</equal>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>
<text>
<x>360</x>
<y>0</y>
<label>waypoints:</label>
</text>
<text>
<x>430</x>
<y>0</y>
<label>0</label>
<live>true</live>
<property>/local-weather/interpolation/ipoint-number</property>
</text>
</group>
</PropertyList> </PropertyList>

140
gui/dialogs/location-in-air.xml
View file

@ -108,7 +108,7 @@
<text> <text>
<row>0</row><col>3</col> <row>0</row><col>3</col>
<halign>right</halign> <halign>right</halign>
<label>Runway:</label> <label> Runway:</label>
</text> </text>
<input> <input>
<row>0</row><col>4</col> <row>0</row><col>4</col>
@ -147,7 +147,7 @@
<text> <text>
<row>1</row><col>3</col> <row>1</row><col>3</col>
<halign>right</halign> <halign>right</halign>
<label>Latitude:</label> <label> Latitude:</label>
</text> </text>
<input> <input>
<row>1</row><col>4</col> <row>1</row><col>4</col>
@ -248,72 +248,86 @@
</text> </text>
<group> <group>
<layout>table</layout> <layout>hbox</layout>
<text>
<row>0</row><col>0</col>
<halign>right</halign>
<label>Distance (nm):</label>
<enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
</text>
<input>
<row>0</row><col>1</col>
<property>/sim/presets/offset-distance-nm</property>
<enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
</input>
<text> <group>
<row>0</row><col>2</col> <layout>table</layout>
<halign>right</halign> <text>
<label>Azimuth (deg):</label> <row>0</row><col>0</col>
<enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable> <halign>right</halign>
</text> <label> Distance (nm):</label>
<input> <enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
<row>0</row><col>3</col> </text>
<property>/sim/presets/offset-azimuth-deg</property> <input>
<enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable> <row>0</row><col>1</col>
</input> <property>/sim/presets/offset-distance-nm</property>
<enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
</input>
<text> <text>
<row>1</row><col>0</col> <row>0</row><col>2</col>
<halign>right</halign> <halign>right</halign>
<label>Altitude (ft):</label> <label>Azimuth (deg):</label>
</text> <enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
<input> </text>
<row>1</row><col>1</col> <input>
<property>/sim/presets/altitude-ft</property> <row>0</row><col>3</col>
</input> <property>/sim/presets/offset-azimuth-deg</property>
<enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
</input>
<text> <text>
<row>1</row><col>2</col> <row>1</row><col>0</col>
<halign>right</halign> <halign>right</halign>
<label>Glidepath (deg):</label> <label>Altitude (ft):</label>
</text> </text>
<input> <input>
<row>1</row><col>3</col> <row>1</row><col>1</col>
<property>/sim/presets/glideslope-deg</property> <property>/sim/presets/altitude-ft</property>
</input> </input>
<text> <text>
<row>2</row><col>0</col> <row>1</row><col>2</col>
<halign>right</halign> <halign>right</halign>
<label>Airspeed (kt):</label> <label> Glidepath (deg):</label>
</text> </text>
<input> <input>
<row>2</row><col>1</col> <row>1</row><col>3</col>
<property>/sim/presets/airspeed-kt</property> <property>/sim/presets/glideslope-deg</property>
</input> </input>
<text>
<row>2</row><col>0</col>
<halign>right</halign>
<label>Airspeed (kt):</label>
</text>
<input>
<row>2</row><col>1</col>
<property>/sim/presets/airspeed-kt</property>
</input>
<text>
<row>2</row><col>2</col>
<halign>right</halign>
<label>Heading (deg):</label>
<enable><not><property>/sim/gui/dialogs/location-in-air/airport</property></not></enable>
</text>
<input>
<row>2</row><col>3</col>
<enable><not><property>/sim/gui/dialogs/location-in-air/airport</property></not></enable>
<property>/sim/presets/heading-deg</property>
</input>
</group>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<text>
<row>2</row><col>2</col>
<halign>right</halign>
<label>Heading (deg):</label>
<enable><not><property>/sim/gui/dialogs/location-in-air/airport</property></not></enable>
</text>
<input>
<row>2</row><col>3</col>
<enable><not><property>/sim/gui/dialogs/location-in-air/airport</property></not></enable>
<property>/sim/presets/heading-deg</property>
</input>
</group> </group>
<hrule/> <hrule/>

30
gui/dialogs/location-of-tower.xml
View file

@ -6,13 +6,13 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<empty><stretch>1</stretch></empty> <empty><stretch>1</stretch></empty>
<text> <text>
<label>Tower Position</label> <label>Tower Position</label>
</text> </text>
<empty><stretch>1</stretch></empty> <empty><stretch>1</stretch></empty>
<button> <button>
<pref-width>16</pref-width> <pref-width>16</pref-width>
@ -29,7 +29,7 @@
<hrule/> <hrule/>
<text> <text>
<label>Select position of tower for the Tower Views</label> <label> Select Position of Tower for the Tower Views </label>
</text> </text>
<group> <group>
@ -50,22 +50,25 @@
</checkbox> </checkbox>
<text> <text>
<row>1</row><col>0</col> <row>1</row>
<col>0</col>
<halign>right</halign> <halign>right</halign>
<label>Airport ID:</label> <label>Airport ID:</label>
</text> </text>
<input> <input>
<name>airport-id</name> <name>airport-id</name>
<row>1</row><col>1</col> <row>1</row>
<col>1</col>
<property>/sim/tower/airport-id</property> <property>/sim/tower/airport-id</property>
<enable> <enable>
<not> <not>
<property>/sim/tower/auto-position</property> <property>/sim/tower/auto-position</property>
</not> </not>
</enable> </enable>
</input> </input>
<empty> <empty>
<row>0</row><col>3</col> <row>0</row>
<col>3</col>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </empty>
@ -131,11 +134,12 @@
<button> <button>
<legend>Preset</legend> <legend>Preset</legend>
<row>4</row><col>0</col> <row>4</row>
<col>0</col>
<!-- <!--
Is there a way in the GUI (other than via a dynamic Is there a way in the GUI (other than via a dynamic
NASAL dialog) to assign text to the widget rather NASAL dialog) to assign text to the widget rather
than to the underlying property and doing an update? than to the underlying property and doing an update?
The way it is now CANCEL doesn't undo PRESET :-( The way it is now CANCEL doesn't undo PRESET :-(
--> -->
@ -153,11 +157,13 @@
</binding> </binding>
</button> </button>
<text> <text>
<row>4</row><col>1</col> <row>4</row>
<col>1</col>
<property>/sim/presets/airport-id</property> <property>/sim/presets/airport-id</property>
</text> </text>
<empty> <empty>
<row>4</row><col>3</col> <row>4</row>
<col>3</col>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </empty>
</group> </group>

68
gui/dialogs/map-canvas.xml
View file

@ -4,11 +4,10 @@
<name>map-canvas</name> <name>map-canvas</name>
<layout>vbox</layout> <layout>vbox</layout>
<resizable>true</resizable> <resizable>true</resizable>
<!-- mhab -->
<default-padding>3</default-padding>
<color> <color>
<red type="float">0.41</red>
<green type="float">0.4</green>
<blue type="float">0.42</blue>
<alpha type="float">1.0</alpha> <alpha type="float">1.0</alpha>
</color> </color>
@ -19,9 +18,6 @@
var setTransparency = func(updateDialog){ var setTransparency = func(updateDialog){
var alpha = (getprop("/sim/gui/dialogs/map-canvas/transparent") or 0); var alpha = (getprop("/sim/gui/dialogs/map-canvas/transparent") or 0);
self.getNode("color/alpha").setValue(1-alpha*0.3); self.getNode("color/alpha").setValue(1-alpha*0.3);
self.getNode("color/red").setValue(0.41-alpha*0.2);
self.getNode("color/green").setValue(0.4-alpha*0.2);
self.getNode("color/blue").setValue(0.42-alpha*0.2);
var n = props.Node.new({ "dialog-name": "map-canvas" }); var n = props.Node.new({ "dialog-name": "map-canvas" });
if (updateDialog) if (updateDialog)
{ {
@ -42,6 +38,7 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>1</default-padding>
<empty><stretch>1</stretch></empty> <empty><stretch>1</stretch></empty>
<text> <text>
@ -62,22 +59,27 @@
</binding> </binding>
</button> </button>
</group> </group>
<hrule/> <hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<stretch>true</stretch> <stretch>true</stretch>
<halign>left</halign>
<!-- sidebar --> <!-- sidebar -->
<group> <group>
<layout>vbox</layout> <layout>vbox</layout>
<stretch>true</stretch>
<halign>left</halign>
<text> <text>
<label>Display:</label> <label>Display:</label>
</text> </text>
<checkbox> <checkbox>
<label>Airports</label> <label>Airports</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/draw-APT</property> <property>/sim/gui/dialogs/map-canvas/draw-APT</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -90,7 +92,7 @@
<checkbox> <checkbox>
<label>Fixes</label> <label>Fixes</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/draw-FIX</property> <property>/sim/gui/dialogs/map-canvas/draw-FIX</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -103,7 +105,7 @@
<checkbox> <checkbox>
<label>VORs</label> <label>VORs</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/draw-VOR</property> <property>/sim/gui/dialogs/map-canvas/draw-VOR</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -116,7 +118,7 @@
<checkbox> <checkbox>
<label>DMEs</label> <label>DMEs</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/draw-DME</property> <property>/sim/gui/dialogs/map-canvas/draw-DME</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -129,7 +131,7 @@
<checkbox> <checkbox>
<label>NDBs</label> <label>NDBs</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/draw-NDB</property> <property>/sim/gui/dialogs/map-canvas/draw-NDB</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -149,7 +151,7 @@
<checkbox> <checkbox>
<label>Traffic</label> <label>Traffic</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/draw-TFC</property> <property>/sim/gui/dialogs/map-canvas/draw-TFC</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -169,7 +171,7 @@
<checkbox> <checkbox>
<label>Data</label> <label>Data</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/draw-data</property> <property>/sim/gui/dialogs/map-canvas/draw-data</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -182,7 +184,7 @@
<checkbox> <checkbox>
<label>Flight History</label> <label>Flight History</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/draw-FLT</property> <property>/sim/gui/dialogs/map-canvas/draw-FLT</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -194,14 +196,15 @@
</checkbox> </checkbox>
<checkbox> <checkbox>
<!-- layer only supported if LW/AW is active -->
<enable>
<property>/sim/gui/dialogs/metar/mode/local-weather</property>
<value>1</value>
</enable>
<label>Weather</label> <label>Weather</label>
<pref-width>100</pref-width> <halign>left</halign>
<!-- layer only supported if LW/AW is active -->
<enable>
<property>/sim/gui/dialogs/metar/mode/local-weather</property>
<value>1</value>
</enable>
<property>/sim/gui/dialogs/map-canvas/draw-WXR</property> <property>/sim/gui/dialogs/map-canvas/draw-WXR</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -212,14 +215,16 @@
</binding> </binding>
</checkbox> </checkbox>
<!-- layer only supported if tutorial system is active and targets specified--> <!-- layer only supported if tutorial system is active and targets specified-->
<!-- <!--
<checkbox> <checkbox>
<enable> <enable>
<property>/sim/gui/dialogs/metar/mode/local-weather</property> <property>/sim/gui/dialogs/metar/mode/local-weather</property>
<value>1</value> <value>1</value>
</enable> </enable>
<label>Tutorial Goals</label> <label>Tutorial Goals</label>
<label>Weather</label>
<halign>left</halign>
<pref-width>100</pref-width> <pref-width>100</pref-width>
<property>/sim/gui/dialogs/map-canvas/draw-TUT</property> <property>/sim/gui/dialogs/map-canvas/draw-TUT</property>
<live>true</live> <live>true</live>
@ -236,7 +241,7 @@
<checkbox> <checkbox>
<label>Magnetic Hdgs</label> <label>Magnetic Hdgs</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/magnetic-headings</property> <property>/sim/gui/dialogs/map-canvas/magnetic-headings</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -249,7 +254,7 @@
<checkbox> <checkbox>
<label>Center on Acft</label> <label>Center on Acft</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/centre-on-aircraft</property> <property>/sim/gui/dialogs/map-canvas/centre-on-aircraft</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -262,7 +267,7 @@
<checkbox> <checkbox>
<label>Aircraft Hdg Up</label> <label>Aircraft Hdg Up</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/aircraft-heading-up</property> <property>/sim/gui/dialogs/map-canvas/aircraft-heading-up</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -275,7 +280,7 @@
<checkbox> <checkbox>
<label>Transparent</label> <label>Transparent</label>
<pref-width>100</pref-width> <halign>left</halign>
<property>/sim/gui/dialogs/map-canvas/transparent</property> <property>/sim/gui/dialogs/map-canvas/transparent</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -295,7 +300,6 @@
<button> <button>
<name>close</name> <name>close</name>
<legend>Close</legend> <legend>Close</legend>
<pref-width>100</pref-width>
<default>true</default> <default>true</default>
<binding> <binding>
<command>dialog-close</command> <command>dialog-close</command>

482
gui/dialogs/map.xml
View file

@ -15,12 +15,15 @@ command interface /autopilot/route-manager/input:
<name>map</name> <name>map</name>
<layout>vbox</layout> <layout>vbox</layout>
<resizable>true</resizable> <resizable>true</resizable>
<!-- mhab -->
<default-padding>3</default-padding>
<color> <color>
<!-- mhab commented out
<red type="float">0.41</red> <red type="float">0.41</red>
<green type="float">0.4</green> <green type="float">0.4</green>
<blue type="float">0.42</blue> <blue type="float">0.42</blue>
<alpha type="float">1.0</alpha> -->
<alpha type="float">1.0</alpha> <alpha type="float">1.0</alpha>
</color> </color>
@ -30,9 +33,10 @@ command interface /autopilot/route-manager/input:
var setTransparency = func(updateDialog){ var setTransparency = func(updateDialog){
var alpha = (getprop("/gui/map/transparent") or 0); var alpha = (getprop("/gui/map/transparent") or 0);
mapDialog.getNode("color/alpha").setValue(1-alpha*0.3); mapDialog.getNode("color/alpha").setValue(1-alpha*0.3);
mapDialog.getNode("color/red").setValue(0.41-alpha*0.2); # mhab commented out
mapDialog.getNode("color/green").setValue(0.4-alpha*0.2); #mapDialog.getNode("color/red").setValue(0.41-alpha*0.2);
mapDialog.getNode("color/blue").setValue(0.42-alpha*0.2); #mapDialog.getNode("color/green").setValue(0.4-alpha*0.2);
#mapDialog.getNode("color/blue").setValue(0.42-alpha*0.2);
var n = props.Node.new({ "dialog-name": "map" }); var n = props.Node.new({ "dialog-name": "map" });
if (updateDialog) if (updateDialog)
{ {
@ -48,249 +52,279 @@ command interface /autopilot/route-manager/input:
</close> </close>
</nasal> </nasal>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<empty><stretch>1</stretch></empty> <default-padding>1</default-padding>
<empty><stretch>1</stretch></empty>
<text>
<label>Map</label>
</text>
<empty><stretch>1</stretch></empty>
<button>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<legend></legend>
<keynum>27</keynum>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<stretch>true</stretch>
<halign>left</halign>
<!-- sidebar -->
<group>
<layout>vbox</layout>
<text> <text>
<label>Map</label> <label>Display:</label>
</text> </text>
<empty><stretch>1</stretch></empty> <checkbox>
<label>Fixes</label>
<halign>left</halign>
<!--
<pref-width>100</pref-width>
-->
<property>/gui/map/draw-fixes</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<checkbox>
<label>Navaids</label>
<halign>left</halign>
<!--
<pref-width>100</pref-width>
-->
<property>/gui/map/draw-navaids</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<!--
<button>
<legend>Airways</legend>
<pref-width>100</pref-width>
</button>
-->
<checkbox>
<label>Traffic</label>
<halign>left</halign>
<!--
<pref-width>100</pref-width>
-->
<property>/gui/map/draw-traffic</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<!--
<button>
<legend>Obstacles</legend>
<pref-width>100</pref-width>
</button>
-->
<checkbox>
<label>Data</label>
<halign>left</halign>
<!--
<pref-width>100</pref-width>
-->
<property>/gui/map/draw-data</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<checkbox>
<label>Flight History</label>
<halign>left</halign>
<!--
<pref-width>100</pref-width>
-->
<property>/gui/map/draw-flight-history</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<empty><stretch>true</stretch></empty>
<checkbox>
<label>Magnetic Hdgs</label>
<halign>left</halign>
<!--
<pref-width>100</pref-width>
-->
<property>/gui/map/magnetic-headings</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<checkbox>
<label>Center on Acft</label>
<halign>left</halign>
<!--
<pref-width>100</pref-width>
-->
<property>/gui/map/centre-on-aircraft</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<checkbox>
<label>Aircraft Hdg Up</label>
<halign>left</halign>
<!--
<pref-width>100</pref-width>
-->
<property>/gui/map/aircraft-heading-up</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<checkbox>
<label>Transparent</label>
<halign>left</halign>
<!--
<pref-width>100</pref-width>
-->
<property>/gui/map/transparent</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
<binding>
<command>nasal</command>
<script>setTransparency(1);</script>
</binding>
</checkbox>
<empty><stretch>true</stretch></empty>
<button> <button>
<pref-width>16</pref-width> <name>close</name>
<pref-height>16</pref-height> <legend>Close</legend>
<legend></legend> <pref-width>100</pref-width>
<keynum>27</keynum> <default>true</default>
<border>2</border>
<binding> <binding>
<command>dialog-close</command> <command>dialog-close</command>
</binding> </binding>
</button> </button>
</group> </group>
<hrule/>
<vrule/>
<group> <group>
<layout>hbox</layout> <layout>vbox</layout>
<stretch>true</stretch> <stretch>true</stretch>
<!-- sidebar --> <map>
<!-- <halign>fill</halign> -->
<valign>fill</valign>
<halign>fill</halign>
<stretch>true</stretch>
<pref-height>400</pref-height>
<pref-width>600</pref-width>
<property>/gui/map</property>
</map>
<hrule/>
<group> <group>
<layout>vbox</layout> <layout>hbox</layout>
<button>
<name>zoomout</name>
<legend>-</legend>
<pref-width>22</pref-width>
<pref-height>22</pref-height>
<binding>
<command>property-adjust</command>
<property>/gui/map/zoom</property>
<min>0</min>
<step>-1</step>
</binding>
</button>
<text> <text>
<label>Display:</label> <label>MMM</label>
<format>Zoom %d</format>
<property>/gui/map/zoom</property>
<live>true</live>
</text> </text>
<checkbox>
<label>Fixes</label>
<pref-width>100</pref-width>
<property>/gui/map/draw-fixes</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<checkbox>
<label>Navaids</label>
<pref-width>100</pref-width>
<property>/gui/map/draw-navaids</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<!--
<button> <button>
<legend>Airways</legend> <name>zoomin</name>
<pref-width>100</pref-width> <legend>+</legend>
</button> <pref-width>22</pref-width>
--> <pref-height>22</pref-height>
<checkbox>
<label>Traffic</label>
<pref-width>100</pref-width>
<property>/gui/map/draw-traffic</property>
<live>true</live>
<binding> <binding>
<command>dialog-apply</command> <command>property-adjust</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<!--
<button>
<legend>Obstacles</legend>
<pref-width>100</pref-width>
</button>
-->
<checkbox>
<label>Data</label>
<pref-width>100</pref-width>
<property>/gui/map/draw-data</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<checkbox>
<label>Flight History</label>
<pref-width>100</pref-width>
<property>/gui/map/draw-flight-history</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<empty><stretch>true</stretch></empty>
<checkbox>
<label>Magnetic Hdgs</label>
<pref-width>100</pref-width>
<property>/gui/map/magnetic-headings</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<checkbox>
<label>Center on Acft</label>
<pref-width>100</pref-width>
<property>/gui/map/centre-on-aircraft</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<checkbox>
<label>Aircraft Hdg Up</label>
<pref-width>100</pref-width>
<property>/gui/map/aircraft-heading-up</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
</checkbox>
<checkbox>
<label>Transparent</label>
<pref-width>100</pref-width>
<property>/gui/map/transparent</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>property-toggle</command>
</binding>
<binding>
<command>nasal</command>
<script>setTransparency(1);</script>
</binding>
</checkbox>
<empty><stretch>true</stretch></empty>
<button>
<name>close</name>
<legend>Close</legend>
<pref-width>100</pref-width>
<default>true</default>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<vrule/>
<group>
<layout>vbox</layout>
<stretch>true</stretch>
<map>
<!-- <halign>fill</halign> -->
<valign>fill</valign>
<halign>fill</halign>
<stretch>true</stretch>
<pref-height>400</pref-height>
<pref-width>600</pref-width>
<property>/gui/map</property>
</map>
<hrule/>
<group>
<layout>hbox</layout>
<button>
<name>zoomout</name>
<legend>-</legend>
<pref-width>22</pref-width>
<pref-height>22</pref-height>
<binding>
<command>property-adjust</command>
<property>/gui/map/zoom</property>
<min>0</min>
<step>-1</step>
</binding>
</button>
<text>
<label>MMM</label>
<format>Zoom %d</format>
<property>/gui/map/zoom</property> <property>/gui/map/zoom</property>
<live>true</live> <step>1</step>
</text> <max>12</max>
</binding>
<button> </button>
<name>zoomin</name>
<legend>+</legend>
<pref-width>22</pref-width>
<pref-height>22</pref-height>
<binding>
<command>property-adjust</command>
<property>/gui/map/zoom</property>
<step>1</step>
<max>12</max>
</binding>
</button>
</group>
</group> </group>
</group> </group>
</group>
</PropertyList> </PropertyList>

4
gui/dialogs/multiplayer.xml
View file

@ -121,7 +121,7 @@
<text> <text>
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
<label>Options:</label> <label> Options:</label>
<halign>right</halign> <halign>right</halign>
</text> </text>
<checkbox> <checkbox>
@ -155,7 +155,7 @@
<text> <text>
<row>2</row><col>0</col> <row>2</row><col>0</col>
<halign>right</halign> <halign>right</halign>
<label>Callsign:</label> <label> Callsign:</label>
</text> </text>
<input> <input>
<row>2</row><col>1</col> <row>2</row><col>1</col>

31
gui/dialogs/radios.xml
View file

@ -3,7 +3,9 @@
<PropertyList> <PropertyList>
<name>radios</name> <name>radios</name>
<!--
<width>550</width> <width>550</width>
-->
<modal>false</modal> <modal>false</modal>
<nasal> <nasal>
@ -496,17 +498,16 @@
<hrule/> <hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>TACAN</label> <label> TACAN </label>
</text> </text>
<combo> <combo>
<name>tacan-1</name> <name>tacan-1</name>
<pref-width>45</pref-width> <pref-width>55</pref-width>
<pref-height>25</pref-height> <pref-height>25</pref-height>
<live>true</live> <live>true</live>
<property>/instrumentation/tacan/frequencies/selected-channel[1]</property> <property>/instrumentation/tacan/frequencies/selected-channel[1]</property>
@ -528,7 +529,7 @@
<!----> <!---->
<combo> <combo>
<name>tacan-2</name> <name>tacan-2</name>
<pref-width>45</pref-width> <pref-width>55</pref-width>
<pref-height>25</pref-height> <pref-height>25</pref-height>
<live>true</live> <live>true</live>
<property>/instrumentation/tacan/frequencies/selected-channel[2]</property> <property>/instrumentation/tacan/frequencies/selected-channel[2]</property>
@ -550,7 +551,7 @@
<combo> <combo>
<name>tacan-3</name> <name>tacan-3</name>
<pref-width>45</pref-width> <pref-width>55</pref-width>
<pref-height>25</pref-height> <pref-height>25</pref-height>
<live>true</live> <live>true</live>
<property>/instrumentation/tacan/frequencies/selected-channel[3]</property> <property>/instrumentation/tacan/frequencies/selected-channel[3]</property>
@ -572,7 +573,7 @@
<combo> <combo>
<name>tacan-4</name> <name>tacan-4</name>
<pref-width>45</pref-width> <pref-width>55</pref-width>
<pref-height>25</pref-height> <pref-height>25</pref-height>
<live>true</live> <live>true</live>
<property>/instrumentation/tacan/frequencies/selected-channel[4]</property> <property>/instrumentation/tacan/frequencies/selected-channel[4]</property>
@ -595,21 +596,25 @@
</binding> </binding>
</button> </button>
<text>
<label> </label>
</text>
</group> </group>
<!-- of TACAN group --> <!-- of TACAN group -->
<!-- transponder controls --> <!-- transponder controls -->
<hrule/> <hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Transponder</label> <label> Transponder</label>
</text> </text>
<combo> <combo>
<name>Tponder-1</name> <name>Tponder-1</name>
<pref-width>45</pref-width> <pref-width>55</pref-width>
<pref-height>25</pref-height> <pref-height>25</pref-height>
<live>true</live> <live>true</live>
<property>/instrumentation/transponder/inputs/digit[3]</property> <property>/instrumentation/transponder/inputs/digit[3]</property>
@ -629,7 +634,7 @@
<!-- --> <!-- -->
<combo> <combo>
<name>Tponder-2</name> <name>Tponder-2</name>
<pref-width>45</pref-width> <pref-width>55</pref-width>
<pref-height>25</pref-height> <pref-height>25</pref-height>
<live>true</live> <live>true</live>
<property>/instrumentation/transponder/inputs/digit[2]</property> <property>/instrumentation/transponder/inputs/digit[2]</property>
@ -648,7 +653,7 @@
</combo> </combo>
<combo> <combo>
<name>Tponder-3</name> <name>Tponder-3</name>
<pref-width>45</pref-width> <pref-width>55</pref-width>
<pref-height>25</pref-height> <pref-height>25</pref-height>
<live>true</live> <live>true</live>
<property>/instrumentation/transponder/inputs/digit[1]</property> <property>/instrumentation/transponder/inputs/digit[1]</property>
@ -667,7 +672,7 @@
</combo> </combo>
<combo> <combo>
<name>Tponder-4</name> <name>Tponder-4</name>
<pref-width>45</pref-width> <pref-width>55</pref-width>
<pref-height>25</pref-height> <pref-height>25</pref-height>
<live>true</live> <live>true</live>
<property>/instrumentation/transponder/inputs/digit[0]</property> <property>/instrumentation/transponder/inputs/digit[0]</property>
@ -731,6 +736,10 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</button> </button>
<text>
<label> </label>
</text>
</group> </group>
<!-- Transponder group --> <!-- Transponder group -->

18
gui/dialogs/random-failures.xml
View file

@ -66,7 +66,7 @@
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>Configure MTBF/MCBF for all systems and instruments.</label> <label> Configure MTBF/MCBF for all systems and instruments. </label>
</text> </text>
<hrule></hrule> <hrule></hrule>
@ -77,6 +77,15 @@
<valign>top</valign> <valign>top</valign>
<stretch>true</stretch> <stretch>true</stretch>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<group> <group>
<stretch>true</stretch> <stretch>true</stretch>
<layout>vbox</layout> <layout>vbox</layout>
@ -198,7 +207,7 @@
<text> <text>
<halign>center</halign> <halign>center</halign>
<label>Mean Cycles Between Failures</label> <label>Mean Cycles Between Failures </label>
</text> </text>
<radio> <radio>
@ -315,6 +324,7 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>7</default-padding>
<button> <button>
<legend>OK</legend> <legend>OK</legend>
@ -361,8 +371,4 @@
</group> </group>
<empty>
<pref-height>1</pref-height>
</empty>
</PropertyList> </PropertyList>

2164
gui/dialogs/rembrandt.xml
View file

File diff suppressed because it is too large Load diff

150
gui/dialogs/rendering.xml
View file

@ -53,6 +53,15 @@
<halign>center</halign> <halign>center</halign>
<layout>hbox</layout> <layout>hbox</layout>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<group> <group>
<layout>vbox</layout> <layout>vbox</layout>
@ -218,6 +227,10 @@
</binding> </binding>
</checkbox> </checkbox>
<empty>
<stretch>1</stretch>
</empty>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
@ -330,17 +343,20 @@
<object-name>random-vegetation</object-name> <object-name>random-vegetation</object-name>
</binding> </binding>
</checkbox> </checkbox>
<!--
<text> <text>
<row>4</row> <row>4</row>
<col>1</col> <col>1</col>
<label>density</label> <label>Density</label>
<enable> <enable>
<property>/sim/rendering/random-vegetation</property> <property>/sim/rendering/random-vegetation</property>
</enable> </enable>
</text> </text>
-->
<slider> <slider>
<row>4</row> <row>4</row>
<col>2</col> <col>1</col>
<halign>left</halign>
<name>vegetation-density</name> <name>vegetation-density</name>
<min>0</min> <min>0</min>
<max>10.0</max> <max>10.0</max>
@ -353,8 +369,9 @@
</slider> </slider>
<text> <text>
<row>4</row> <row>4</row>
<col>3</col> <col>2</col>
<label>12345678</label> <label>1234567890 </label>
<halign>left</halign>
<format>%.1f</format> <format>%.1f</format>
<live>true</live> <live>true</live>
<property>/sim/rendering/vegetation-density</property> <property>/sim/rendering/vegetation-density</property>
@ -363,11 +380,10 @@
</enable> </enable>
</text> </text>
<checkbox> <checkbox>
<enable> <enable>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
</enable> </enable>
<row>5</row> <row>5</row>
<col>0</col> <col>0</col>
<halign>left</halign> <halign>left</halign>
@ -381,19 +397,19 @@
</checkbox> </checkbox>
<text> <text>
<enable> <enable>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
</enable> </enable>
<row>5</row> <row>5</row>
<col>1</col> <col>1</col>
<colspan>3</colspan> <colspan>2</colspan>
<color> <color>
<red>1.0</red> <red>1.0</red>
<green>0.6</green> <green>0.6</green>
<blue>0.6</blue> <blue>0.6</blue>
</color> </color>
<label>(needs ALS and antialiasing)</label> <label>(needs ALS and Antialiasing)</label>
</text> </text>
</group> </group>
@ -404,15 +420,33 @@
</group> </group>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<vrule/> <vrule/>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<group> <group>
<layout>vbox</layout> <layout>vbox</layout>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Shader effects</label> <label>Shader Effects</label>
<halign>left</halign> <halign>left</halign>
</text> </text>
<hrule> <hrule>
@ -536,7 +570,7 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Atmospheric effects</label> <label>Atmospheric Effects</label>
<halign>left</halign> <halign>left</halign>
</text> </text>
<hrule> <hrule>
@ -658,82 +692,56 @@
</text> </text>
</group> </group>
<!-- mhab modified -->
<group> <group>
<layout>table</layout> <layout>table</layout>
<group> <group>
<layout>hbox</layout> <layout>vbox</layout>
<pref-height>35</pref-height>
<halign>left</halign> <halign>left</halign>
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Atmospheric light scattering (ALS)</label> <label>Atmospheric Light Scattering (ALS)</label>
<name>skydome-scattering</name> <name>skydome-scattering</name>
<visible> <enable>
<not> <not>
<property>/sim/rendering/rembrandt/enabled</property> <property>/sim/rendering/rembrandt/enabled</property>
</not> </not>
</visible> </enable>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>skydome-scattering</object-name> <object-name>skydome-scattering</object-name>
</binding> </binding>
</checkbox> </checkbox>
<!--<text>
<label>(Experimental)</label>
<visible>
<not>
<property>/sim/rendering/rembrandt/enabled</property>
</not>
</visible>
<color>
<red>1.0</red>
<green>0.6</green>
<blue>0.6</blue>
</color>
</text>-->
</group> </group>
<!--<text>
<row>1</row>
<col>0</col>
<label>This disables most effects/shaders.</label>
<halign>left</halign>
<visible>
<not>
<property>/sim/rendering/rembrandt/enabled</property>
</not>
</visible>
<color>
<red>1.0</red>
<green>0.6</green>
<blue>0.6</blue>
</color>
</text>-->
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<row>0</row> <row>1</row>
<col>0</col> <col>0</col>
<text> <text>
<label>Rembrandt</label> <label>Rembrandt</label>
<halign>left</halign> <halign>left</halign>
<visible> <enable>
<property>/sim/rendering/rembrandt/enabled</property> <property>/sim/rendering/rembrandt/enabled</property>
</visible> </enable>
</text> </text>
<text> <text>
<label>(Experimental)</label> <label>(experimental)</label>
<halign>left</halign> <halign>left</halign>
<color> <color>
<red>1.0</red> <red>1.0</red>
<green>0.6</green> <green>0.6</green>
<blue>0.6</blue> <blue>0.6</blue>
</color> </color>
<visible> <enable>
<property>/sim/rendering/rembrandt/enabled</property> <property>/sim/rendering/rembrandt/enabled</property>
</visible> </enable>
</text> </text>
<hrule> <hrule>
<stretch>true</stretch> <stretch>true</stretch>
@ -744,11 +752,11 @@
</group> </group>
<button> <button>
<row>1</row> <row>2</row>
<col>0</col> <col>0</col>
<visible> <enable>
<property>/sim/rendering/rembrandt/enabled</property> <property>/sim/rendering/rembrandt/enabled</property>
</visible> </enable>
<legend>Rembrandt Options</legend> <legend>Rembrandt Options</legend>
<halign>center</halign> <halign>center</halign>
<binding> <binding>
@ -769,12 +777,22 @@
</empty> </empty>
</group> </group>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
</group> </group>
<hrule/> <hrule/>
<button> <button>
<legend>OK</legend> <legend> OK </legend>
<default>true</default> <default>true</default>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -830,7 +848,7 @@
"/sim/rendering/random-buildings", "/sim/rendering/random-buildings",
"/sim/rendering/random-objects", "/sim/rendering/random-objects",
"/sim/rendering/random-vegetation", "/sim/rendering/random-vegetation",
"/sim/rendering/random-vegetation-shadows", "/sim/rendering/random-vegetation-shadows",
"/sim/rendering/vegetation-density", "/sim/rendering/vegetation-density",
"/sim/rendering/clouds3d-enable", "/sim/rendering/clouds3d-enable",
"/sim/rendering/clouds3d-density"]; "/sim/rendering/clouds3d-density"];

96
gui/dialogs/route-manager.xml
View file

@ -301,14 +301,14 @@ command interface /autopilot/route-manager/input:
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
<halign>right</halign> <halign>right</halign>
<label>Departure:</label> <label> Departure:</label>
</text> </text>
<input> <input>
<row>0</row> <row>0</row>
<col>1</col> <col>1</col>
<halign>left</halign> <halign>left</halign>
<name>departure-airport</name> <name>departure-airport</name>
<pref-width>60</pref-width> <pref-width>70</pref-width>
<property>/autopilot/route-manager/departure/airport</property> <property>/autopilot/route-manager/departure/airport</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -388,7 +388,7 @@ command interface /autopilot/route-manager/input:
<row>1</row> <row>1</row>
<col>1</col> <col>1</col>
<halign>left</halign> <halign>left</halign>
<pref-width>60</pref-width> <pref-width>70</pref-width>
<name>destination-airport</name> <name>destination-airport</name>
<property>/autopilot/route-manager/destination/airport</property> <property>/autopilot/route-manager/destination/airport</property>
<live>true</live> <live>true</live>
@ -450,6 +450,7 @@ command interface /autopilot/route-manager/input:
<combo> <combo>
<row>1</row> <row>1</row>
<col>6</col> <col>6</col>
<pref-width>120</pref-width>
<halign>left</halign> <halign>left</halign>
<name>approach</name> <name>approach</name>
<property>/autopilot/route-manager/destination/approach</property> <property>/autopilot/route-manager/destination/approach</property>
@ -505,7 +506,7 @@ command interface /autopilot/route-manager/input:
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<halign>right</halign> <halign>right</halign>
<label>Cruise Speed (kts):</label> <label> Cruise Speed (kts):</label>
</text> </text>
<input> <input>
<name>cruise-speed</name> <name>cruise-speed</name>
@ -566,26 +567,44 @@ command interface /autopilot/route-manager/input:
</text> </text>
</group> </group>
<waypointlist> <group>
<name>list</name> <layout>hbox</layout>
<halign>fill</halign> <default-padding>2</default-padding>
<valign>fill</valign>
<stretch>true</stretch> <!-- gap -->
<pref-height>150</pref-height> <text>
<property>/sim/gui/dialogs/route-manager/selection</property> <label> </label>
<binding> </text>
<command>dialog-apply</command>
<object-name>list</object-name> <waypointlist>
</binding> <name>list</name>
</waypointlist> <halign>fill</halign>
<valign>fill</valign>
<stretch>true</stretch>
<pref-height>150</pref-height>
<property>/sim/gui/dialogs/route-manager/selection</property>
<binding>
<command>dialog-apply</command>
<object-name>list</object-name>
</binding>
</waypointlist>
<!-- gap -->
<text>
<label> </label>
</text>
</group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>4</default-padding> <default-padding>4</default-padding>
<text> <text>
<label>Waypoint:</label> <label> Waypoint:</label>
<!--
<pref-width>60</pref-width> <pref-width>60</pref-width>
-->
</text> </text>
<input> <input>
@ -599,10 +618,12 @@ command interface /autopilot/route-manager/input:
<button> <button>
<legend>Add</legend> <legend>Add</legend>
<default>true</default> <default>true</default>
<!--
<pref-width>70</pref-width> <pref-width>70</pref-width>
-->
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>input</object-name> <object-name>input</object-name>
</binding> </binding>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -612,22 +633,28 @@ command interface /autopilot/route-manager/input:
<command>dialog-update</command> <command>dialog-update</command>
</binding> </binding>
</button> </button>
<!-- gap -->
<text>
<label></label>
</text>
</group> </group>
<text> <text>
<padding>1</padding> <padding>1</padding>
<label>Format: (airport|fix|nav|lon,lat)[@alt] -- e.g. "KSFO@900"</label> <label>Format: (airport|fix|nav|lon,lat)[@alt] -- e.g. "KSFO@900"</label>
<color> <color>
<red>0.5</red> <red>0.7</red>
<green>0.5</green> <green>0.7</green>
<blue>0.5</blue> <blue>0.7</blue>
</color> </color>
</text> </text>
<!-- button field -->
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>fill</halign> <halign>fill</halign>
<default-padding>6</default-padding> <default-padding>8</default-padding>
<button> <button>
<legend>Clear List</legend> <legend>Clear List</legend>
@ -640,6 +667,7 @@ command interface /autopilot/route-manager/input:
<button> <button>
<legend>Remove</legend> <legend>Remove</legend>
<equal>true</equal>
<enable> <enable>
<greater-than> <greater-than>
<property>/sim/gui/dialogs/route-manager/selection</property> <property>/sim/gui/dialogs/route-manager/selection</property>
@ -652,13 +680,14 @@ command interface /autopilot/route-manager/input:
</binding> </binding>
</button> </button>
<button> <button>
<legend>Route</legend> <legend>Route</legend>
<binding> <equal>true</equal>
<command>nasal</command> <binding>
<script>route()</script> <command>nasal</command>
</binding> <script>route()</script>
</button> </binding>
</button>
<!-- <!--
<button> <button>
<legend>Auto-route</legend> <legend>Auto-route</legend>
@ -699,9 +728,13 @@ command interface /autopilot/route-manager/input:
</button> </button>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
<!-- gap -->
<text>
<label></label>
</text>
<button> <button>
<legend>Load...</legend> <legend>Load ...</legend>
<equal>true</equal> <equal>true</equal>
<enable> <enable>
<not><property>/autopilot/route-manager/active</property></not> <not><property>/autopilot/route-manager/active</property></not>
@ -712,7 +745,7 @@ command interface /autopilot/route-manager/input:
</binding> </binding>
</button> </button>
<button> <button>
<legend>Save...</legend> <legend>Save ...</legend>
<equal>true</equal> <equal>true</equal>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -721,6 +754,7 @@ command interface /autopilot/route-manager/input:
</button> </button>
<button> <button>
<legend>Close</legend> <legend>Close</legend>
<equal>true</equal>
<key>Esc</key> <key>Esc</key>
<binding> <binding>
<command>dialog-close</command> <command>dialog-close</command>

44
gui/dialogs/scenario.xml
View file

@ -49,17 +49,32 @@
<hrule/> <hrule/>
<checkbox> <group>
<layout>hbox</layout>
<halign>left</halign> <halign>left</halign>
<label>Enable AI traffic</label>
<name>enable-ai-traffic</name> <!-- only for a gap -->
<property>/sim/traffic-manager/enabled</property> <group>
<live>true</live> <layout>vbox</layout>
<binding> <default-padding>1</default-padding>
<command>dialog-apply</command> <text>
<object-name>enable-ai-traffic</object-name> <label> </label>
</binding> </text>
</checkbox> </group>
<checkbox>
<halign>left</halign>
<label>Enable AI traffic</label>
<name>enable-ai-traffic</name>
<property>/sim/traffic-manager/enabled</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
<object-name>enable-ai-traffic</object-name>
</binding>
</checkbox>
</group>
<text><label/></text> <text><label/></text>
@ -72,6 +87,15 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<group> <group>
<name>left-column</name> <name>left-column</name>
<layout>vbox</layout> <layout>vbox</layout>

12
gui/dialogs/sound.xml
View file

@ -34,6 +34,12 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<!-- gap -->
<text>
<label></label>
</text>
<text> <text>
<halign>right</halign> <halign>right</halign>
<label>Sound Device:</label> <label>Sound Device:</label>
@ -53,6 +59,12 @@
<object-name>sound-dialog</object-name> <object-name>sound-dialog</object-name>
</binding> </binding>
</combo> </combo>
<!-- gap -->
<text>
<label></label>
</text>
</group> </group>
<hrule/> <hrule/>

20
gui/dialogs/stereoscopic-view-options.xml
View file

@ -35,12 +35,17 @@
</binding> </binding>
</button> </button>
</group> </group>
<hrule/> <hrule/>
<empty>
<stretch>true</stretch>
</empty>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>1</default-padding> <default-padding>1</default-padding>
<text><label>Stereo Mode</label></text> <text><label> Stereo Mode</label></text>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
<combo> <combo>
<pref-width>250</pref-width> <pref-width>250</pref-width>
@ -60,12 +65,17 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</combo> </combo>
<!-- gap -->
<text>
<label> </label>
</text>
</group> </group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>1</default-padding> <default-padding>1</default-padding>
<text><label>Screen Distance</label></text> <text><label> Screen Distance</label></text>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
<slider> <slider>
<min>0</min> <min>0</min>
@ -86,7 +96,7 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>1</default-padding> <default-padding>1</default-padding>
<text><label>Eye Separation</label></text> <text><label> Eye Separation</label></text>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
<slider> <slider>
<min>0</min> <min>0</min>
@ -104,6 +114,10 @@
</text> </text>
</group> </group>
<empty>
<stretch>true</stretch>
</empty>
<hrule/> <hrule/>
<button> <button>

21
gui/dialogs/stopwatch.xml
View file

@ -8,9 +8,6 @@
<x>-5</x> <x>-5</x>
<y>5</y> <y>5</y>
<color> <color>
<red>0.2</red>
<green>0.2</green>
<blue>0.2</blue>
<alpha>0.7</alpha> <alpha>0.7</alpha>
</color> </color>
@ -87,7 +84,7 @@
</nasal> </nasal>
<text> <text>
<label>xxxxx000 : 00 : 00.000</label> <label>xxxxx000 : 00 : 00.0</label>
<halign>center</halign> <halign>center</halign>
<live>true</live> <live>true</live>
<property>/sim/gui/dialogs/stopwatch-dialog/display</property> <property>/sim/gui/dialogs/stopwatch-dialog/display</property>
@ -109,11 +106,7 @@
<button> <button>
<legend>Start</legend> <legend>Start</legend>
<equal>true</equal> <equal>true</equal>
<pref-width>47</pref-width>
<color> <color>
<red type="float">0.3</red>
<green type="float">0.3</green>
<blue type="float">0.3</blue>
<alpha type="float">0.8</alpha> <alpha type="float">0.8</alpha>
</color> </color>
<binding> <binding>
@ -125,11 +118,7 @@
<button> <button>
<legend>Stop</legend> <legend>Stop</legend>
<default>true</default> <default>true</default>
<pref-width>47</pref-width>
<color> <color>
<red type="float">0.3</red>
<green type="float">0.3</green>
<blue type="float">0.3</blue>
<alpha type="float">0.8</alpha> <alpha type="float">0.8</alpha>
</color> </color>
<binding> <binding>
@ -141,11 +130,7 @@
<button> <button>
<legend>Reset</legend> <legend>Reset</legend>
<key>Delete</key> <key>Delete</key>
<pref-width>47</pref-width>
<color> <color>
<red type="float">0.3</red>
<green type="float">0.3</green>
<blue type="float">0.3</blue>
<alpha type="float">0.8</alpha> <alpha type="float">0.8</alpha>
</color> </color>
<binding> <binding>
@ -157,13 +142,9 @@
<button> <button>
<legend>Close</legend> <legend>Close</legend>
<color> <color>
<red type="float">0.3</red>
<green type="float">0.3</green>
<blue type="float">0.3</blue>
<alpha type="float">0.8</alpha> <alpha type="float">0.8</alpha>
</color> </color>
<key>Esc</key> <key>Esc</key>
<pref-width>47</pref-width>
<binding> <binding>
<command>dialog-close</command> <command>dialog-close</command>
</binding> </binding>

15
gui/dialogs/system-failures.xml
View file

@ -100,7 +100,7 @@
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>Uncheck a system to fail it, or set the Mean Time/Cycles Between Failures.</label> <label> Uncheck a system to fail it, or set the Mean Time/Cycles Between Failures. </label>
</text> </text>
<hrule/> <hrule/>
@ -187,7 +187,7 @@
<row>4</row> <row>4</row>
<col>0</col> <col>0</col>
<halign>right</halign> <halign>right</halign>
<label>Electrical System</label> <label> Electrical System</label>
</text> </text>
<checkbox> <checkbox>
@ -378,12 +378,23 @@
</input-template> </input-template>
</group> </group>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
</group> </group>
<hrule/> <hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>7</default-padding>
<button> <button>
<legend>OK</legend> <legend>OK</legend>

623
gui/dialogs/terrasync.xml
View file

@ -59,13 +59,15 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>4</default-padding>
<empty><stretch>1</stretch></empty> <empty><stretch>1</stretch></empty>
<text> <text>
<label>Automatic Download of Scenery and Data</label> <label>Automatic Download of Scenery and Data</label>
</text> </text>
<empty><stretch>1</stretch></empty> <empty><stretch>1</stretch></empty>
<button> <button>
<pref-width>16</pref-width> <pref-width>16</pref-width>
@ -95,300 +97,351 @@
<group> <group>
<layout>vbox</layout> <layout>vbox</layout>
<group> <group>
<layout>table</layout>
<halign>left</halign>
<equal>false</equal>
<checkbox>
<name>terrasync-enabled</name>
<halign>left</halign>
<row>1</row><col>1</col><colspan>3</colspan>
<property>/sim/terrasync/enabled</property>
<label>Enable automatic download/update</label>
<live>true</live>
<binding>
<command>dialog-apply</command>
<object-name>terrasync-enabled</object-name>
</binding>
<enable>
<not-equals>
<property>/sim/terrasync/scenery-dir</property>
<value></value>
</not-equals>
</enable>
</checkbox>
<checkbox>
<name>ai-data-enabled</name>
<halign>left</halign>
<row>2</row><col>2</col><colspan>2</colspan>
<property>/sim/terrasync/ai-data-enabled</property>
<label>Download traffic and multi-player aircraft</label>
<live>true</live>
<binding>
<command>dialog-apply</command>
<object-name>ai-data-enabled</object-name>
</binding>
<enable>
<property>/sim/terrasync/enabled</property>
</enable>
</checkbox>
<checkbox>
<name>other-data-enabled</name>
<halign>left</halign>
<row>3</row><col>2</col><colspan>2</colspan>
<property>/sim/terrasync/other-data-enabled</property>
<label>Download other data files</label>
<live>true</live>
<binding>
<command>dialog-apply</command>
<object-name>other-data-enabled</object-name>
</binding>
<enable>
<property>/sim/terrasync/enabled</property>
</enable>
</checkbox>
<text>
<name>warning_text</name>
<row>4</row>
<col>0</col><colspan>4</colspan>
<color>
<red>1.0</red>
<green>0.4</green>
<blue>0.4</blue>
<alpha>1</alpha>
</color>
<halign>center</halign>
<label/>
</text>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<halign>left</halign>
<default-padding>2</default-padding>
<button>
<legend>Information</legend>
<binding>
<command>property-assign</command>
<property>/sim/gui/dialogs/terrasync/display-mode</property>
<value>0</value>
</binding>
</button>
<button>
<legend>Log</legend>
<binding>
<command>property-assign</command>
<property>/sim/gui/dialogs/terrasync/display-mode</property>
<value>1</value>
</binding>
</button>
</group>
<!-- 'tabbed' group controlled by display-mode property -->
<group>
<layout>table</layout> <layout>table</layout>
<halign>fill</halign> <halign>left</halign>
<valign>fill</valign> <equal>false</equal>
<default-padding>0</default-padding>
<group>
<layout>table</layout>
<halign>left</halign>
<valign>top</valign>
<equal>false</equal>
<row>0</row> <!-- only for a gap -->
<col>0</col> <text>
<visible>
<equals>
<property>/sim/gui/dialogs/terrasync/display-mode</property>
<value>0</value>
</equals>
</visible>
<!-- status text is generated by Nasal dynamically -->
<text>
<row>0</row>
<col>0</col>
<colspan>2</colspan>
<halign>left</halign>
<pref-width>200</pref-width>
<format>Status: %s</format>
<property>/sim/gui/dialogs/terrasync/status</property>
<live>true</live>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<halign>left</halign>
<row>1</row>
<col>0</col>
<label>KBytes downloaded:</label>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<row>1</row>
<col>1</col>
<format>%d</format>
<property>/sim/terrasync/downloaded-kbytes</property>
<live>true</live>
<halign>right</halign>
<stretch>true</stretch>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<halign>left</halign>
<row>2</row>
<col>0</col>
<label>Processed elements:</label>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<row>2</row>
<col>1</col>
<format>%s</format>
<property>/sim/terrasync/update-count</property>
<live>true</live>
<stretch>true</stretch>
<halign>right</halign>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<halign>left</halign>
<row>3</row>
<col>0</col>
<label>Processed scenery tiles:</label>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<row>3</row>
<col>1</col>
<format>%s</format>
<property>/sim/terrasync/tile-count</property>
<live>true</live>
<stretch>true</stretch>
<halign>right</halign>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
</group>
<loglist>
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
<halign>center</halign>
<visible> <label> </label>
<equals> </text>
<property>/sim/gui/dialogs/terrasync/display-mode</property>
<value>1</value> <checkbox>
</equals> <name>terrasync-enabled</name>
</visible> <halign>left</halign>
<row>0</row>
<col>1</col>
<halign>fill</halign> <colspan>3</colspan>
<valign>fill</valign> <property>/sim/terrasync/enabled</property>
<stretch>true</stretch> <label>Enable automatic download/update</label>
<pref-height>200</pref-height> <live>true</live>
<pref-height>600</pref-height> <binding>
<logclass>terrasync</logclass> <command>dialog-apply</command>
<padding>6</padding> <object-name>terrasync-enabled</object-name>
</loglist> </binding>
<enable>
<not-equals>
<property>/sim/terrasync/scenery-dir</property>
<value></value>
</not-equals>
</enable>
</checkbox>
<!-- only for a gap -->
<text>
<row>1</row>
<col>1</col>
<halign>center</halign>
<label> </label>
</text>
<checkbox>
<name>ai-data-enabled</name>
<halign>left</halign>
<row>1</row>
<col>2</col>
<!--
<colspan>2</colspan>
-->
<property>/sim/terrasync/ai-data-enabled</property>
<label>Download traffic and multi-player aircraft</label>
<live>true</live>
<binding>
<command>dialog-apply</command>
<object-name>ai-data-enabled</object-name>
</binding>
<enable>
<property>/sim/terrasync/enabled</property>
</enable>
</checkbox>
<checkbox>
<name>other-data-enabled</name>
<halign>left</halign>
<row>2</row>
<col>2</col>
<colspan>2</colspan>
<property>/sim/terrasync/other-data-enabled</property>
<label>Download other data files</label>
<live>true</live>
<binding>
<command>dialog-apply</command>
<object-name>other-data-enabled</object-name>
</binding>
<enable>
<property>/sim/terrasync/enabled</property>
</enable>
</checkbox>
<text>
<name>warning_text</name>
<row>3</row>
<col>0</col><colspan>4</colspan>
<color>
<red>1.0</red>
<green>0.4</green>
<blue>0.4</blue>
<alpha>1</alpha>
</color>
<halign>center</halign>
<label/>
</text>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<halign>left</halign>
<default-padding>4</default-padding>
<!-- only for a gap -->
<text>
<halign>center</halign>
<label> </label>
</text>
<button>
<legend>Information</legend>
<binding>
<command>property-assign</command>
<property>/sim/gui/dialogs/terrasync/display-mode</property>
<value>0</value>
</binding>
</button>
<!-- only for a gap -->
<text>
<halign>center</halign>
<label></label>
</text>
<button>
<legend> Log </legend>
<binding>
<command>property-assign</command>
<property>/sim/gui/dialogs/terrasync/display-mode</property>
<value>1</value>
</binding>
</button>
</group>
<!-- 'tabbed' group controlled by display-mode property -->
<group>
<layout>hbox</layout>
<halign>left</halign>
<!-- gap -->
<text>
<label></label>
</text>
<group>
<layout>table</layout>
<halign>fill</halign>
<valign>fill</valign>
<default-padding>0</default-padding>
<group>
<layout>table</layout>
<halign>left</halign>
<valign>top</valign>
<equal>false</equal>
<row>0</row>
<col>0</col>
<visible>
<equals>
<property>/sim/gui/dialogs/terrasync/display-mode</property>
<value>0</value>
</equals>
</visible>
<!-- status text is generated by Nasal dynamically -->
<text>
<row>0</row>
<col>0</col>
<colspan>2</colspan>
<halign>left</halign>
<pref-width>200</pref-width>
<format>Status: %s</format>
<property>/sim/gui/dialogs/terrasync/status</property>
<live>true</live>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<halign>left</halign>
<row>1</row>
<col>0</col>
<label>KBytes downloaded:</label>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<row>1</row>
<col>1</col>
<format>%d</format>
<property>/sim/terrasync/downloaded-kbytes</property>
<live>true</live>
<halign>right</halign>
<stretch>true</stretch>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<halign>left</halign>
<row>2</row>
<col>0</col>
<label>Processed elements:</label>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<row>2</row>
<col>1</col>
<format>%s</format>
<property>/sim/terrasync/update-count</property>
<live>true</live>
<stretch>true</stretch>
<halign>right</halign>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<halign>left</halign>
<row>3</row>
<col>0</col>
<label>Processed scenery tiles:</label>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<row>3</row>
<col>1</col>
<format>%s</format>
<property>/sim/terrasync/tile-count</property>
<live>true</live>
<stretch>true</stretch>
<halign>right</halign>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
</group>
<loglist>
<row>0</row>
<col>0</col>
<visible>
<equals>
<property>/sim/gui/dialogs/terrasync/display-mode</property>
<value>1</value>
</equals>
</visible>
<halign>fill</halign>
<valign>fill</valign>
<stretch>true</stretch>
<pref-width>600</pref-width>
<pref-height>300</pref-height>
<logclass>terrasync</logclass>
<padding>6</padding>
</loglist>
</group>
<!-- gap -->
<text>
<label></label>
</text>
</group> <!-- end of tabbed group --> </group> <!-- end of tabbed group -->
<hrule/> <hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>10</default-padding> <default-padding>3</default-padding>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
<button> <button>
<legend>OK</legend> <legend>OK</legend>
<border>2</border> <border>2</border>
<equal>true</equal> <equal>true</equal>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
<binding> <binding>
<command>reinit</command> <command>reinit</command>
<subsystem>terrasync</subsystem> <subsystem>terrasync</subsystem>
</binding> </binding>
<binding> <binding>
<command>dialog-close</command> <command>dialog-close</command>
</binding> </binding>
</button> </button>
<button> <button>
<legend>Apply</legend> <legend> Apply </legend>
<equal>true</equal> <equal>true</equal>
<border>2</border> <border>2</border>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
<binding> <binding>
<command>reinit</command> <command>reinit</command>
<subsystem>terrasync</subsystem> <subsystem>terrasync</subsystem>
</binding> </binding>
</button> </button>
<button> <button>
<legend>Cancel</legend> <legend>Cancel</legend>
<border>2</border> <border>2</border>
<equal>true</equal> <equal>true</equal>
<key>Esc</key> <key>Esc</key>
<binding> <binding>
<command>dialog-close</command> <command>dialog-close</command>
</binding> </binding>
</button> </button>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
</group> </group>
<visible> <visible>
<property>/sim/terrasync/built-in-svn-available</property> <property>/sim/terrasync/built-in-svn-available</property>

90
gui/dialogs/weather-configuration.xml
View file

@ -44,9 +44,15 @@
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>0</default-padding> <default-padding>0</default-padding>
<!-- gap -->
<text>
<label> </label>
</text>
<!-- Left Column --> <!-- Left Column -->
<group> <group>
<layout>vbox</layout> <layout>vbox</layout>
<group> <group>
<layout>vbox</layout> <layout>vbox</layout>
<default-padding>1</default-padding> <default-padding>1</default-padding>
@ -363,7 +369,7 @@
<name>pressure-sea-level-inhg</name> <name>pressure-sea-level-inhg</name>
<row>1</row> <row>1</row>
<col>3</col> <col>3</col>
<pref-width>50</pref-width> <pref-width>75</pref-width>
<property>/environment/config/boundary/entry[0]/pressure-sea-level-inhg</property> <property>/environment/config/boundary/entry[0]/pressure-sea-level-inhg</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -382,6 +388,9 @@
</group> </group>
</group> </group>
<!-- Precipitation End --> <!-- Precipitation End -->
<empty>
<stretch>true</stretch>
</empty>
</group> </group>
<!-- Left Column End --> <!-- Left Column End -->
@ -401,7 +410,7 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Aloft (All Altitudes ft-AMSL)</label> <label> Aloft (All Altitudes ft-AMSL)</label>
</text> </text>
<hrule> <hrule>
<stretch>true</stretch> <stretch>true</stretch>
@ -410,12 +419,16 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<!-- gap -->
<text>
<label> </label>
</text>
<group> <group>
<layout>table</layout> <layout>table</layout>
<text> <text>
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
<label>Altitude</label> <label>Altitude </label>
</text> </text>
<text> <text>
@ -453,7 +466,7 @@
<name>aloft-4-elevation-ft</name> <name>aloft-4-elevation-ft</name>
<row>1</row> <row>1</row>
<col>0</col> <col>0</col>
<pref-width>52</pref-width> <pref-width>70</pref-width>
<property>/environment/config/aloft/entry[4]/elevation-ft</property> <property>/environment/config/aloft/entry[4]/elevation-ft</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -466,7 +479,7 @@
<name>aloft-4-wind-from-heading-deg</name> <name>aloft-4-wind-from-heading-deg</name>
<row>1</row> <row>1</row>
<col>1</col> <col>1</col>
<pref-width>40</pref-width> <pref-width>50</pref-width>
<property>/environment/config/aloft/entry[4]/wind-from-heading-deg</property> <property>/environment/config/aloft/entry[4]/wind-from-heading-deg</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -479,7 +492,7 @@
<name>aloft-4-wind-speed-kt</name> <name>aloft-4-wind-speed-kt</name>
<row>1</row> <row>1</row>
<col>2</col> <col>2</col>
<pref-width>35</pref-width> <pref-width>45</pref-width>
<property>/environment/config/aloft/entry[4]/wind-speed-kt</property> <property>/environment/config/aloft/entry[4]/wind-speed-kt</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -492,7 +505,7 @@
<name>aloft-4-visibility-m</name> <name>aloft-4-visibility-m</name>
<row>1</row> <row>1</row>
<col>3</col> <col>3</col>
<pref-width>55</pref-width> <pref-width>75</pref-width>
<property>/environment/config/aloft/entry[4]/visibility-m</property> <property>/environment/config/aloft/entry[4]/visibility-m</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -552,7 +565,7 @@
<name>aloft-3-elevation-ft</name> <name>aloft-3-elevation-ft</name>
<row>2</row> <row>2</row>
<col>0</col> <col>0</col>
<pref-width>52</pref-width> <pref-width>70</pref-width>
<property>/environment/config/aloft/entry[3]/elevation-ft</property> <property>/environment/config/aloft/entry[3]/elevation-ft</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -565,7 +578,7 @@
<name>aloft-3-wind-from-heading-deg</name> <name>aloft-3-wind-from-heading-deg</name>
<row>2</row> <row>2</row>
<col>1</col> <col>1</col>
<pref-width>40</pref-width> <pref-width>50</pref-width>
<property>/environment/config/aloft/entry[3]/wind-from-heading-deg</property> <property>/environment/config/aloft/entry[3]/wind-from-heading-deg</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -578,7 +591,7 @@
<name>aloft-3-wind-speed-kt</name> <name>aloft-3-wind-speed-kt</name>
<row>2</row> <row>2</row>
<col>2</col> <col>2</col>
<pref-width>35</pref-width> <pref-width>45</pref-width>
<property>/environment/config/aloft/entry[3]/wind-speed-kt</property> <property>/environment/config/aloft/entry[3]/wind-speed-kt</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -591,7 +604,7 @@
<name>aloft-3-visibility-m</name> <name>aloft-3-visibility-m</name>
<row>2</row> <row>2</row>
<col>3</col> <col>3</col>
<pref-width>55</pref-width> <pref-width>75</pref-width>
<property>/environment/config/aloft/entry[3]/visibility-m</property> <property>/environment/config/aloft/entry[3]/visibility-m</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -651,7 +664,7 @@
<name>aloft-2-elevation-ft</name> <name>aloft-2-elevation-ft</name>
<row>3</row> <row>3</row>
<col>0</col> <col>0</col>
<pref-width>52</pref-width> <pref-width>70</pref-width>
<property>/environment/config/aloft/entry[2]/elevation-ft</property> <property>/environment/config/aloft/entry[2]/elevation-ft</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -664,7 +677,7 @@
<name>aloft-2-wind-from-heading-deg</name> <name>aloft-2-wind-from-heading-deg</name>
<row>3</row> <row>3</row>
<col>1</col> <col>1</col>
<pref-width>40</pref-width> <pref-width>50</pref-width>
<property>/environment/config/aloft/entry[2]/wind-from-heading-deg</property> <property>/environment/config/aloft/entry[2]/wind-from-heading-deg</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -677,7 +690,7 @@
<name>aloft-2-wind-speed-kt</name> <name>aloft-2-wind-speed-kt</name>
<row>3</row> <row>3</row>
<col>2</col> <col>2</col>
<pref-width>35</pref-width> <pref-width>45</pref-width>
<property>/environment/config/aloft/entry[2]/wind-speed-kt</property> <property>/environment/config/aloft/entry[2]/wind-speed-kt</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -690,7 +703,7 @@
<name>aloft-2-visibility-m</name> <name>aloft-2-visibility-m</name>
<row>3</row> <row>3</row>
<col>3</col> <col>3</col>
<pref-width>55</pref-width> <pref-width>75</pref-width>
<property>/environment/config/aloft/entry[2]/visibility-m</property> <property>/environment/config/aloft/entry[2]/visibility-m</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -751,7 +764,7 @@
<name>aloft-1-elevation-ft</name> <name>aloft-1-elevation-ft</name>
<row>4</row> <row>4</row>
<col>0</col> <col>0</col>
<pref-width>52</pref-width> <pref-width>70</pref-width>
<property>/environment/config/aloft/entry[1]/elevation-ft</property> <property>/environment/config/aloft/entry[1]/elevation-ft</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -764,7 +777,7 @@
<name>aloft-1-wind-from-heading-deg</name> <name>aloft-1-wind-from-heading-deg</name>
<row>4</row> <row>4</row>
<col>1</col> <col>1</col>
<pref-width>40</pref-width> <pref-width>50</pref-width>
<property>/environment/config/aloft/entry[1]/wind-from-heading-deg</property> <property>/environment/config/aloft/entry[1]/wind-from-heading-deg</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -777,7 +790,7 @@
<name>aloft-1-wind-speed-kt</name> <name>aloft-1-wind-speed-kt</name>
<row>4</row> <row>4</row>
<col>2</col> <col>2</col>
<pref-width>35</pref-width> <pref-width>45</pref-width>
<property>/environment/config/aloft/entry[1]/wind-speed-kt</property> <property>/environment/config/aloft/entry[1]/wind-speed-kt</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -790,7 +803,7 @@
<name>aloft-1-visibility-m</name> <name>aloft-1-visibility-m</name>
<row>4</row> <row>4</row>
<col>3</col> <col>3</col>
<pref-width>55</pref-width> <pref-width>75</pref-width>
<property>/environment/config/aloft/entry[1]/visibility-m</property> <property>/environment/config/aloft/entry[1]/visibility-m</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -850,7 +863,7 @@
<name>aloft-0-elevation-ft</name> <name>aloft-0-elevation-ft</name>
<row>5</row> <row>5</row>
<col>0</col> <col>0</col>
<pref-width>52</pref-width> <pref-width>70</pref-width>
<property>/environment/config/aloft/entry[0]/elevation-ft</property> <property>/environment/config/aloft/entry[0]/elevation-ft</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -863,7 +876,7 @@
<name>aloft-0-wind-from-heading-deg</name> <name>aloft-0-wind-from-heading-deg</name>
<row>5</row> <row>5</row>
<col>1</col> <col>1</col>
<pref-width>40</pref-width> <pref-width>50</pref-width>
<property>/environment/config/aloft/entry[0]/wind-from-heading-deg</property> <property>/environment/config/aloft/entry[0]/wind-from-heading-deg</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -876,7 +889,7 @@
<name>aloft-0-wind-speed-kt</name> <name>aloft-0-wind-speed-kt</name>
<row>5</row> <row>5</row>
<col>2</col> <col>2</col>
<pref-width>35</pref-width> <pref-width>45</pref-width>
<property>/environment/config/aloft/entry[0]/wind-speed-kt</property> <property>/environment/config/aloft/entry[0]/wind-speed-kt</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -889,7 +902,7 @@
<name>aloft-0-visibility-m</name> <name>aloft-0-visibility-m</name>
<row>5</row> <row>5</row>
<col>3</col> <col>3</col>
<pref-width>55</pref-width> <pref-width>75</pref-width>
<property>/environment/config/aloft/entry[0]/visibility-m</property> <property>/environment/config/aloft/entry[0]/visibility-m</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -962,7 +975,7 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Boundary (All Elevations ft-AGL)</label> <label> Boundary (All Elevations ft-AGL)</label>
</text> </text>
<hrule> <hrule>
<stretch>true</stretch> <stretch>true</stretch>
@ -971,6 +984,10 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<!-- gap -->
<text>
<label> </label>
</text>
<group> <group>
<layout>table</layout> <layout>table</layout>
@ -1006,11 +1023,17 @@
<label>Dewpt (C)</label> <label>Dewpt (C)</label>
</text> </text>
<text>
<row>0</row>
<col>6</col>
<label>Turbulence</label>
</text>
<input> <input>
<name>boundary-1-elevation-ft</name> <name>boundary-1-elevation-ft</name>
<row>1</row> <row>1</row>
<col>0</col> <col>0</col>
<pref-width>52</pref-width> <pref-width>70</pref-width>
<property>/environment/config/boundary/entry[1]/elevation-ft</property> <property>/environment/config/boundary/entry[1]/elevation-ft</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -1023,7 +1046,7 @@
<name>boundary-1-wind-from-heading-deg</name> <name>boundary-1-wind-from-heading-deg</name>
<row>1</row> <row>1</row>
<col>1</col> <col>1</col>
<pref-width>40</pref-width> <pref-width>50</pref-width>
<property>/environment/config/boundary/entry[1]/wind-from-heading-deg</property> <property>/environment/config/boundary/entry[1]/wind-from-heading-deg</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -1036,7 +1059,7 @@
<name>boundary-1-wind-speed-kt</name> <name>boundary-1-wind-speed-kt</name>
<row>1</row> <row>1</row>
<col>2</col> <col>2</col>
<pref-width>35</pref-width> <pref-width>45</pref-width>
<property>/environment/config/boundary/entry[1]/wind-speed-kt</property> <property>/environment/config/boundary/entry[1]/wind-speed-kt</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -1049,7 +1072,7 @@
<name>boundary-1-visibility-m</name> <name>boundary-1-visibility-m</name>
<row>1</row> <row>1</row>
<col>3</col> <col>3</col>
<pref-width>55</pref-width> <pref-width>75</pref-width>
<property>/environment/config/boundary/entry[1]/visibility-m</property> <property>/environment/config/boundary/entry[1]/visibility-m</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -1109,7 +1132,7 @@
<name>boundary-0-elevation-ft</name> <name>boundary-0-elevation-ft</name>
<row>2</row> <row>2</row>
<col>0</col> <col>0</col>
<pref-width>52</pref-width> <pref-width>70</pref-width>
<property>/environment/config/boundary/entry[0]/elevation-ft</property> <property>/environment/config/boundary/entry[0]/elevation-ft</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -1122,7 +1145,7 @@
<name>boundary-0-wind-from-heading-deg</name> <name>boundary-0-wind-from-heading-deg</name>
<row>2</row> <row>2</row>
<col>1</col> <col>1</col>
<pref-width>40</pref-width> <pref-width>50</pref-width>
<property>/environment/config/boundary/entry[0]/wind-from-heading-deg</property> <property>/environment/config/boundary/entry[0]/wind-from-heading-deg</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -1135,7 +1158,7 @@
<name>boundary-0-wind-speed-kt</name> <name>boundary-0-wind-speed-kt</name>
<row>2</row> <row>2</row>
<col>2</col> <col>2</col>
<pref-width>35</pref-width> <pref-width>45</pref-width>
<property>/environment/config/boundary/entry[0]/wind-speed-kt</property> <property>/environment/config/boundary/entry[0]/wind-speed-kt</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -1148,7 +1171,7 @@
<name>boundary-0-visibility-m</name> <name>boundary-0-visibility-m</name>
<row>2</row> <row>2</row>
<col>3</col> <col>3</col>
<pref-width>55</pref-width> <pref-width>75</pref-width>
<property>/environment/config/boundary/entry[0]/visibility-m</property> <property>/environment/config/boundary/entry[0]/visibility-m</property>
<live>true</live> <live>true</live>
<binding> <binding>
@ -1210,6 +1233,9 @@
</empty> </empty>
</group> </group>
<empty>
<stretch>true</stretch>
</empty>
</group> </group>
<!-- Boundary End --> <!-- Boundary End -->

626
gui/dialogs/weather.xml
View file

@ -332,310 +332,397 @@
<hrule/> <hrule/>
<group> <group>
<layout>vbox</layout> <layout>hbox</layout>
<text> <!-- only for a gap -->
<halign>left</halign> <group>
<label>Select weather engine</label> <layout>vbox</layout>
</text> <default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<group> <group>
<layout>hbox</layout> <layout>vbox</layout>
<halign>center</halign>
<text>
<halign>left</halign>
<label>Select Weather Engine</label>
</text>
<group>
<layout>hbox</layout>
<halign>left</halign>
<group>
<layout>table</layout>
<!--
<pref-width>500</pref-width>
-->
<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>Basic Weather</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>
<checkbox>
<row>0</row>
<col>1</col>
<halign>right</halign>
<name>manual-weather-config</name>
<property>sim/gui/dialogs/metar/mode/manual-weather</property>
<label>Manual Configuration</label>
<live>true</live>
<enable>
<property>sim/gui/dialogs/metar/mode/global-weather</property>
</enable>
<binding>
<command>dialog-apply</command>
<object-name>manual-weather-config</object-name>
</binding>
<binding>
<command>nasal</command>
<script>
controller.refresh();
</script>
</binding>
</checkbox>
<empty>
<row>0</row>
<col>2</col>
<stretch>true</stretch>
</empty>
<button>
<row>0</row>
<col>3</col>
<halign>right</halign>
<!--
<pref-width>170</pref-width>
-->
<legend>Manual 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>
<!--<binding>
<command>property-assign</command>
<property>sim/gui/dialogs/metar/mode/manual-weather</property>
<value>1</value>
</binding>-->
</button>
</group>
</group>
<textbox>
<name>basic description</name>
<halign>fill</halign>
<stretch>true</stretch>
<!--
<pref-width>250</pref-width>
-->
<pref-height>70</pref-height>
<slider>15</slider>
<editable>false</editable>
<wrap>true</wrap>
<live>true</live>
<top-line>0</top-line>
<property>sim/gui/dialogs/metar/description[1]</property>
</textbox>
<group>
<layout>hbox</layout>
<halign>left</halign>
<group>
<layout>table</layout>
<!--
<pref-width>500</pref-width>
-->
<radio>
<row>0</row>
<col>0</col>
<label>Detailed Weather</label>
<halign>left</halign>
<name>simple-weather</name>
<property>sim/gui/dialogs/metar/mode/local-weather</property>
<live>true</live>
<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>
<text>
<row>0</row>
<col>1</col>
<label> </label>
</text>
<empty>
<row>0</row>
<col>2</col>
<stretch>true</stretch>
</empty>
<button>
<row>0</row>
<col>3</col>
<legend> Advanced Settings ...</legend>
<halign>right</halign>
<!--
<pref-width>170</pref-width>
-->
<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>
</group>
</group>
<textbox>
<name>advance-description</name>
<halign>fill</halign>
<stretch>true</stretch>
<!--
<pref-width>250</pref-width>
-->
<pref-height>70</pref-height>
<slider>15</slider>
<editable>false</editable>
<wrap>true</wrap>
<live>true</live>
<top-line>0</top-line>
<property>sim/gui/dialogs/metar/description[2]</property>
</textbox>
<!--
<group> <group>
<layout>table</layout> <layout>table</layout>
<pref-width>500</pref-width>
<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>Basic Weather</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>
<checkbox>
<row>0</row>
<col>2</col>
<name>manual-weather-config</name>
<property>sim/gui/dialogs/metar/mode/manual-weather</property>
<label>Manually Configure Weather</label>
<live>true</live>
<enable>
<property>sim/gui/dialogs/metar/mode/global-weather</property>
</enable>
<binding>
<command>dialog-apply</command>
<object-name>manual-weather-config</object-name>
</binding>
<binding>
<command>nasal</command>
<script>
controller.refresh();
</script>
</binding>
</checkbox>
<button>
<row>0</row>
<col>3</col>
<halign>center</halign>
<pref-width>170</pref-width>
<legend>Manual 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>
<!--<binding>
<command>property-assign</command>
<property>sim/gui/dialogs/metar/mode/manual-weather</property>
<value>1</value>
</binding>-->
</button>
</group> </group>
-->
<empty>
<stretch>true</stretch>
</empty>
</group> </group>
<textbox> <!-- only for a gap -->
<name>basic description</name>
<halign>fill</halign>
<stretch>true</stretch>
<pref-width>250</pref-width>
<pref-height>55</pref-height>
<slider>0</slider>
<editable>false</editable>
<wrap>true</wrap>
<live>true</live>
<property>sim/gui/dialogs/metar/description[1]</property>
</textbox>
<group> <group>
<layout>hbox</layout> <layout>vbox</layout>
<halign>center</halign> <default-padding>1</default-padding>
<group> <text>
<layout>table</layout> <label> </label>
<pref-width>500</pref-width> </text>
<radio>
<row>0</row>
<col>0</col>
<halign>left</halign>
<name>simple-weather</name>
<property>sim/gui/dialogs/metar/mode/local-weather</property>
<live>true</live>
<label>Detailed Weather</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>
<label>
<row>0</row>
<col>2</col>
</label>
<button>
<row>0</row>
<col>3</col>
<halign>right</halign>
<pref-width>170</pref-width>
<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>
</group>
</group> </group>
<textbox>
<name>advance-description</name>
<halign>fill</halign>
<stretch>true</stretch>
<pref-width>250</pref-width>
<pref-height>55</pref-height>
<slider>0</slider>
<editable>false</editable>
<wrap>true</wrap>
<live>true</live>
<property>sim/gui/dialogs/metar/description[2]</property>
</textbox>
<group>
<layout>table</layout>
</group>
<empty>
<stretch>true</stretch>
</empty>
</group> </group>
<hrule/> <hrule/>
<group> <group>
<layout>vbox</layout> <layout>hbox</layout>
<!-- only for a gap -->
<group> <group>
<layout>table</layout> <layout>vbox</layout>
<default-padding>1</default-padding>
<text> <text>
<row>0</row> <label> </label>
<col>0</col>
<label>Weather Conditions</label>
</text> </text>
<combo>
<row>0</row>
<col>1</col>
<name>source-selection</name>
<halign>fill</halign>
<stretch>true</stretch>
<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-string</object-name>
</binding>
</combo>
</group> </group>
<group> <group>
<layout>hbox</layout> <layout>vbox</layout>
<text> <halign>left</halign>
<label>METAR Data</label>
</text> <group>
<empty> <layout>hbox</layout>
<stretch>true</stretch> <halign>left</halign>
</empty> <group>
<text> <layout>table</layout>
<label>Data is valid</label> <text>
</text> <row>0</row>
<checkbox> <col>0</col>
<property>/environment/metar/valid</property> <label>Weather Conditions</label>
<label/> <halign>left</halign>
<live>true</live> </text>
<enable> <text>
<false/> <row>0</row>
</enable> <col>1</col>
</checkbox> <label> </label>
</group> <halign>left</halign>
</text>
<combo>
<row>0</row>
<col>2</col>
<name>source-selection</name>
<halign>fill</halign>
<stretch>true</stretch>
<pref-width>300</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-string</object-name>
</binding>
</combo>
</group>
</group>
<group>
<layout>hbox</layout>
<text>
<label>METAR Data</label>
</text>
<empty>
<stretch>true</stretch>
</empty>
<text>
<label> </label>
</text>
<text>
<label>Data is valid</label>
</text>
<checkbox>
<property>/environment/metar/valid</property>
<label/>
<live>true</live>
<enable>
<false/>
</enable>
</checkbox>
</group>
<group>
<layout>hbox</layout>
<textbox>
<name>metar-string</name>
<halign>fill</halign>
<stretch>true</stretch>
<!--
<pref-width>250</pref-width>
-->
<pref-height>70</pref-height>
<slider>15</slider>
<editable>false</editable>
<wrap>true</wrap>
<live>true</live>
<top-line>0</top-line>
<property>sim/gui/dialogs/metar/metar-string</property>
<enable>
<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-string</object-name>
</binding>
</textbox>
</group>
<group>
<layout>hbox</layout>
<text>
<label>Description</label>
</text>
<empty>
<stretch>true</stretch>
</empty>
</group>
<group>
<layout>hbox</layout>
<textbox> <textbox>
<name>metar-string</name> <name>description</name>
<halign>fill</halign> <halign>fill</halign>
<stretch>true</stretch> <stretch>true</stretch>
<pref-width>250</pref-width> <pref-width>450</pref-width>
<pref-height>60</pref-height> <pref-height>100</pref-height>
<editable>true</editable> <slider>15</slider>
<editable>false</editable>
<wrap>true</wrap> <wrap>true</wrap>
<live>false</live> <live>true</live>
<slider>false</slider> <top-line>0</top-line>
<property>sim/gui/dialogs/metar/metar-string</property> <property>sim/gui/dialogs/metar/description[0]</property>
<enable>
<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-string</object-name>
</binding>
</textbox> </textbox>
</group> </group>
<!-- only for a gap -->
<group> <group>
<layout>hbox</layout> <layout>vbox</layout>
<default-padding>1</default-padding>
<text> <text>
<label>Description</label> <label> </label>
</text> </text>
<empty>
<stretch>true</stretch>
</empty>
</group> </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[0]</property>
</textbox>
</group> </group>
<hrule/> <hrule/>
@ -648,6 +735,7 @@
<button> <button>
<legend>OK</legend> <legend>OK</legend>
<equal>true</equal>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>metar-string</object-name> <object-name>metar-string</object-name>
@ -665,6 +753,7 @@
<button> <button>
<legend>Apply</legend> <legend>Apply</legend>
<equal>true</equal>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>metar-string</object-name> <object-name>metar-string</object-name>
@ -679,6 +768,7 @@
<button> <button>
<legend>Close</legend> <legend>Close</legend>
<equal>true</equal>
<default>true</default> <default>true</default>
<key>Esc</key> <key>Esc</key>
<binding> <binding>

8
gui/menubar.xml
View file

@ -753,6 +753,14 @@
<enabled>false</enabled> <enabled>false</enabled>
</item> </item>
<item>
<name>cycle-gui</name>
<binding>
<command>nasal</command>
<script>gui.nextStyle()</script>
</binding>
</item>
</menu> </menu>
<menu> <menu>