fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of git://gitorious.org/fg/fgdata

Browse source
This commit is contained in:
BARANGER Emmanuel 2011-10-12 03:08:53 +02:00
commit 9c03384777
2 changed files with 96 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
gui/dialogs/map.xml
View file

@ -16,9 +16,31 @@ command interface /autopilot/route-manager/input:
<layout>vbox</layout> <layout>vbox</layout>
<resizable>true</resizable> <resizable>true</resizable>
<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>
<nasal> <nasal>
<open> <open>
var mapDialog = cmdarg();
var setTransparency = func(updateDialog){
var alpha = (getprop("/gui/map/transparent") or 0);
mapDialog.getNode("color/alpha").setValue(1-alpha*0.3);
mapDialog.getNode("color/red").setValue(0.41-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" });
if (updateDialog)
{
fgcommand("dialog-close", n);
fgcommand("dialog-show", n);
}
}
setTransparency(0);
</open> </open>
<close> <close>
@ -128,6 +150,19 @@ command interface /autopilot/route-manager/input:
<empty><stretch>true</stretch></empty> <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> <checkbox>
<label>Center on Acft</label> <label>Center on Acft</label>
<pref-width>100</pref-width> <pref-width>100</pref-width>
@ -155,9 +190,9 @@ command interface /autopilot/route-manager/input:
</checkbox> </checkbox>
<checkbox> <checkbox>
<label>Magnetic Hdgs</label> <label>Transparent</label>
<pref-width>100</pref-width> <pref-width>100</pref-width>
<property>/gui/map/magnetic-headings</property> <property>/gui/map/transparent</property>
<live>true</live> <live>true</live>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -165,11 +200,16 @@ command interface /autopilot/route-manager/input:
<binding> <binding>
<command>property-toggle</command> <command>property-toggle</command>
</binding> </binding>
<binding>
<command>nasal</command>
<script>setTransparency(1);</script>
</binding>
</checkbox> </checkbox>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>
<button> <button>
<name>close</name>
<legend>Close</legend> <legend>Close</legend>
<pref-width>100</pref-width> <pref-width>100</pref-width>
<default>true</default> <default>true</default>
@ -202,18 +242,19 @@ command interface /autopilot/route-manager/input:
<layout>hbox</layout> <layout>hbox</layout>
<button> <button>
<legend>-</legend> <name>zoomout</name>
<pref-width>22</pref-width> <legend>-</legend>
<pref-height>22</pref-height> <pref-width>22</pref-width>
<pref-height>22</pref-height>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>/gui/map/zoom</property> <property>/gui/map/zoom</property>
<min>0</min> <min>0</min>
<step>-1</step> <step>-1</step>
</binding> </binding>
</button> </button>
<text> <text>
<label>MMM</label> <label>MMM</label>
<format>Zoom %d</format> <format>Zoom %d</format>
@ -222,17 +263,18 @@ command interface /autopilot/route-manager/input:
</text> </text>
<button> <button>
<legend>+</legend> <name>zoomin</name>
<pref-width>22</pref-width> <legend>+</legend>
<pref-height>22</pref-height> <pref-width>22</pref-width>
<pref-height>22</pref-height>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>/gui/map/zoom</property> <property>/gui/map/zoom</property>
<step>1</step> <step>1</step>
<max>12</max> <max>12</max>
</binding> </binding>
</button> </button>
</group> </group>
</group> </group>

30
gui/dialogs/stopwatch.xml
View file

@ -7,6 +7,12 @@
<default-padding>8</default-padding> <default-padding>8</default-padding>
<x>-5</x> <x>-5</x>
<y>5</y> <y>5</y>
<color>
<red>0.2</red>
<green>0.2</green>
<blue>0.2</blue>
<alpha>0.7</alpha>
</color>
<nasal> <nasal>
<open> <open>
@ -104,6 +110,12 @@
<legend>Start</legend> <legend>Start</legend>
<equal>true</equal> <equal>true</equal>
<pref-width>47</pref-width> <pref-width>47</pref-width>
<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>
</color>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>start()</script> <script>start()</script>
@ -114,6 +126,12 @@
<legend>Stop</legend> <legend>Stop</legend>
<default>true</default> <default>true</default>
<pref-width>47</pref-width> <pref-width>47</pref-width>
<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>
</color>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>stop()</script> <script>stop()</script>
@ -124,6 +142,12 @@
<legend>Reset</legend> <legend>Reset</legend>
<key>Delete</key> <key>Delete</key>
<pref-width>47</pref-width> <pref-width>47</pref-width>
<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>
</color>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>reset()</script> <script>reset()</script>
@ -132,6 +156,12 @@
<button> <button>
<legend>Close</legend> <legend>Close</legend>
<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>
</color>
<key>Esc</key> <key>Esc</key>
<pref-width>47</pref-width> <pref-width>47</pref-width>
<binding> <binding>