diff --git a/gui/dialogs/autopilot.xml b/gui/dialogs/autopilot.xml index 3ad59ed5a..52b307188 100644 --- a/gui/dialogs/autopilot.xml +++ b/gui/dialogs/autopilot.xml @@ -19,20 +19,21 @@ <text><label>Autopilot Settings</label></text> - <hrule><dummy/></hrule> - <group> <layout>hbox</layout> - <default-padding>8</default-padding> <group> <!-- Pitch/Altitude --> <layout>vbox</layout> <group> <layout>hbox</layout> + <text><label>Heading Control:</label></text> + <empty><stretch>true</stretch></empty> <checkbox> - <label>Heading Control</label> - <halign>fill</halign> + <label>Active</label> <property>/autopilot/gui/hdg-active</property> + <binding> + <command>dialog-apply</command> + </binding> <binding> <command>nasal</command> <script>autopilot.update()</script> @@ -73,10 +74,6 @@ <row>1</row><col>2</col> <name>hdg-bug</name> <property>/autopilot/settings/heading-bug-deg</property> - <binding> - <command>dialog-apply</command> - </binding> - <live>true</live> </input> <text> @@ -96,10 +93,6 @@ <row>2</row><col>2</col> <name>hdg-true</name> <property>/autopilot/settings/true-heading-deg</property> - <binding> - <command>dialog-apply</command> - </binding> - <live>true</live> </input> <text> @@ -117,14 +110,21 @@ </radio> </group> - <hrule><dummy/></hrule> + <empty> + <stretch>true</stretch> + <pref-height>28</pref-height> + </empty> <group> <layout>hbox</layout> + <text><label>Velocity Control:</label></text> + <empty><stretch>true</stretch></empty> <checkbox> - <label>Velocity Control</label> - <halign>fill</halign> + <label>Active</label> <property>/autopilot/gui/vel-active</property> + <binding> + <command>dialog-apply</command> + </binding> <binding> <command>nasal</command> <script>autopilot.update()</script> @@ -152,10 +152,6 @@ <rowspan>2</rowspan> <name>vel-throttle</name> <property>/autopilot/settings/target-speed-kt</property> - <binding> - <command>dialog-apply</command> - </binding> - <live>true</live> </input> <text> @@ -174,19 +170,19 @@ </group> </group> <!-- End of Heading/Speed --> - - - <vrule><dummy/></vrule> - - + <group> <!-- Pitch/Altitude --> <layout>vbox</layout> <group> <layout>hbox</layout> + <text><label>Pitch/Altitude Control:</label></text> + <empty><stretch>true</stretch></empty> <checkbox> - <label>Pitch/Altitude Control</label> - <halign>fill</halign> + <label>Active</label> <property>/autopilot/gui/alt-active</property> + <binding> + <command>dialog-apply</command> + </binding> <binding> <command>nasal</command> <script>autopilot.update()</script> @@ -213,10 +209,6 @@ <row>0</row><col>2</col> <name>alt-vert</name> <property>/autopilot/settings/vertical-speed-fpm</property> - <binding> - <command>dialog-apply</command> - </binding> - <live>true</live> </input> <text> @@ -236,10 +228,6 @@ <row>1</row><col>2</col> <name>alt-pitch</name> <property>/autopilot/settings/target-pitch-deg</property> - <binding> - <command>dialog-apply</command> - </binding> - <live>true</live> </input> <text> @@ -259,10 +247,6 @@ <row>2</row><col>2</col> <name>alt-aoa</name> <property>/autopilot/settings/target-aoa-deg</property> - <binding> - <command>dialog-apply</command> - </binding> - <live>true</live> </input> <text> @@ -282,10 +266,6 @@ <row>3</row><col>2</col> <name>alt-alt</name> <property>/autopilot/settings/target-altitude-ft</property> - <binding> - <command>dialog-apply</command> - </binding> - <live>true</live> </input> <text> @@ -305,10 +285,6 @@ <row>4</row><col>2</col> <name>alt-agl</name> <property>/autopilot/settings/target-agl-ft</property> - <binding> - <command>dialog-apply</command> - </binding> - <live>true</live> </input> <text> @@ -332,7 +308,7 @@ </group> <button> - <legend>Close</legend> + <legend>OK</legend> <default>true</default> <key>Esc</key> <padding>10</padding>