fly/fgdata
1
0
Fork 0
Code Activity

GUI Cleanup from Michael HABARTA. Part 2

Browse source
This commit is contained in:
Stuart Buchanan 2015-03-14 23:03:31 +00:00
parent 9f0a780279
commit 0581ad323d
9 changed files with 1196 additions and 813 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

334
gui/dialogs/earthview.xml
View file

@ -2,13 +2,9 @@
<PropertyList> <PropertyList>
<name>earthview</name> <name>earthview</name>
<layout>vbox</layout> <layout>vbox</layout>
<default-padding>3</default-padding> <default-padding>3</default-padding>
<!--<width>150</width>
<height>50</height>-->
<modal>false</modal> <modal>false</modal>
<group> <group>
@ -42,107 +38,115 @@
<hrule/> <hrule/>
<group> <group>
<layout>table</layout> <layout>hbox</layout>
<!-- gap -->
<text>
<label> </label>
</text>
<group>
<layout>vbox</layout>
<checkbox>
<name>cloudsphere-flag</name>
<row>0</row>
<col>1</col>
<label> Show cloud layer</label>
<halign>left</halign>
<property>/earthview/cloudsphere-flag</property>
<binding>
<command>dialog-apply</command>
<object-name>cloudsphere-flag</object-name>
</binding>
</checkbox>
<checkbox>
<enable><property>/earthview/cloudsphere-flag</property></enable>
<name>cloud-shadow-flag</name>
<row>1</row>
<col>1</col>
<label> Show cloud shadows</label>
<halign>left</halign>
<property>/earthview/cloud-shadow-flag</property>
<binding>
<command>dialog-apply</command>
<object-name>cloud-shadow-flag</object-name>
<script>
if(getprop("/earthview/cloud-shadow-flag")==1) {setprop("/earthview/cloudsphere-angle",0.0);}
</script>
</binding>
</checkbox>
<checkbox>
<row>2</row>
<col>1</col>
<label> Automatic light scattering</label>
<halign>left</halign>
<property>/earthview/mrd-flag</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
</group>
<group>
<layout>hbox</layout>
<!-- gap -->
<text>
<label></label>
</text>
<empty>
<stretch>true</stretch>
</empty>
<button>
<row>3</row>
<col>1</col>
<legend> Start </legend>
<equal>true</equal>
<binding>
<command>nasal</command>
<script>earthview.start()</script>
</binding>
</button>
<text> <button>
<row>0</row> <row>3</row>
<col>0</col> <col>2</col>
<halign>right</halign> <legend> Stop </legend>
<label>Show cloud layer</label> <equal>true</equal>
</text> <binding>
<command>nasal</command>
<script>earthview.stop()</script>
</binding>
</button>
<empty>
<stretch>true</stretch>
</empty>
<checkbox>
<name>cloudsphere-flag</name>
<row>0</row>
<col>1</col>
<halign>left</halign>
<property>/earthview/cloudsphere-flag</property>
<binding>
<command>dialog-apply</command>
<object-name>cloudsphere-flag</object-name>
</binding>
</checkbox>
<text>
<enable><property>/earthview/cloudsphere-flag</property></enable>
<row>1</row>
<col>0</col>
<halign>right</halign>
<label>Show cloud shadows</label>
</text>
<checkbox>
<enable><property>/earthview/cloudsphere-flag</property></enable>
<name>cloud-shadow-flag</name>
<row>1</row>
<col>1</col>
<halign>left</halign>
<property>/earthview/cloud-shadow-flag</property>
<binding>
<command>dialog-apply</command>
<object-name>cloud-shadow-flag</object-name>
<script>
if(getprop("/earthview/cloud-shadow-flag")==1) {setprop("/earthview/cloudsphere-angle",0.0);}
</script>
</binding>
</checkbox>
<text>
<row>2</row>
<col>0</col>
<halign>right</halign>
<label>Automatic light scattering</label>
</text>
<checkbox>
<row>2</row>
<col>1</col>
<halign>left</halign>
<property>/earthview/mrd-flag</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<button>
<row>3</row>
<col>0</col>
<legend>Start</legend>
<equal>true</equal>
<binding>
<command>nasal</command>
<script>earthview.start()</script>
</binding>
</button>
<button>
<row>3</row>
<col>1</col>
<legend>Stop</legend>
<equal>true</equal>
<binding>
<command>nasal</command>
<script>earthview.stop()</script>
</binding>
</button>
<button>
<row>3</row>
<col>2</col>
<legend>Cancel</legend>
<equal>true</equal>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group> </group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<!-- gap -->
<empty>
<stretch>true</stretch>
</empty>
</group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<!-- gap -->
<text>
<label></label>
</text>
<text> <text>
<label>Cloudsphere rotation</label> <label>Cloudsphere Rotation</label>
<halign>left</halign> <halign>left</halign>
</text> </text>
<hrule> <hrule>
@ -153,6 +157,12 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>right</halign>
<!-- gap -->
<text>
<label></label>
</text>
<text> <text>
<enable><not><property>/earthview/cloud-shadow-flag</property></not></enable> <enable><not><property>/earthview/cloud-shadow-flag</property></not></enable>
<label>Rotation angle</label> <label>Rotation angle</label>
@ -178,10 +188,25 @@
</text> </text>
</group> </group>
<group> <group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<!-- gap -->
<empty>
<stretch>true</stretch>
</empty>
</group>
<group>
<layout>hbox</layout> <layout>hbox</layout>
<!-- gap -->
<text>
<label></label>
</text>
<text> <text>
<label>Atmospheric effects</label> <label>Atmospheric Effects</label>
<halign>left</halign> <halign>left</halign>
</text> </text>
<hrule> <hrule>
@ -192,6 +217,12 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>right</halign>
<!-- gap -->
<text>
<label> </label>
</text>
<text> <text>
<enable><not><property>/earthview/mrd-flag</property></not></enable> <enable><not><property>/earthview/mrd-flag</property></not></enable>
<label>Mie factor</label> <label>Mie factor</label>
@ -215,11 +246,23 @@
<live>true</live> <live>true</live>
<property>/sim/rendering/mie</property> <property>/sim/rendering/mie</property>
</text> </text>
<!-- gap -->
<text>
<label> </label>
</text>
</group> </group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>right</halign>
<!-- gap -->
<text>
<label> </label>
</text>
<text> <text>
<enable><not><property>/earthview/mrd-flag</property></not></enable> <enable><not><property>/earthview/mrd-flag</property></not></enable>
<label>Rayleigh factor</label> <label>Rayleigh factor</label>
@ -242,11 +285,23 @@
<live>true</live> <live>true</live>
<property>/sim/rendering/rayleigh</property> <property>/sim/rendering/rayleigh</property>
</text> </text>
<!-- gap -->
<text>
<label> </label>
</text>
</group> </group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>right</halign>
<!-- gap -->
<text>
<label> </label>
</text>
<text> <text>
<enable><not><property>/earthview/mrd-flag</property></not></enable> <enable><not><property>/earthview/mrd-flag</property></not></enable>
<label>Density factor</label> <label>Density factor</label>
@ -269,11 +324,23 @@
<live>true</live> <live>true</live>
<property>/sim/rendering/dome-density</property> <property>/sim/rendering/dome-density</property>
</text> </text>
<!-- gap -->
<text>
<label> </label>
</text>
</group> </group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>right</halign>
<!-- gap -->
<text>
<label> </label>
</text>
<text> <text>
<label>Visibility</label> <label>Visibility</label>
</text> </text>
@ -295,38 +362,45 @@
<live>true</live> <live>true</live>
<property>/environment/visibility-m</property> <property>/environment/visibility-m</property>
</text> </text>
<!-- gap -->
<text>
<label> </label>
</text>
</group> </group>
<!--<button>
<x>10</x>
<y>10</y>
<legend>Start</legend>
<equal>true</equal>
<binding>
<command>nasal</command>
<script>earthview.start()</script>
</binding>
</button>
<button> <group>
<x>50</x> <layout>hbox</layout>
<y>10</y> <default-padding>1</default-padding>
<legend>Stop</legend> <!-- gap -->
<equal>true</equal> <empty>
<binding> <stretch>true</stretch>
<command>nasal</command> </empty>
<script>earthview.stop()</script> </group>
</binding>
</button>
<button> <hrule/>
<x>90</x>
<y>10</y> <group>
<legend>Cancel</legend> <layout>hbox</layout>
<equal>true</equal>
<key>Esc</key> <empty>
<binding> <stretch>true</stretch>
<command>dialog-close</command> </empty>
</binding>
</button>--> <button>
<legend>Cancel</legend>
<equal>true</equal>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>-->
<empty>
<stretch>true</stretch>
</empty>
</group>
</PropertyList> </PropertyList>

