1
0
Fork 0

Correction of the arrangement of controls for "Weather" dialog

Remove gaps made by space characters.
Add ability to stretch the window.
Adapt to the Tortola style too.
This commit is contained in:
Roman Ludwicki 2022-09-28 00:10:12 +02:00
parent fc60ae32c9
commit 6c025f04b2

View file

@ -1,9 +1,9 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<PropertyList> <PropertyList>
<nasal> <nasal>
<open> <open>
<![CDATA[ <![CDATA[
setprop("sim/gui/dialogs/metar/description[1]", setprop("sim/gui/dialogs/metar/description[1]",
"Simple and fast weather engine that interprets METAR data " ~ "Simple and fast weather engine that interprets METAR data " ~
@ -285,518 +285,437 @@
var controller = GlobalWeatherDialogController.new( cmdarg() ); var controller = GlobalWeatherDialogController.new( cmdarg() );
controller.open(); controller.open();
]]> ]]>
</open> </open>
<close> <close>
<![CDATA[ <![CDATA[
controller.close(); controller.close();
]]> ]]>
</close> </close>
</nasal> </nasal>
<!-- Control the weather --> <!-- Control the weather -->
<name>weather</name> <name>weather</name>
<modal>false</modal> <modal>false</modal>
<resizable>false</resizable> <resizable>true</resizable>
<layout>vbox</layout> <layout>vbox</layout>
<default-padding>3</default-padding> <default-padding>3</default-padding>
<!-- Title bar with close button --> <!-- Title bar with close button -->
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<empty>
<stretch>true</stretch>
</empty>
<text>
<label>Weather Conditions</label>
</text>
<empty>
<stretch>true</stretch>
</empty>
<button>
<legend/>
<key>Esc</key>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<!-- only for a gap -->
<group> <group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<group>
<layout>vbox</layout>
<text>
<halign>left</halign>
<label>Select Weather Engine</label>
</text>
<group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>left</halign> <default-padding>1</default-padding>
<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>
<button>
<row>0</row>
<col>2</col>
<legend>Weather help</legend>
<binding>
<command>open-browser</command>
<path>Docs/README.local_weather.html</path>
</binding>
</button>
<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>90</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>
<layout>table</layout>
</group>
-->
<empty>
<stretch>true</stretch>
</empty>
</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>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<group>
<layout>vbox</layout>
<halign>left</halign>
<group>
<layout>hbox</layout>
<halign>left</halign>
<group>
<layout>table</layout>
<text>
<row>0</row>
<col>0</col>
<label>Weather Conditions</label>
<halign>left</halign>
</text>
<text>
<row>0</row>
<col>1</col>
<label> </label>
<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-input</object-name>
</binding>
</combo>
</group>
</group>
<textbox>
<name>description</name>
<halign>fill</halign>
<stretch>true</stretch>
<pref-width>450</pref-width>
<pref-height>100</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[0]</property>
</textbox>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<group>
<layout>hbox</layout>
<text>
<label>METAR Data</label>
</text>
<empty> <empty>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </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> <text>
<layout>hbox</layout> <label>Weather Conditions</label>
<textbox> </text>
<name>metar-string-input</name>
<halign>fill</halign> <empty>
<stretch>true</stretch> <stretch>true</stretch>
<!-- </empty>
<pref-width>250</pref-width>
-->
<pref-height>70</pref-height>
<slider>15</slider>
<editable>true</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-input</object-name>
</binding>
</textbox>
</group>
<group>
<layout>hbox</layout>
<button> <button>
<legend>METAR Description...</legend> <legend/>
<key>Esc</key>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<border>2</border>
<binding> <binding>
<command>dialog-show</command> <command>dialog-close</command>
<dialog-name>weather-metar-description</dialog-name>
</binding> </binding>
</button> </button>
<empty>
<stretch>true</stretch>
</empty>
</group>
</group> </group>
<!-- only for a gap --> <hrule/>
<group> <group>
<layout>vbox</layout> <layout>hbox</layout>
<default-padding>1</default-padding> <valign>fill</valign>
<text> <stretch>true</stretch>
<label> </label>
</text> <group>
<layout>vbox</layout>
<valign>fill</valign>
<padding>5</padding>
<text>
<halign>left</halign>
<label>Select Weather Engine</label>
</text>
<group>
<layout>table</layout>
<radio>
<row>0</row>
<col>0</col>
<halign>left</halign>
<name>simple-weather</name>
<property>sim/gui/dialogs/metar/mode/global-weather</property>
<live>true</live>
<label>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>
<group>
<row>0</row>
<col>1</col>
<layout>hbox</layout>
<halign>right</halign>
<checkbox>
<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>
<button>
<halign>right</halign>
<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>
<valign>fill</valign>
<stretch>true</stretch>
<pref-height>90</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>table</layout>
<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>
<group>
<row>0</row>
<col>1</col>
<layout>hbox</layout>
<halign>right</halign>
<button>
<halign>right</halign>
<legend>Weather help</legend>
<binding>
<command>open-browser</command>
<path>Docs/README.local_weather.html</path>
</binding>
</button>
<button>
<legend>Advanced Settings...</legend>
<halign>right</halign>
<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>
<valign>fill</valign>
<stretch>true</stretch>
<pref-height>100</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> </group>
</group> <hrule/>
<hrule/> <group>
<layout>vbox</layout>
<valign>fill</valign>
<stretch>true</stretch>
<group> <group>
<empty> <layout>vbox</layout>
<stretch>true</stretch> <padding>5</padding>
</empty>
<layout>hbox</layout>
<button> <group>
<legend>OK</legend> <layout>table</layout>
<equal>true</equal>
<binding>
<command>dialog-apply</command>
<object-name>metar-string-input</object-name>
</binding>
<binding>
<command>nasal</command>
<script>
controller.apply();
</script>
</binding>
<binding>
<command>dialog-close</command>
</binding>
</button>
<button> <text>
<legend>Apply</legend> <row>0</row>
<equal>true</equal> <col>0</col>
<binding> <label>Weather Conditions</label>
<command>dialog-apply</command> <halign>left</halign>
<object-name>metar-string-input</object-name> </text>
</binding>
<binding>
<command>nasal</command>
<script>
controller.apply();
</script>
</binding>
</button>
<button> <combo>
<legend>Close</legend> <row>0</row>
<equal>true</equal> <col>1</col>
<default>true</default> <name>source-selection</name>
<key>Esc</key> <halign>right</halign>
<binding> <stretch>true</stretch>
<command>dialog-close</command> <pref-width>300</pref-width>
</binding> <property>sim/gui/dialogs/metar/source-selection</property>
</button> <enable>
<empty> <equals>
<stretch>true</stretch> <property>sim/gui/dialogs/metar/mode/manual-weather</property>
</empty> <value>0</value>
</group> </equals>
</enable>
<binding>
<command>dialog-apply</command>
<object-name>source-selection</object-name>
</binding>
<binding>
<command>dialog-update</command>
<object-name>metar-string-input</object-name>
</binding>
</combo>
</group>
<textbox>
<name>description</name>
<halign>fill</halign>
<valign>fill</valign>
<stretch>true</stretch>
<pref-height>100</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[0]</property>
</textbox>
</group>
<group>
<layout>vbox</layout>
<padding>5</padding>
<group>
<layout>table</layout>
<text>
<row>0</row>
<col>0</col>
<label>METAR Data</label>
<halign>left</halign>
</text>
<group>
<row>0</row>
<col>1</col>
<layout>hbox</layout>
<halign>right</halign>
<text>
<label>Data is valid</label>
</text>
<checkbox>
<property>/environment/metar/valid</property>
<label/>
<live>true</live>
<enable>
<false/>
</enable>
</checkbox>
</group>
</group>
<textbox>
<name>metar-string-input</name>
<halign>fill</halign>
<valign>fill</valign>
<stretch>true</stretch>
<pref-height>70</pref-height>
<slider>15</slider>
<editable>true</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-input</object-name>
</binding>
</textbox>
<group>
<layout>hbox</layout>
<halign>left</halign>
<button>
<legend>METAR Description...</legend>
<binding>
<command>dialog-show</command>
<dialog-name>weather-metar-description</dialog-name>
</binding>
</button>
</group>
</group>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<empty>
<stretch>true</stretch>
</empty>
<button>
<legend>OK</legend>
<equal>true</equal>
<binding>
<command>dialog-apply</command>
<object-name>metar-string-input</object-name>
</binding>
<binding>
<command>nasal</command>
<script>
controller.apply();
</script>
</binding>
<binding>
<command>dialog-close</command>
</binding>
</button>
<button>
<legend>Apply</legend>
<equal>true</equal>
<binding>
<command>dialog-apply</command>
<object-name>metar-string-input</object-name>
</binding>
<binding>
<command>nasal</command>
<script>
controller.apply();
</script>
</binding>
</button>
<button>
<legend>Close</legend>
<equal>true</equal>
<default>true</default>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>
<empty>
<stretch>true</stretch>
</empty>
</group>
</PropertyList> </PropertyList>