fly/fgdata
1
0
Fork 0
Code Activity

Automatic tower positioning

Browse source 
New option in "location of tower" dialog
This commit is contained in:
ThorstenB 2011-04-18 22:57:42 +02:00
parent b5e478f1ce
commit 995a219b35
2 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,15 +35,34 @@
<group> <group>
<layout>table</layout> <layout>table</layout>
<checkbox>
<name>auto-tower</name>
<row>0</row>
<col>0</col>
<colspan>2</colspan>
<label>Always use nearest tower</label>
<property>/sim/tower/auto-position</property>
<live>true</live>
<binding>
<command>dialog-apply</command>
<object-name>auto-tower</object-name>
</binding>
</checkbox>
<text> <text>
<row>0</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>0</row><col>1</col> <row>1</row><col>1</col>
<property>/sim/tower/airport-id</property> <property>/sim/tower/airport-id</property>
<enable>
<not>
<property>/sim/tower/auto-position</property>
</not>
</enable>
</input> </input>
<empty> <empty>
<row>0</row><col>3</col> <row>0</row><col>3</col>
@ -54,7 +73,7 @@
are not filled in on the COM radio retuning... are not filled in on the COM radio retuning...
I'm working on that part now. I'm working on that part now.
<button> <button>
<row>1</row><col>0</col> <row>2</row><col>0</col>
<legend>COM1</legend> <legend>COM1</legend>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
@ -67,22 +86,22 @@
</binding> </binding>
</button> </button>
<text> <text>
<row>1</row><col>2</col> <row>2</row><col>2</col>
<property>/instrumentation/comm[0]/frequencies/selected-mhz</property> <property>/instrumentation/comm[0]/frequencies/selected-mhz</property>
<label>MHz</label> <label>MHz</label>
<format>%-0.2f</format> <format>%-0.2f</format>
</text> </text>
<text> <text>
<row>1</row><col>1</col> <row>2</row><col>1</col>
<property>/instrumentation/comm[0]/airport-id</property> <property>/instrumentation/comm[0]/airport-id</property>
</text> </text>
<empty> <empty>
<row>1</row><col>3</col> <row>2</row><col>3</col>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </empty>
<button> <button>
<row>2</row><col>0</col> <row>3</row><col>0</col>
<legend>COM2</legend> <legend>COM2</legend>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
@ -95,24 +114,24 @@
</binding> </binding>
</button> </button>
<text> <text>
<row>2</row><col>2</col> <row>3</row><col>2</col>
<property>/instrumentation/comm[1]/frequencies/selected-mhz</property> <property>/instrumentation/comm[1]/frequencies/selected-mhz</property>
<label>MHz</label> <label>MHz</label>
<format>%-0.2f</format> <format>%-0.2f</format>
</text> </text>
<text> <text>
<row>2</row><col>1</col> <row>3</row><col>1</col>
<property>/instrumentation/comm[1]/airport-id</property> <property>/instrumentation/comm[1]/airport-id</property>
</text> </text>
<empty> <empty>
<row>2</row><col>3</col> <row>3</row><col>3</col>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </empty>
--> -->
<button> <button>
<legend>Preset</legend> <legend>Preset</legend>
<row>3</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
@ -120,6 +139,9 @@
The way it is now CANCEL doesn't undo PRESET :-( The way it is now CANCEL doesn't undo PRESET :-(
--> -->
<enable>
<not><property>sim/tower/auto-position</property></not>
</enable>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/tower/airport-id</property> <property>/sim/tower/airport-id</property>
@ -131,11 +153,11 @@
</binding> </binding>
</button> </button>
<text> <text>
<row>3</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>3</row><col>3</col> <row>4</row><col>3</col>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </empty>
</group> </group>

4
preferences.xml
View file

@ -410,10 +410,10 @@ Started September 2000 by David Megginson, david@megginson.com
<roll-deg type="double">0</roll-deg> <roll-deg type="double">0</roll-deg>
<pitch-deg type="double">0</pitch-deg> <pitch-deg type="double">0</pitch-deg>
<heading-deg type="double">0</heading-deg> <heading-deg type="double">0</heading-deg>
<auto-position type="bool" userarchive="y">true</auto-position>
</tower> </tower>
<view-name-popup type="bool" <view-name-popup type="bool" userarchive="y">true</view-name-popup>
userarchive="y">true</view-name-popup>
<view> <view>
<name>Cockpit View</name> <name>Cockpit View</name>