72
gui/dialogs/environment-settings.xml
View file

@ -40,16 +40,18 @@
<group> <group>
<layout>table</layout> <layout>table</layout>
<default-padding>5</default-padding>
<text> <text>
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
<label>Ground textures:</label> <label> Ground Textures:</label>
<halign>right</halign> <halign>left</halign>
</text> </text>
<combo> <combo>
<row>0</row> <row>0</row>
<col>1</col> <col>1</col>
<pref-width>90</pref-width>
<name>season</name> <name>season</name>
<halign>left</halign> <halign>left</halign>
<live>true</live> <live>true</live>
@ -78,32 +80,38 @@
<group> <group>
<layout>table</layout> <layout>vbox</layout>
<halign>left</halign>
<text> <text>
<row>0</row> <label> Ground conditions (require shader effects)</label>
<col>0</col>
<colspan>4</colspan>
<halign>left</halign>
<label>Ground conditions (requires shaders effects)</label>
</text> </text>
<checkbox> <group>
<row>1</row> <layout>hbox</layout>
<col>0</col>
<colspan>4</colspan>
<halign>left</halign> <halign>left</halign>
<label>Set maximum snow level from METAR</label> <text>
<name>metar-snow</name> <label> </label>
<property>/environment/params/metar-updates-snow-level</property> <halign>left</halign>
<binding> </text>
<command>dialog-apply</command>
<object-name>metar-snow</object-name> <checkbox>
</binding> <label> Set maximum snow level from METAR</label>
</checkbox> <name>metar-snow</name>
<property>/environment/params/metar-updates-snow-level</property>
<binding>
<command>dialog-apply</command>
<object-name>metar-snow</object-name>
</binding>
</checkbox>
</group>
</group>
<group>
<layout>table</layout>
<text> <text>
<label>Snow line</label> <label> Snow line</label>
<halign>left</halign> <halign>left</halign>
<row>2</row> <row>2</row>
<col>0</col> <col>0</col>
@ -151,7 +159,7 @@
<enable> <enable>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
</enable> </enable>
<label>Snow thickness</label> <label> Snow thickness</label>
<halign>left</halign> <halign>left</halign>
<row>3</row> <row>3</row>
<col>0</col> <col>0</col>
@ -199,7 +207,7 @@
<enable> <enable>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
</enable> </enable>
<label>Ice cover</label> <label> Ice cover</label>
<halign>left</halign> <halign>left</halign>
<row>4</row> <row>4</row>
<col>0</col> <col>0</col>
@ -248,7 +256,7 @@
<enable> <enable>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
</enable> </enable>
<label>Dust cover</label> <label> Dust cover</label>
<halign>left</halign> <halign>left</halign>
<row>5</row> <row>5</row>
<col>0</col> <col>0</col>
@ -295,7 +303,7 @@
<enable> <enable>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
</enable> </enable>
<label>Wetness</label> <label> Wetness</label>
<halign>left</halign> <halign>left</halign>
<row>6</row> <row>6</row>
<col>0</col> <col>0</col>
@ -343,7 +351,7 @@
<enable> <enable>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
</enable> </enable>
<label>Vegetation</label> <label> Vegetation</label>
<halign>left</halign> <halign>left</halign>
<row>7</row> <row>7</row>
<col>0</col> <col>0</col>
@ -391,7 +399,7 @@
<enable> <enable>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
</enable> </enable>
<label>Season (experimental)</label> <label> Season (experimental)</label>
<halign>left</halign> <halign>left</halign>
<row>8</row> <row>8</row>
<col>0</col> <col>0</col>
@ -434,11 +442,11 @@
<col>3</col> <col>3</col>
</text> </text>
<text> <text>
<enable> <enable>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
</enable> </enable>
<label>Moonlight</label> <label> Moonlight</label>
<halign>left</halign> <halign>left</halign>
<row>9</row> <row>9</row>
<col>0</col> <col>0</col>

40
gui/dialogs/fgcom.xml
View file

@ -103,13 +103,25 @@
<button> <button>
<pref-width>16</pref-width> <pref-width>16</pref-width>
<pref-height>16</pref-height> <pref-height>16</pref-height>
<border>1</border> <border>2</border>
<legend>?</legend> <legend>?</legend>
<binding> <binding>
<command>open-browser</command> <command>open-browser</command>
<path>http://wiki.flightgear.org/FGCom_3.0</path> <path>http://wiki.flightgear.org/FGCom_3.0</path>
</binding> </binding>
</button> </button>
<button>
<legend/>
<key>Esc</key>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group> </group>
<hrule/> <hrule/>
@ -154,7 +166,7 @@
<text> <text>
<row>1</row> <row>1</row>
<col>0</col> <col>0</col>
<label>Display messages:</label> <label> Display messages:</label>
<halign>right</halign> <halign>right</halign>
</text> </text>
<checkbox> <checkbox>
@ -254,7 +266,7 @@
<text> <text>
<row>5</row> <row>5</row>
<col>0</col> <col>0</col>
<label>Speaker Volume:</label> <label>Speaker volume:</label>
<halign>right</halign> <halign>right</halign>
</text> </text>
<slider> <slider>
@ -446,6 +458,18 @@
<text> <text>
<label>Server</label> <label>Server</label>
<enable>
<and>
<equals>
<property>/sim/fgcom/enabled</property>
<value>1</value>
</equals>
<equals>
<property>/sim/fgcom/test</property>
<value>0</value>
</equals>
</and>
</enable>
</text> </text>
<empty> <empty>
@ -455,16 +479,15 @@
<group> <group>
<layout>table</layout> <layout>table</layout>
<halign>left</halign> <halign>center</halign>
<default-padding>10</default-padding>
<combo> <combo>
<name>server</name> <name>server</name>
<row>1</row> <row>1</row>
<col>0</col> <col>0</col>
<colspan>6</colspan> <colspan>6</colspan>
<pref-width>275</pref-width> <pref-width>350</pref-width>
<editable>false</editable> <editable>false</editable>
<property>/sim/fgcom/selected-server</property> <property>/sim/fgcom/selected-server</property>
<properties>/sim/gui/dialogs/multiplay/fgcom-servers</properties> <properties>/sim/gui/dialogs/multiplay/fgcom-servers</properties>
@ -511,7 +534,7 @@
<hrule/> <hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<default-padding>10</default-padding> <default-padding>5</default-padding>
<empty> <empty>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </empty>
@ -520,7 +543,6 @@
<legend>Close</legend> <legend>Close</legend>
<default>true</default> <default>true</default>
<equal>true</equal> <equal>true</equal>
<border>1</border>
<binding> <binding>
<command>dialog-close</command> <command>dialog-close</command>
</binding> </binding>

399
gui/dialogs/gps.xml
View file

@ -1,7 +1,9 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<PropertyList> <PropertyList>
<!-- mhab improve layout
<width>620</width> <width>620</width>
<height>430</height> <height>430</height>
-->
<modal>false</modal> <modal>false</modal>
<nasal> <nasal>
<open><![CDATA[ <open><![CDATA[
@ -147,6 +149,7 @@
</nasal> </nasal>
<name>gps</name> <name>gps</name>
<layout>vbox</layout> <layout>vbox</layout>
<default-padding>3</default-padding>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<empty><stretch>1</stretch></empty> <empty><stretch>1</stretch></empty>
@ -172,9 +175,35 @@
<!-- show current state --> <!-- show current state -->
<group> <group>
<layout>table</layout> <layout>table</layout>
<!-- only to get a gap to left border -->
<text>
<row>0</row>
<col>0</col>
<label> </label>
<halign>left</halign>
</text>
<!-- only to get a gap between row 1-3 -->
<text>
<row>0</row>
<col>2</col>
<label> </label>
<halign>left</halign>
</text>
<!-- only to get a gap between row 3-5 -->
<text>
<row>0</row>
<col>4</col>
<label> </label>
<halign>left</halign>
</text>
<text> <text>
<row>0</row> <row>0</row>
<col>0</col> <col>1</col>
<halign>left</halign>
<label>MMMM</label> <label>MMMM</label>
<format>Mode: %s</format> <format>Mode: %s</format>
<property>/instrumentation/gps/mode</property> <property>/instrumentation/gps/mode</property>
@ -188,8 +217,9 @@
</equals> </equals>
</visible> </visible>
<row>0</row> <row>0</row>
<col>1</col> <col>2</col>
<label>MMM</label> <label>MMM</label>
<halign>left</halign>
<format>Current Route Wp: %03d</format> <format>Current Route Wp: %03d</format>
<property>/autopilot/route-manager/current-wp</property> <property>/autopilot/route-manager/current-wp</property>
<live>true</live> <live>true</live>
@ -204,80 +234,90 @@
</not> </not>
</visible> </visible>
<row>0</row> <row>0</row>
<col>1</col> <col>3</col>
<label>MMM</label> <label>MMM</label>
<format>Desired Course: %5.1f*</format> <halign>left</halign>
<format>Desired course: %5.1f*</format>
<property>/instrumentation/gps/desired-course-deg</property> <property>/instrumentation/gps/desired-course-deg</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>0</row> <row>0</row>
<col>2</col> <col>5</col>
<label>MMM</label> <label>MMM</label>
<halign>left</halign>
<format>Xtrack: %5.2fnm</format> <format>Xtrack: %5.2fnm</format>
<property>/instrumentation/gps/wp/wp[1]/course-error-nm</property> <property>/instrumentation/gps/wp/wp[1]/course-error-nm</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>1</row> <row>1</row>
<col>0</col> <col>1</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Longitude: %6.3f</format> <format>Longitude: %6.3f</format>
<property>/instrumentation/gps/indicated-longitude-deg</property> <property>/instrumentation/gps/indicated-longitude-deg</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>1</row> <row>1</row>
<col>1</col> <col>3</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Latitude: %6.3f</format> <format>Latitude: %6.3f</format>
<property>/instrumentation/gps/indicated-latitude-deg</property> <property>/instrumentation/gps/indicated-latitude-deg</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>1</row> <row>1</row>
<col>2</col> <col>5</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Altitude: %6.0fft</format> <format>Altitude: %6.0fft</format>
<property>/instrumentation/gps/indicated-altitude-ft</property> <property>/instrumentation/gps/indicated-altitude-ft</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>2</row> <row>2</row>
<col>0</col> <col>1</col>
<label>MMMM</label> <label>MMMM</label>
<halign>left</halign>
<format>Groundspeed: %4.0fkts</format> <format>Groundspeed: %4.0fkts</format>
<property>/instrumentation/gps/indicated-ground-speed-kt</property> <property>/instrumentation/gps/indicated-ground-speed-kt</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>2</row> <row>2</row>
<col>1</col> <col>3</col>
<label>MMM</label> <label>MMM</label>
<halign>left</halign>
<format>Track: %3.0f*</format> <format>Track: %3.0f*</format>
<property>/instrumentation/gps/indicated-track-magnetic-deg</property> <property>/instrumentation/gps/indicated-track-magnetic-deg</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>2</row> <row>2</row>
<col>2</col> <col>5</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>VS: %4.0ffpm</format> <format>VS: %4.0ffpm</format>
<property>/instrumentation/gps/indicated-vertical-speed</property> <property>/instrumentation/gps/indicated-vertical-speed</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>3</row> <row>3</row>
<col>0</col> <col>1</col>
<label>MMMM</label> <label>MMMM</label>
<halign>left</halign>
<format>Odometer: %4.1fnm</format> <format>Odometer: %4.1fnm</format>
<property>/instrumentation/gps/odometer</property> <property>/instrumentation/gps/odometer</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>3</row> <row>3</row>
<col>1</col> <col>3</col>
<label>MMMM</label> <label>MMMM</label>
<halign>left</halign>
<format>RAIM: %3.2f</format> <format>RAIM: %3.2f</format>
<property>/instrumentation/gps/raim</property> <property>/instrumentation/gps/raim</property>
<live>true</live> <live>true</live>
@ -285,41 +325,46 @@
<!-- mode dependent properties --> <!-- mode dependent properties -->
<text> <text>
<row>4</row> <row>4</row>
<col>0</col> <col>1</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Ident: %s</format> <format>Ident: %s</format>
<property>/instrumentation/gps/wp/wp[1]/ID</property> <property>/instrumentation/gps/wp/wp[1]/ID</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>4</row> <row>4</row>
<col>1</col> <col>3</col>
<colspan>2</colspan> <colspan>2</colspan>
<label>MMMMMMMMMMM</label> <label>MMMMMMMMMMM</label>
<halign>left</halign>
<format>Name: %s</format> <format>Name: %s</format>
<property>/instrumentation/gps/wp/wp[1]/name</property> <property>/instrumentation/gps/wp/wp[1]/name</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>5</row> <row>5</row>
<col>0</col> <col>1</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Longitude: %6.3f</format> <format>Longitude: %6.3f</format>
<property>/instrumentation/gps/wp/wp[1]/longitude-deg</property> <property>/instrumentation/gps/wp/wp[1]/longitude-deg</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>5</row> <row>5</row>
<col>1</col> <col>3</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Latitude: %6.3f</format> <format>Latitude: %6.3f</format>
<property>/instrumentation/gps/wp/wp[1]/latitude-deg</property> <property>/instrumentation/gps/wp/wp[1]/latitude-deg</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>5</row> <row>5</row>
<col>2</col> <col>5</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Altitude: %6.0fft</format> <format>Altitude: %6.0fft</format>
<property>/instrumentation/gps/wp/wp[1]/altitude-ft</property> <property>/instrumentation/gps/wp/wp[1]/altitude-ft</property>
<live>true</live> <live>true</live>
@ -327,24 +372,27 @@
<!-- distance / bearing info --> <!-- distance / bearing info -->
<text> <text>
<row>6</row> <row>6</row>
<col>0</col> <col>1</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Bearing: %3.0f</format> <format>Bearing: %3.0f</format>
<property>/instrumentation/gps/wp/wp[1]/bearing-mag-deg</property> <property>/instrumentation/gps/wp/wp[1]/bearing-mag-deg</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>6</row> <row>6</row>
<col>1</col> <col>3</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Distance: %5.2fnm</format> <format>Distance: %5.2fnm</format>
<property>/instrumentation/gps/wp/wp[1]/distance-nm</property> <property>/instrumentation/gps/wp/wp[1]/distance-nm</property>
<live>true</live> <live>true</live>
</text> </text>
<text> <text>
<row>6</row> <row>6</row>
<col>2</col> <col>5</col>
<label>MMMMMMMM</label> <label>MMMMMMMM</label>
<halign>left</halign>
<format>TTW: %s</format> <format>TTW: %s</format>
<property>/instrumentation/gps/wp/wp[1]/TTW</property> <property>/instrumentation/gps/wp/wp[1]/TTW</property>
<live>true</live> <live>true</live>
@ -357,8 +405,9 @@
</equals> </equals>
</visible> </visible>
<row>7</row> <row>7</row>
<col>0</col> <col>1</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Leg Course: %3.0f</format> <format>Leg Course: %3.0f</format>
<property>/instrumentation/gps/wp/leg-mag-course-deg</property> <property>/instrumentation/gps/wp/leg-mag-course-deg</property>
<live>true</live> <live>true</live>
@ -371,8 +420,9 @@
</equals> </equals>
</visible> </visible>
<row>7</row> <row>7</row>
<col>1</col> <col>3</col>
<label>MMMMMM</label> <label>MMMMMM</label>
<halign>left</halign>
<format>Leg Distance: %5.1fnm</format> <format>Leg Distance: %5.1fnm</format>
<property>/instrumentation/gps/wp/leg-distance-nm</property> <property>/instrumentation/gps/wp/leg-distance-nm</property>
<live>true</live> <live>true</live>
@ -386,8 +436,9 @@
<property>/instrumentation/gps/to-flag</property> <property>/instrumentation/gps/to-flag</property>
</visible> </visible>
<row>7</row> <row>7</row>
<col>0</col> <col>1</col>
<label>TO</label> <label>TO</label>
<halign>left</halign>
</text> </text>
<text> <text>
<visible> <visible>
@ -398,14 +449,26 @@
<property>/instrumentation/gps/from-flag</property> <property>/instrumentation/gps/from-flag</property>
</visible> </visible>
<row>7</row> <row>7</row>
<col>0</col> <col>1</col>
<label>FROM</label> <label>FROM</label>
<halign>left</halign>
</text> </text>
<!-- only to get a gap to right border -->
<text>
<row>0</row>
<col>6</col>
<label> </label>
<halign>left</halign>
</text>
</group> </group>
<hrule/> <hrule/>
<!-- ident text field, type combo, next/prev paging buttons <!-- ident text field, type combo, next/prev paging buttons
nearest and search buttons nearest and search buttons
--> -->
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<valign>fill</valign> <valign>fill</valign>
@ -414,11 +477,16 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<valign>fill</valign> <valign>fill</valign>
<halign>left</halign>
<text> <text>
<label>Type:</label> <label> Type:</label>
<halign>left</halign>
<!--
<pref-width>80</pref-width> <pref-width>80</pref-width>
-->
</text> </text>
<combo> <combo>
<pref-width>100</pref-width>
<name>searchType</name> <name>searchType</name>
<property>/sim/gui/dialogs/gps/search-type</property> <property>/sim/gui/dialogs/gps/search-type</property>
<value>any</value> <value>any</value>
@ -439,8 +507,11 @@
<layout>hbox</layout> <layout>hbox</layout>
<valign>fill</valign> <valign>fill</valign>
<text> <text>
<label>Search:</label> <label> Search:</label>
<halign>left</halign>
<!--
<pref-width>80</pref-width> <pref-width>80</pref-width>
-->
</text> </text>
<input> <input>
<name>search-query</name> <name>search-query</name>
@ -453,10 +524,20 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</input> </input>
<!-- only to get a gap -->
<text>
<label> </label>
<halign>left</halign>
</text>
</group> </group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<valign>fill</valign> <valign>fill</valign>
<!-- only to get a gap -->
<text>
<label> </label>
<halign>left</halign>
</text>
<button> <button>
<legend>Search</legend> <legend>Search</legend>
<binding> <binding>
@ -493,129 +574,159 @@
</empty> </empty>
</group> </group>
</group> </group>
<vrule/> <vrule/>
<group> <group>
<visible> <visible>
<property>/sim/gui/dialogs/gps/scratch/valid</property> <property>/sim/gui/dialogs/gps/scratch/valid</property>
</visible> </visible>
<layout>table</layout> <layout>vbox</layout>
<text>
<row>0</row> <group>
<col>0</col>
<label>MMMMMM</label>
<format>Ident: %s</format>
<property>/instrumentation/gps/scratch/ident</property>
<live>true</live>
</text>
<text>
<row>0</row>
<col>1</col>
<colspan>2</colspan>
<label>MMMMMMMMMMM</label>
<format>Name: %s</format>
<property>/instrumentation/gps/scratch/name</property>
<live>true</live>
</text>
<text>
<row>1</row>
<col>0</col>
<label>MMMMMM</label>
<format>Lon: %6.3f</format>
<property>/instrumentation/gps/scratch/longitude-deg</property>
<live>true</live>
</text>
<text>
<row>1</row>
<col>1</col>
<label>MMMMMM</label>
<format>Lat: %6.3f</format>
<property>/instrumentation/gps/scratch/latitude-deg</property>
<live>true</live>
</text>
<text>
<row>1</row>
<col>2</col>
<label>MMMMMM</label>
<format>Alt: %6.0fft</format>
<property>/instrumentation/gps/scratch/altitude-ft</property>
<live>true</live>
</text>
<!-- distance / bearing info -->
<text>
<row>2</row>
<col>0</col>
<label>MMMMMM</label>
<format>Bearing: %3.0f</format>
<property>/sim/gui/dialogs/gps/scratch-mag-bearing-deg</property>
<live>true</live>
</text>
<text>
<row>2</row>
<col>1</col>
<label>MMMMMM</label>
<format>Distance: %5.1fnm</format>
<property>/sim/gui/dialogs/gps/scratch-distance-nm</property>
<live>true</live>
</text>
<!-- navaid info -->
<text>
<visible> <visible>
<equals> <property>/sim/gui/dialogs/gps/scratch/valid</property>
<property>/instrumentation/gps/scratch/type</property>
<value>vor</value>
</equals>
</visible> </visible>
<row>3</row> <layout>table</layout>
<col>0</col> <text>
<label>MMMMMM</label> <row>0</row>
<format>Frequency: %5.1fMhz</format> <col>0</col>
<property>/instrumentation/gps/scratch/frequency-mhz</property> <halign>left</halign>
<live>true</live> <label>MMMMMM</label>
</text> <format>Ident: %s</format>
<text> <property>/instrumentation/gps/scratch/ident</property>
<live>true</live>
</text>
<text>
<row>0</row>
<col>1</col>
<pref-width>250</pref-width>
<colspan>2</colspan>
<halign>left</halign>
<label>MMMMMM</label>
<format>Name: %s</format>
<property>/instrumentation/gps/scratch/name</property>
<live>true</live>
</text>
<text>
<row>1</row>
<col>0</col>
<halign>left</halign>
<label>MMMMMMMM</label>
<format>Lon: %6.3f</format>
<property>/instrumentation/gps/scratch/longitude-deg</property>
<live>true</live>
</text>
<text>
<row>1</row>
<col>1</col>
<halign>left</halign>
<label>MMMMMMM</label>
<format>Lat: %6.3f</format>
<property>/instrumentation/gps/scratch/latitude-deg</property>
<live>true</live>
</text>
<text>
<row>1</row>
<col>2</col>
<halign>left</halign>
<label>MMMMMM</label>
<format>Alt: %6.0fft</format>
<property>/instrumentation/gps/scratch/altitude-ft</property>
<live>true</live>
</text>
<!-- gap -->
<text>
<row>1</row>
<col>3</col>
<halign>left</halign>
<label> </label>
</text>
<!-- distance / bearing info -->
<text>
<row>2</row>
<col>0</col>
<halign>left</halign>
<label>MMMMMM</label>
<format>Bearing: %3.0f</format>
<property>/sim/gui/dialogs/gps/scratch-mag-bearing-deg</property>
<live>true</live>
</text>
<text>
<row>2</row>
<col>1</col>
<halign>left</halign>
<label>MMMMMM</label>
<format>Distance: %5.1fnm</format>
<property>/sim/gui/dialogs/gps/scratch-distance-nm</property>
<live>true</live>
</text>
<!-- navaid info -->
<text>
<visible>
<equals>
<property>/instrumentation/gps/scratch/type</property>
<value>vor</value>
</equals>
</visible>
<row>3</row>
<col>0</col>
<halign>left</halign>
<label>MMMMMMMMMM</label>
<format>Frequency: %5.1fMhz</format>
<property>/instrumentation/gps/scratch/frequency-mhz</property>
<live>true</live>
</text>
<text>
<visible>
<equals>
<property>/instrumentation/gps/scratch/type</property>
<value>ndb</value>
</equals>
</visible>
<row>3</row>
<col>0</col>
<halign>left</halign>
<label>MMMMMMMMM</label>
<format>Frequency: %5.1fKhz</format>
<property>/instrumentation/gps/scratch/frequency-khz</property>
<live>true</live>
</text>
</group>
<group>
<visible> <visible>
<equals> <property>/sim/gui/dialogs/gps/scratch/valid</property>
<property>/instrumentation/gps/scratch/type</property>
<value>ndb</value>
</equals>
</visible> </visible>
<row>3</row> <layout>hbox</layout>
<col>0</col> <!-- prev/next buttons -->
<label>MMMMMM</label> <button>
<format>Frequency: %5.1fKhz</format> <enable>
<property>/instrumentation/gps/scratch/frequency-khz</property> <greater-than>
<live>true</live> <property>/sim/gui/dialogs/gps/scratch-index</property>
</text> <value>0</value>
<!-- prev/next buttons --> </greater-than>
<button> </enable>
<enable> <halign>left</halign>
<greater-than> <legend>Prev</legend>
<property>/sim/gui/dialogs/gps/scratch-index</property> <key>left</key>
<value>0</value> <binding>
</greater-than> <command>nasal</command>
</enable> <script>doScratchPrevious()</script>
<row>5</row> </binding>
<col>0</col> </button>
<legend>Prev</legend> <button>
<key>left</key> <enable>
<binding> <property>/sim/gui/dialogs/gps/scratch-has-next</property>
<command>nasal</command> </enable>
<script>doScratchPrevious()</script> <halign>left</halign>
</binding> <legend>Next</legend>
</button> <key>right</key>
<button> <binding>
<enable> <command>nasal</command>
<property>/sim/gui/dialogs/gps/scratch-has-next</property> <script>doScratchNext()</script>
</enable> </binding>
<row>5</row> </button>
<col>1</col> </group>
<legend>Next</legend>
<key>right</key>
<binding>
<command>nasal</command>
<script>doScratchNext()</script>
</binding>
</button>
</group> </group>
</group> </group>
<hrule/> <hrule/>
@ -652,8 +763,10 @@
<value>obs</value> <value>obs</value>
</equals> </equals>
</visible> </visible>
<!--
<pref-width>100</pref-width> <pref-width>100</pref-width>
<label>MMM</label> -->
<label>MMMMMMMMMMM</label>
<format>Selected Course: %03d*</format> <format>Selected Course: %03d*</format>
<property>/instrumentation/gps/selected-course-deg</property> <property>/instrumentation/gps/selected-course-deg</property>
<live>true</live> <live>true</live>

195
gui/dialogs/hud.xml
View file

@ -29,32 +29,50 @@
<hrule/> <hrule/>
<checkbox> <group>
<label>Enable 3D</label> <layout>hbox</layout>
<halign>left</halign> <halign>left</halign>
<property>/sim/hud/enable3d[1]</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox> <!-- only for a gap -->
<label>Transparent</label> <group>
<halign>left</halign> <layout>vbox</layout>
<property>/sim/hud/color/transparent</property> <default-padding>1</default-padding>
<binding> <text>
<command>dialog-apply</command> <label> </label>
</binding> </text>
</checkbox> </group>
<checkbox> <group>
<label>Antialiased</label> <layout>vbox</layout>
<halign>left</halign> <halign>left</halign>
<property>/sim/hud/color/antialiased</property> <checkbox>
<binding> <label>Enable 3D</label>
<command>dialog-apply</command> <halign>left</halign>
</binding> <property>/sim/hud/enable3d[1]</property>
</checkbox> <binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<label>Transparent</label>
<halign>left</halign>
<property>/sim/hud/color/transparent</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<label>Antialiased</label>
<halign>left</halign>
<property>/sim/hud/color/antialiased</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
</group>
<hrule/> <hrule/>
@ -63,49 +81,64 @@
<halign>center</halign> <halign>center</halign>
</text> </text>
<group> <group>
<layout>vbox</layout> <layout>hbox</layout>
<radio> <halign>left</halign>
<halign>left</halign>
<property>/sim/gui/dialogs/hud/lon-lat-format-0</property> <!-- only for a gap -->
<value>0</value> <group>
<live>true</live> <layout>vbox</layout>
<label>Decimal degrees</label> <default-padding>1</default-padding>
<binding> <text>
<command>nasal</command> <label> </label>
<script>set_radio(0);</script> </text>
</binding> </group>
</radio>
<radio> <group>
<halign>left</halign> <layout>vbox</layout>
<property>/sim/gui/dialogs/hud/lon-lat-format-1</property> <radio>
<value>1</value> <halign>left</halign>
<label>Degrees, minutes</label> <property>/sim/gui/dialogs/hud/lon-lat-format-0</property>
<live>true</live> <value>0</value>
<binding> <live>true</live>
<command>nasal</command> <label>Decimal degrees</label>
<script>set_radio(1);</script> <binding>
</binding> <command>nasal</command>
</radio> <script>set_radio(0);</script>
<radio> </binding>
<halign>left</halign> </radio>
<property>/sim/gui/dialogs/hud/lon-lat-format-2</property> <radio>
<value>2</value> <halign>left</halign>
<live>true</live> <property>/sim/gui/dialogs/hud/lon-lat-format-1</property>
<label>Degrees, minutes, seconds</label> <value>1</value>
<binding> <label>Degrees, minutes</label>
<command>nasal</command> <live>true</live>
<script>set_radio(2);</script> <binding>
</binding> <command>nasal</command>
</radio> <script>set_radio(1);</script>
</binding>
</radio>
<radio>
<halign>left</halign>
<property>/sim/gui/dialogs/hud/lon-lat-format-2</property>
<value>2</value>
<live>true</live>
<label>Degrees, minutes, seconds </label>
<binding>
<command>nasal</command>
<script>set_radio(2);</script>
</binding>
</radio>
</group>
</group> </group>
<hrule/> <hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Alpha:</label> <label> Alpha:</label>
</text> </text>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
@ -117,13 +150,18 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</slider> </slider>
<text>
<label> </label>
</text>
</group> </group>
<group> <group>
<name>devel-stuff</name> <name>devel-stuff</name>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Clamp:</label> <label> Clamp:</label>
</text> </text>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
@ -135,6 +173,11 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</slider> </slider>
<text>
<label> </label>
</text>
</group> </group>
<hrule><name>devel-stuff</name></hrule> <hrule><name>devel-stuff</name></hrule>
@ -142,7 +185,7 @@
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Brightness:</label> <label> Brightness:</label>
</text> </text>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
@ -155,13 +198,18 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</slider> </slider>
<text>
<label> </label>
</text>
</group> </group>
<group> <group>
<name>devel-stuff</name> <name>devel-stuff</name>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Red:</label> <label> Red:</label>
</text> </text>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
@ -178,13 +226,18 @@
<blue>0.5</blue> <blue>0.5</blue>
</color> </color>
</slider> </slider>
<text>
<label> </label>
</text>
</group> </group>
<group> <group>
<name>devel-stuff</name> <name>devel-stuff</name>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Green:</label> <label> Green:</label>
</text> </text>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
@ -201,13 +254,18 @@
<blue>0.5</blue> <blue>0.5</blue>
</color> </color>
</slider> </slider>
<text>
<label> </label>
</text>
</group> </group>
<group> <group>
<name>devel-stuff</name> <name>devel-stuff</name>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
<label>Blue:</label> <label> Blue:</label>
</text> </text>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
@ -224,6 +282,11 @@
<blue>1.0</blue> <blue>1.0</blue>
</color> </color>
</slider> </slider>
<text>
<label> </label>
</text>
</group> </group>
<hrule/> <hrule/>
@ -240,7 +303,7 @@
<nasal> <nasal>
<open><![CDATA[ <open><![CDATA[
gui.enable_widgets(cmdarg(), "devel-stuff", getprop("/sim/gui/devel-widgets")); gui.enable_widgets(cmdarg(), "devel-stuff", getprop("/sim/gui/devel-widgets"));
var radios = cmdarg().getChildren("group")[1].getChildren("radio"); var radios = cmdarg().getChildren("group")[2].getChildren("group")[1].getChildren("radio");
var set_radio = func(n) { var set_radio = func(n) {
for (var i = 0; i < size(radios); i +=1) { for (var i = 0; i < size(radios); i +=1) {
var prop = radios[i].getChild("property").getValue(); var prop = radios[i].getChild("property").getValue();

185
gui/dialogs/input-config.xml
View file

@ -2,6 +2,7 @@
<PropertyList> <PropertyList>
<name>input-config</name> <name>input-config</name>
<default-padding>3</default-padding>
<nasal> <nasal>
<open> <open>
@ -26,12 +27,13 @@
<modal>false</modal> <modal>false</modal>
<layout>vbox</layout> <layout>vbox</layout>
<!-- start group 1 -->
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<empty><stretch>1</stretch></empty> <empty><stretch>1</stretch></empty>
<text> <text>
<label>Input Options</label> <label>Mouse Input Options</label>
</text> </text>
<empty><stretch>1</stretch></empty> <empty><stretch>1</stretch></empty>
@ -50,79 +52,136 @@
<hrule/> <hrule/>
<group> <!-- start group 2 -->
<halign>center</halign> <group>
<valign>top</valign> <halign>left</halign>
<valign>top</valign>
<layout>table</layout>
<layout>table</layout> <!-- gap to left border -->
<text>
<halign>left</halign>
<label> </label>
<row>0</row>
<col>0</col>
</text>
<group> <text>
<pref-width>600</pref-width> <halign>left</halign>
<row>0</row> <label>Pressing TAB cycles the mouse mode through different behaviours </label>
<col>0</col> <row>0</row>
<colspan>2</colspan> <col>1</col>
</text>
<text>
<label>normal / flight-controls / view direction</label>
<row>1</row>
<col>1</col>
</text>
<layout>vbox</layout> <text>
<halign>left</halign>
<label> </label>
<row>2</row>
<col>1</col>
</text>
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>Pressing TAB cycles the mouse between different behaviours - normal, flight-controls and look.</label> <label>The right-mouse button can be used in two different ways:</label>
</text> <row>3</row>
<text> <col>1</col>
<halign>left</halign> </text>
<label>The right-mouse button can be used in two different ways:</label>
</text>
</group>
<!-- end group 2 -->
</group>
<text> <!-- start group 3 -->
<label>Press and hold right mouse to look around</label> <group>
<halign>right</halign> <halign>left</halign>
<row>1</row> <valign>top</valign>
<col>0</col> <layout>table</layout>
</text>
<radio>
<row>1</row>
<col>1</col>
<property>/sim/gui/dialogs/input-config/right-mouse-look</property>
<live>true</live>
<binding>
<command>nasal</command>
<script>rightMouseMode("look")</script>
</binding>
</radio>
<text> <!-- gap to left border -->
<label>Click right mouse to cycle mouse behaviour</label> <text>
<halign>right</halign> <halign>left</halign>
<row>2</row> <label> </label>
<col>0</col> <row>0</row>
</text> <col>0</col>
<radio> </text>
<row>2</row>
<col>1</col>
<property>/sim/gui/dialogs/input-config/right-mouse-cycle</property>
<live>true</live>
<binding>
<command>nasal</command>
<script>rightMouseMode("cycle")</script>
</binding>
</radio>
<checkbox> <radio>
<row>3</row> <halign>left</halign>
<col>0</col> <label> Press and hold right mouse to look around</label>
<colspan>2</colspan> <property>/sim/gui/dialogs/input-config/right-mouse-look</property>
<live>true</live>
<binding>
<command>nasal</command>
<script>rightMouseMode("look")</script>
</binding>
<row>0</row>
<col>1</col>
</radio>
<radio>
<halign>left</halign>
<label> Click right mouse to cycle mouse behaviour</label>
<property>/sim/gui/dialogs/input-config/right-mouse-cycle</property>
<live>true</live>
<binding>
<command>nasal</command>
<script>rightMouseMode("cycle")</script>
</binding>
<row>1</row>
<col>1</col>
</radio>
<!-- empty line before next -->
<text>
<row>3</row>
<col>0</col>
<label> </label>
<halign>left</halign>
</text>
<!-- end group 3 -->
</group>
<!-- start group 4 -->
<group>
<halign>left</halign>
<valign>top</valign>
<layout>table</layout>
<!-- gap to left border -->
<text>
<halign>left</halign> <halign>left</halign>
<label>Disable flight-controls via mouse</label> <label> </label>
<property>/sim/mouse/skip-flight-controls-mode</property> <row>0</row>
<binding> <col>0</col>
<command>dialog-apply</command> </text>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label> Disable flight-controls via mouse</label>
<property>/sim/mouse/skip-flight-controls-mode</property>
<binding>
<command>dialog-apply</command>
</binding>
<row>0</row>
<col>1</col>
</checkbox>
</group> <!-- empty line before next -->
<text>
<row>1</row>
<col>0</col>
<label> </label>
<halign>left</halign>
</text>
<!-- end group 4 -->
</group>
<hrule/> <hrule/>

622
gui/dialogs/instrument-failures.xml
View file

@ -34,317 +34,331 @@
<layout>hbox</layout> <layout>hbox</layout>
<halign>left</halign> <halign>left</halign>
<text> <text>
<label>Uncheck an instrument to fail it, or set the Mean Time Between Failures.</label> <label> Uncheck an instrument to fail it, or set the Mean Time Between Failures. </label>
</text> </text>
</group> </group>
<hrule/> <hrule/>
<group>
<layout>table</layout>
<halign>center</halign>
<text>
<row>0</row>
<col>0</col>
<label>Instrument</label>
</text>
<text>
<row>0</row>
<col>2</col>
<label>MTBF (sec)</label>
</text>
<text>
<row>0</row>
<col>3</col>
<label> </label>
</text>
<text>
<row>0</row>
<col>4</col>
<label>Instrument</label>
</text>
<text>
<row>0</row>
<col>6</col>
<label>MTBF (sec)</label>
</text>
<text>
<row>1</row>
<col>0</col>
<halign>right</halign>
<label>Nav 1 CDI</label>
</text>
<checkbox>
<row>1</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/nav[0]/cdi/serviceable</property>
</checkbox>
<input>
<row>1</row>
<col>2</col>
<width>80</width>
<height>20</height>
<property>/sim/failure-manager/instrumentation/nav[0]/cdi/mtbf</property>
</input>
<text>
<row>1</row>
<col>4</col>
<halign>right</halign>
<label>Nav 2 CDI</label>
</text>
<checkbox>
<row>1</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/nav[1]/cdi/serviceable</property>
</checkbox>
<input>
<row>1</row>
<col>6</col>
<width>80</width>
<height>20</height>
<property>/sim/failure-manager/instrumentation/nav[1]/cdi/mtbf</property>
</input>
<text>
<row>2</row>
<col>0</col>
<halign>right</halign>
<label>Nav 1 GS</label>
</text>
<checkbox>
<row>2</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/nav[0]/gs/serviceable</property>
</checkbox>
<input>
<row>2</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/nav[0]/gs/mtbf</property>
</input>
<text>
<row>2</row>
<col>4</col>
<halign>right</halign>
<label>Nav 2 GS</label>
</text>
<checkbox>
<row>2</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/nav[1]/gs/serviceable</property>
</checkbox>
<input>
<row>2</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/nav[1]/gs/mtbf</property>
</input>
<text>
<row>3</row>
<col>0</col>
<halign>right</halign>
<label>DME</label>
</text>
<checkbox>
<row>3</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/dme/serviceable</property>
</checkbox>
<input>
<row>3</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/dme/mtbf</property>
</input>
<text>
<row>3</row>
<col>4</col>
<halign>right</halign>
<label>ADF</label>
</text>
<checkbox>
<row>3</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/adf/serviceable</property>
</checkbox>
<input>
<row>3</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/adf/mtbf</property>
</input>
<text>
<row>4</row>
<col>0</col>
<halign>right</halign>
<label>Airspeed Indicator</label>
</text>
<checkbox>
<row>4</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/airspeed-indicator/serviceable</property>
</checkbox>
<input>
<row>4</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/airspeed-indicator/mtbf</property>
</input>
<text>
<row>4</row>
<col>4</col>
<halign>right</halign>
<label>Attitude Indicator</label>
</text>
<checkbox>
<row>4</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/attitude-indicator/serviceable</property>
</checkbox>
<input>
<row>4</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/attitude-indicator/mtbf</property>
</input>
<text>
<row>5</row>
<col>0</col>
<halign>right</halign>
<label>Altimeter</label>
</text>
<checkbox>
<row>5</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/altimeter/serviceable</property>
</checkbox>
<input>
<row>5</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/altimeter/mtbf</property>
</input>
<text>
<row>5</row>
<col>4</col>
<halign>right</halign>
<label>Turn Indicator</label>
</text>
<checkbox>
<row>5</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/turn-indicator/serviceable</property>
</checkbox>
<input>
<row>5</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/turn-indicator/mtbf</property>
</input>
<text>
<row>6</row>
<col>0</col>
<halign>right</halign>
<label>Slip/Skid Ball</label>
</text>
<checkbox>
<row>6</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/slip-skid-ball/serviceable</property>
</checkbox>
<input>
<row>6</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/slip-skid-ball/mtbf</property>
</input>
<text>
<row>6</row>
<col>4</col>
<halign>right</halign>
<label>Heading Indicator</label>
</text>
<checkbox>
<row>6</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/heading-indicator/serviceable</property>
</checkbox>
<input>
<row>6</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/heading-indicator/mtbf</property>
</input>
<text>
<row>7</row>
<col>0</col>
<halign>right</halign>
<label>Vertical Speed Ind.</label>
</text>
<checkbox>
<row>7</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/vertical-speed-indicator/serviceable</property>
</checkbox>
<input>
<row>7</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/vertical-speed-indicator/mtbf</property>
</input>
<text>
<row>7</row>
<col>4</col>
<halign>right</halign>
<label>Magnetic Compass</label>
</text>
<checkbox>
<row>7</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/magnetic-compass/serviceable</property>
</checkbox>
<input>
<row>7</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/magnetic-compass/mtbf</property>
</input>
</group>
<hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<group>
<layout>table</layout>
<halign>center</halign>
<text>
<row>0</row>
<col>0</col>
<label>Instrument</label>
</text>
<text>
<row>0</row>
<col>2</col>
<label>MTBF (sec)</label>
</text>
<text>
<row>0</row>
<col>3</col>
<label> </label>
</text>
<text>
<row>0</row>
<col>4</col>
<label>Instrument</label>
</text>
<text>
<row>0</row>
<col>6</col>
<label>MTBF (sec)</label>
</text>
<text>
<row>1</row>
<col>0</col>
<halign>right</halign>
<label>Nav 1 CDI</label>
</text>
<checkbox>
<row>1</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/nav[0]/cdi/serviceable</property>
</checkbox>
<input>
<row>1</row>
<col>2</col>
<width>80</width>
<height>20</height>
<property>/sim/failure-manager/instrumentation/nav[0]/cdi/mtbf</property>
</input>
<text>
<row>1</row>
<col>4</col>
<halign>right</halign>
<label>Nav 2 CDI</label>
</text>
<checkbox>
<row>1</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/nav[1]/cdi/serviceable</property>
</checkbox>
<input>
<row>1</row>
<col>6</col>
<width>80</width>
<height>20</height>
<property>/sim/failure-manager/instrumentation/nav[1]/cdi/mtbf</property>
</input>
<text>
<row>2</row>
<col>0</col>
<halign>right</halign>
<label>Nav 1 GS</label>
</text>
<checkbox>
<row>2</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/nav[0]/gs/serviceable</property>
</checkbox>
<input>
<row>2</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/nav[0]/gs/mtbf</property>
</input>
<text>
<row>2</row>
<col>4</col>
<halign>right</halign>
<label>Nav 2 GS</label>
</text>
<checkbox>
<row>2</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/nav[1]/gs/serviceable</property>
</checkbox>
<input>
<row>2</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/nav[1]/gs/mtbf</property>
</input>
<text>
<row>3</row>
<col>0</col>
<halign>right</halign>
<label>DME</label>
</text>
<checkbox>
<row>3</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/dme/serviceable</property>
</checkbox>
<input>
<row>3</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/dme/mtbf</property>
</input>
<text>
<row>3</row>
<col>4</col>
<halign>right</halign>
<label>ADF</label>
</text>
<checkbox>
<row>3</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/adf/serviceable</property>
</checkbox>
<input>
<row>3</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/adf/mtbf</property>
</input>
<text>
<row>4</row>
<col>0</col>
<halign>right</halign>
<label> Airspeed Indicator</label>
</text>
<checkbox>
<row>4</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/airspeed-indicator/serviceable</property>
</checkbox>
<input>
<row>4</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/airspeed-indicator/mtbf</property>
</input>
<text>
<row>4</row>
<col>4</col>
<halign>right</halign>
<label>Attitude Indicator</label>
</text>
<checkbox>
<row>4</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/attitude-indicator/serviceable</property>
</checkbox>
<input>
<row>4</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/attitude-indicator/mtbf</property>
</input>
<text>
<row>5</row>
<col>0</col>
<halign>right</halign>
<label>Altimeter</label>
</text>
<checkbox>
<row>5</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/altimeter/serviceable</property>
</checkbox>
<input>
<row>5</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/altimeter/mtbf</property>
</input>
<text>
<row>5</row>
<col>4</col>
<halign>right</halign>
<label>Turn Indicator</label>
</text>
<checkbox>
<row>5</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/turn-indicator/serviceable</property>
</checkbox>
<input>
<row>5</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/turn-indicator/mtbf</property>
</input>
<text>
<row>6</row>
<col>0</col>
<halign>right</halign>
<label>Slip/Skid Ball</label>
</text>
<checkbox>
<row>6</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/slip-skid-ball/serviceable</property>
</checkbox>
<input>
<row>6</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/slip-skid-ball/mtbf</property>
</input>
<text>
<row>6</row>
<col>4</col>
<halign>right</halign>
<label>Heading Indicator</label>
</text>
<checkbox>
<row>6</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/heading-indicator/serviceable</property>
</checkbox>
<input>
<row>6</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/heading-indicator/mtbf</property>
</input>
<text>
<row>7</row>
<col>0</col>
<halign>right</halign>
<label> Vertical Speed Ind.</label>
</text>
<checkbox>
<row>7</row>
<col>1</col>
<property>/sim/failure-manager/instrumentation/vertical-speed-indicator/serviceable</property>
</checkbox>
<input>
<row>7</row>
<col>2</col>
<property>/sim/failure-manager/instrumentation/vertical-speed-indicator/mtbf</property>
</input>
<text>
<row>7</row>
<col>4</col>
<halign>right</halign>
<label>Magnetic Compass</label>
</text>
<checkbox>
<row>7</row>
<col>5</col>
<property>/sim/failure-manager/instrumentation/magnetic-compass/serviceable</property>
</checkbox>
<input>
<row>7</row>
<col>6</col>
<property>/sim/failure-manager/instrumentation/magnetic-compass/mtbf</property>
</input>
</group>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<default-padding>7</default-padding>
<button> <button>
<legend>OK</legend> <legend>OK</legend>
<default>true</default> <default>true</default>

18
gui/dialogs/instruments.xml
View file

@ -53,7 +53,7 @@
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
<halign>right</halign> <halign>right</halign>
<label>QNH setting:</label> <label> QNH Setting:</label>
</text> </text>
<group> <group>
@ -124,7 +124,7 @@
<row>1</row> <row>1</row>
<col>0</col> <col>0</col>
<halign>right</halign> <halign>right</halign>
<label>ALT setting:</label> <label>ALT Setting:</label>
</text> </text>
<group> <group>
@ -221,13 +221,19 @@
<command>dialog-update</command> <command>dialog-update</command>
</binding> </binding>
</button> </button>
<!-- only for a gap -->
<text>
<label> </label>
</text>
</group> </group>
<text> <text>
<row>2</row> <row>2</row>
<col>0</col> <col>0</col>
<halign>right</halign> <halign>right</halign>
<label>HI offset:</label> <label>HI Offset:</label>
</text> </text>
<group> <group>
@ -322,6 +328,12 @@
<command>dialog-update</command> <command>dialog-update</command>
</binding> </binding>
</button> </button>
<!-- only for a gap -->
<text>
<label> </label>
</text>
</group> </group>
</group> </group>

144
gui/dialogs/jetways.xml
View file

@ -21,7 +21,7 @@
{ {
list ~= apt ~ " "; list ~= apt ~ " ";
} }
aptlist.setValue(list == "" ? "No airports loaded" : "Loaded airports: " ~ list); aptlist.setValue(list == "" ? " No airports loaded" : " Loaded airports: " ~ list);
} }
settimer(update, UPDATE_PERIOD); settimer(update, UPDATE_PERIOD);
}; };
@ -57,74 +57,92 @@
<hrule /> <hrule />
<checkbox> <group>
<halign>left</halign> <layout>hbox</layout>
<label>Enable animated jetways</label>
<property>/nasal/jetways/enabled</property>
<live type="bool">true</live>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Connect to multiplayer aircraft</label>
<property>/sim/jetways/interact-with-multiplay</property>
<live type="bool">true</live>
<enable>
<property>/nasal/jetways/enabled</property>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Enable jetway editor</label>
<property>/nasal/jetways_edit/enabled</property>
<live type="bool">true</live>
<enable>
<property>/nasal/jetways/enabled</property>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Debug mode</label>
<property>/sim/jetways/debug</property>
<live type="bool">true</live>
<enable>
<property>/nasal/jetways/enabled</property>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<group> <!-- only for a gap -->
<layout>hbox</layout> <group>
<button> <layout>vbox</layout>
<legend>Open editor</legend> <default-padding>1</default-padding>
<enable> <text>
<and> <label> </label>
<property>/nasal/jetways/enabled</property> </text>
<property>/nasal/jetways_edit/enabled</property> </group>
</and>
</enable> <group>
<binding> <layout>vbox</layout>
<command>dialog-show</command>
<dialog-name>jetways-adjust</dialog-name> <checkbox>
</binding> <halign>left</halign>
</button> <label>Enable animated jetways</label>
</group> <property>/nasal/jetways/enabled</property>
<live type="bool">true</live>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Connect to multiplayer aircraft</label>
<property>/sim/jetways/interact-with-multiplay</property>
<live type="bool">true</live>
<enable>
<property>/nasal/jetways/enabled</property>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Enable jetway editor</label>
<property>/nasal/jetways_edit/enabled</property>
<live type="bool">true</live>
<enable>
<property>/nasal/jetways/enabled</property>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Debug mode</label>
<property>/sim/jetways/debug</property>
<live type="bool">true</live>
<enable>
<property>/nasal/jetways/enabled</property>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<group>
<layout>hbox</layout>
<button>
<legend>Open editor</legend>
<enable>
<and>
<property>/nasal/jetways/enabled</property>
<property>/nasal/jetways_edit/enabled</property>
</and>
</enable>
<binding>
<command>dialog-show</command>
<dialog-name>jetways-adjust</dialog-name>
</binding>
</button>
</group>
</group>
</group>
<hrule /> <hrule />
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>No airports loaded</label> <label> No airports loaded</label>
<property>/sim/gui/dialogs/jetways/loaded-airports</property> <property>/sim/gui/dialogs/jetways/loaded-airports</property>
<live type="bool">true</live> <live type="bool">true</live>
</text> </text>