1
0
Fork 0

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

This commit is contained in:
BARANGER Emmanuel 2013-08-21 21:06:32 +02:00
commit 6112a0718e
10 changed files with 661 additions and 64 deletions

View file

@ -23,7 +23,7 @@
<animation>
<type>textranslate</type>
<object-name>alt-dig-1</object-name>
<property>instrumentation/kt-70/altitude</property>
<property>instrumentation/transponder/altitude</property>
<factor>0.00001</factor>
<step>10000</step>
<axis>
@ -35,7 +35,7 @@
<animation>
<type>textranslate</type>
<object-name>alt-dig-2</object-name>
<property>instrumentation/kt-70/altitude</property>
<property>instrumentation/transponder/altitude</property>
<factor>0.0001</factor>
<step>1000</step>
<axis>
@ -47,7 +47,7 @@
<animation>
<type>textranslate</type>
<object-name>alt-dig-3</object-name>
<property>instrumentation/kt-70/altitude</property>
<property>instrumentation/transponder/altitude</property>
<factor>0.001</factor>
<step>100</step>
<axis>
@ -63,6 +63,12 @@
<object-name>digit2</object-name>
<object-name>digit3</object-name>
<object-name>digit4</object-name>
<object-name>alt</object-name>
<object-name>gnd</object-name>
<object-name>fl</object-name>
<object-name>on</object-name>
<object-name>reply</object-name>
<object-name>sby</object-name>
<condition>
<greater-than>
<property>systems/electrical/outputs/transponder</property>
@ -74,7 +80,7 @@
<animation>
<type>textranslate</type>
<object-name>digit1</object-name>
<property>instrumentation/kt-70/inputs/digit[3]</property>
<property>instrumentation/transponder/inputs/digit[3]</property>
<factor>0.1</factor>
<step>1</step>
<axis>
@ -86,7 +92,7 @@
<animation>
<type>textranslate</type>
<object-name>digit2</object-name>
<property>instrumentation/kt-70/inputs/digit[2]</property>
<property>instrumentation/transponder/inputs/digit[2]</property>
<factor>0.1</factor>
<step>1</step>
<axis>
@ -99,7 +105,7 @@
<animation>
<type>textranslate</type>
<object-name>digit3</object-name>
<property>instrumentation/kt-70/inputs/digit[1]</property>
<property>instrumentation/transponder/inputs/digit[1]</property>
<factor>0.1</factor>
<step>1</step>
<axis>
@ -112,7 +118,7 @@
<animation>
<type>textranslate</type>
<object-name>digit4</object-name>
<property>instrumentation/kt-70/inputs/digit[0]</property>
<property>instrumentation/transponder/inputs/digit[0]</property>
<factor>0.1</factor>
<step>1</step>
<axis>
@ -127,7 +133,10 @@
<type>select</type>
<object-name>alt</object-name>
<condition>
<property>instrumentation/kt-70/annunciators/alt</property>
<equals>
<property>instrumentation/transponder/inputs/knob-mode</property>
<value>5</value>
</equals>
</condition>
</animation>
<animation>
@ -141,14 +150,20 @@
<type>select</type>
<object-name>gnd</object-name>
<condition>
<property>instrumentation/kt-70/annunciators/gnd</property>
<equals>
<property>instrumentation/transponder/inputs/knob-mode</property>
<value>3</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>on</object-name>
<condition>
<property>instrumentation/kt-70/annunciators/on</property>
<greater-than>
<property>instrumentation/transponder/inputs/knob-mode</property>
<value>3</value>
</greater-than>
</condition>
</animation>
<animation>
@ -162,7 +177,10 @@
<type>select</type>
<object-name>sby</object-name>
<condition>
<property>instrumentation/kt-70/annunciators/sby</property>
<equals>
<property>instrumentation/transponder/inputs/knob-mode</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
@ -170,8 +188,8 @@
<object-name>digits</object-name>
<condition>
<greater-than>
<property>instrumentation/kt-70/inputs/func-knob</property>
<value>1</value>
<property>instrumentation/transponder/inputs/knob-mode</property>
<value>0</value>
</greater-than>
</condition>
</animation>
@ -191,7 +209,7 @@
<proxy-name>click-func-R</proxy-name>
<object-name>knob0</object-name>
<property>instrumentation/kt-70/inputs/func-knob</property>
<property>instrumentation/transponder/inputs/knob-mode</property>
<factor>30</factor>
<offset-deg>-90</offset-deg>
<center>
@ -208,7 +226,7 @@
<action>
<binding>
<command>property-adjust</command>
<property>instrumentation/kt-70/inputs/func-knob</property>
<property>instrumentation/transponder/inputs/knob-mode</property>
<factor>1</factor>
<min>0</min>
<max>5</max>
@ -221,7 +239,7 @@
<command>set-tooltip</command>
<tooltip-id>kt70-func</tooltip-id>
<label>Transponder mode: %s</label>
<property>instrumentation/kt-70/inputs/knob-mode</property>
<property>instrumentation/transponder/inputs/knob-mode</property>
<mapping>nasal</mapping>
<script>
var modes = ['OFF', 'STANDBY', 'TEST', 'GROUND', 'ON', 'ALTITUDE'];
@ -241,7 +259,7 @@
<action>
<binding>
<command>property-adjust</command>
<property>instrumentation/kt-70/inputs/digit[3]</property>
<property>instrumentation/transponder/inputs/digit[3]</property>
<min>0</min>
<max>8</max>
<wrap>true</wrap>
@ -258,7 +276,7 @@
<action>
<binding>
<command>property-adjust</command>
<property>instrumentation/kt-70/inputs/digit[2]</property>
<property>instrumentation/transponder/inputs/digit[2]</property>
<min>0</min>
<max>8</max>
<wrap>true</wrap>
@ -275,7 +293,7 @@
<action>
<binding>
<command>property-adjust</command>
<property>instrumentation/kt-70/inputs/digit[1]</property>
<property>instrumentation/transponder/inputs/digit[1]</property>
<min>0</min>
<max>8</max>
<wrap>true</wrap>
@ -292,7 +310,7 @@
<action>
<binding>
<command>property-adjust</command>
<property>instrumentation/kt-70/inputs/digit[0]</property>
<property>instrumentation/transponder/inputs/digit[0]</property>
<min>0</min>
<max>8</max>
<wrap>true</wrap>
@ -310,13 +328,13 @@
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>instrumentation/kt-70/inputs/ident-btn</property>
<property>instrumentation/transponder/inputs/ident-btn</property>
<value>true</value>
</binding>
<mod-up>
<binding>
<command>property-assign</command>
<property>instrumentation/kt-70/inputs/ident-btn</property>
<property>instrumentation/transponder/inputs/ident-btn</property>
<value>false</value>
</binding>
</mod-up>
@ -339,7 +357,7 @@
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>instrumentation/kt-70/id-code</property>
<property>instrumentation/transponder/id-code</property>
<value>1200</value>
</binding>
</action>

View file

@ -1,6 +1,6 @@
AC3Db
MATERIAL "DefaultWhite.002" rgb 1 1 1 amb 1 1 1 emis 0.2 0.2 0.2 spec 0.5 0.5 0.5 shi 64 trans 0
MATERIAL "transparent" rgb 0.547091 0.565624 0.595981 amb 0 0 0 emis 0.1 0.1 0.1 spec 1 1 1 shi 64 trans 0.5
MATERIAL "DefaultWhite.002" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
MATERIAL "transparent" rgb 0.547091 0.565624 0.595981 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 64 trans 0.7
OBJECT world
kids 14
OBJECT poly
@ -5497,10 +5497,10 @@ refs 3
128 0.1015625 0.33984375
kids 0
OBJECT poly
name "Knob100s"
name "Border"
loc 0 0 -0
data 8
Knob100s
Border
texture "KT76A.png"
texrep 1 1
crease 30.000001

View file

@ -12,6 +12,20 @@
<path>KT76A.ac</path>
<params>
<transponder-serviceable>instrumentation/transponder/serviceable</transponder-serviceable>
<knob-mode>instrumentation/transponder/inputs/knob-mode</knob-mode>
<ident-btn>instrumentation/transponder/inputs/ident-btn</ident-btn>
<digit0>instrumentation/transponder/inputs/digit[0]</digit0>
<digit1>instrumentation/transponder/inputs/digit[1]</digit1>
<digit2>instrumentation/transponder/inputs/digit[2]</digit2>
<digit3>instrumentation/transponder/inputs/digit[3]</digit3>
<dimming>instrumentation/transponder/dimming-norm</dimming>
</params>
<animation>
<object-name>KnobMode</object-name>
<object-name>ModeUp</object-name>
@ -35,6 +49,7 @@
<object-name>1000Up</object-name>
<object-name>Front</object-name>
<object-name>Ident-light</object-name>
<object-name>Border</object-name>
<object-name>vitre</object-name>
</animation>
@ -64,34 +79,66 @@
<object-name>Front</object-name>
<object-name>Ident-light</object-name>
<property-base>/sim/instrumentation/transponder</property-base>
<property-base>/instrumentation/transponder</property-base>
<texture-prop>texture-file</texture-prop>
</animation>
<animation>
<type>material</type>
<object-name>KnobMode</object-name>
<object-name>ModeUp</object-name>
<object-name>ModeDn</object-name>
<object-name>Ident</object-name>
<object-name>Dial1</object-name>
<object-name>Knob1</object-name>
<object-name>1Dn</object-name>
<object-name>1Up</object-name>
<object-name>Dial10</object-name>
<object-name>Knob10</object-name>
<object-name>10Dn</object-name>
<object-name>10Up</object-name>
<object-name>Dial100</object-name>
<object-name>Knob100</object-name>
<object-name>100Dn</object-name>
<object-name>100Up</object-name>
<object-name>Dial1000</object-name>
<object-name>Knob1000</object-name>
<object-name>1000Dn</object-name>
<object-name>1000Up</object-name>
<object-name>Front</object-name>
<object-name>Ident-light</object-name>
<object-name>Border</object-name>
<object-name>vitre</object-name>
<condition>
<not><property>sim/rendering/rembrandt/enabled</property></not>
</condition>
<emission>
<red> 0.006 </red>
<green> 0.006 </green>
<blue> 0.006 </blue>
<factor-prop alias="../../../params/dimming"/>
</emission>
</animation>
<animation>
<type>noshadow</type>
<object-name>vitre</object-name>
</animation>
<animation>
<type>shader</type>
<shader>chrome</shader>
<texture>Aircraft/DR400-regent/Models/Effects/glass_shader.png</texture>
<object-name>vitre</object-name>
</animation>
<animation>
<type>select</type>
<effect>
<inherits-from>Effects/model-transparent</inherits-from>
<object-name>vitre</object-name>
<condition>
<property>sim/model/config/glass-reflection-instruments</property>
<property>sim/rendering/rembrandt/enabled</property>
</condition>
</animation>
</effect>
<animation>
<type>rotate</type>
<object-name>Dial1000</object-name>
<property>instrumentation/transponder/inputs/digit[3]</property>
<!--<property>instrumentation/transponder/inputs/digit[3]</property>-->
<property alias="../../params/digit3"/>
<factor>45</factor>
<center>
<x-m> 0.01453 </x-m>
@ -108,7 +155,8 @@
<animation>
<type>rotate</type>
<object-name>Knob1000</object-name>
<property>instrumentation/transponder/inputs/digit[3]</property>
<!--<property>instrumentation/transponder/inputs/digit[3]</property>-->
<property alias="../../params/digit3"/>
<factor>45</factor>
<center>
<x-m> 0.01453 </x-m>
@ -130,7 +178,8 @@
<action>
<binding>
<command>property-adjust</command>
<property>/instrumentation/transponder/inputs/digit[3]</property>
<!--<property>instrumentation/transponder/inputs/digit[3]</property>-->
<property alias="../../../../params/digit3"/>
<factor>1</factor>
<min>0</min>
<max>8</max>
@ -154,7 +203,8 @@
<animation>
<type>rotate</type>
<object-name>Dial100</object-name>
<property>instrumentation/transponder/inputs/digit[2]</property>
<!--<property>instrumentation/transponder/inputs/digit[2]</property>-->
<property alias="../../params/digit2"/>
<factor>45</factor>
<center>
<x-m> 0.004 </x-m>
@ -171,7 +221,8 @@
<animation>
<type>rotate</type>
<object-name>Knob100</object-name>
<property>instrumentation/transponder/inputs/digit[2]</property>
<!--<property>instrumentation/transponder/inputs/digit[2]</property>-->
<property alias="../../params/digit2"/>
<factor>45</factor>
<center>
<x-m> 0.01453 </x-m>
@ -193,7 +244,8 @@
<action>
<binding>
<command>property-adjust</command>
<property>/instrumentation/transponder/inputs/digit[2]</property>
<!--<property>instrumentation/transponder/inputs/digit[2]</property>-->
<property alias="../../../../params/digit2"/>
<factor>1</factor>
<min>0</min>
<max>8</max>
@ -217,7 +269,8 @@
<animation>
<type>rotate</type>
<object-name>Dial10</object-name>
<property>instrumentation/transponder/inputs/digit[1]</property>
<!--<property>instrumentation/transponder/inputs/digit[1]</property>-->
<property alias="../../params/digit1"/>
<factor>45</factor>
<center>
<x-m> 0.004 </x-m>
@ -234,7 +287,8 @@
<animation>
<type>rotate</type>
<object-name>Knob10</object-name>
<property>instrumentation/transponder/inputs/digit[1]</property>
<!--<property>instrumentation/transponder/inputs/digit[1]</property>-->
<property alias="../../params/digit1"/>
<factor>45</factor>
<center>
<x-m> 0.01453 </x-m>
@ -256,7 +310,8 @@
<action>
<binding>
<command>property-adjust</command>
<property>/instrumentation/transponder/inputs/digit[1]</property>
<!--<property>instrumentation/transponder/inputs/digit[1]</property>-->
<property alias="../../../../params/digit1"/>
<factor>1</factor>
<min>0</min>
<max>8</max>
@ -280,7 +335,8 @@
<animation>
<type>rotate</type>
<object-name>Dial1</object-name>
<property>instrumentation/transponder/inputs/digit[0]</property>
<!--<property>instrumentation/transponder/inputs/digit[0]</property>-->
<property alias="../../params/digit0"/>
<factor>45</factor>
<center>
<x-m> 0.004 </x-m>
@ -297,7 +353,8 @@
<animation>
<type>rotate</type>
<object-name>Knob1</object-name>
<property>instrumentation/transponder/inputs/digit[0]</property>
<!--<property>instrumentation/transponder/inputs/digit[0]</property>-->
<property alias="../../params/digit0"/>
<factor>45</factor>
<center>
<x-m> 0.01453 </x-m>
@ -319,7 +376,8 @@
<action>
<binding>
<command>property-adjust</command>
<property>/instrumentation/transponder/inputs/digit[0]</property>
<!--<property>instrumentation/transponder/inputs/digit[0]</property>-->
<property alias="../../../../params/digit0"/>
<factor>1</factor>
<min>0</min>
<max>8</max>
@ -348,7 +406,8 @@
<action>
<binding>
<command>property-cycle</command>
<property>/instrumentation/transponder/inputs/knob-mode</property>
<!--<property>/instrumentation/transponder/inputs/knob-mode</property>-->
<property alias="../../../../params/knob-mode"/>
<wrap>0</wrap>
<value>0</value> <!-- OFF -->
<value>1</value> <!-- SBY -->
@ -362,7 +421,8 @@
<command>set-tooltip</command>
<tooltip-id>transponder-mode-btn</tooltip-id>
<label>Mode: %s</label>
<property>instrumentation/transponder/inputs/knob-mode</property>
<!--<property>instrumentation/transponder/inputs/knob-mode</property>-->
<property alias="../../../../params/knob-mode"/>
<mapping>nasal</mapping>
<script>
var m = arg[0];
@ -379,7 +439,8 @@
<animation>
<type>rotate</type>
<object-name>KnobMode</object-name>
<property>instrumentation/transponder/inputs/knob-mode</property>
<!--<property>/instrumentation/transponder/inputs/knob-mode</property>-->
<property alias="../../params/knob-mode"/>
<factor>1</factor>
<interpolation>
<entry>
@ -419,13 +480,15 @@
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>/instrumentation/transponder/inputs/ident-btn</property>
<!--<property>/instrumentation/transponder/inputs/ident-btn</property>-->
<property alias="../../../../params/ident-btn"/>
<value type="bool">true</value>
</binding>
<mod-up>
<binding>
<command>property-assign</command>
<property>/instrumentation/transponder/inputs/ident-btn</property>
<!--<property>/instrumentation/transponder/inputs/ident-btn</property>-->
<property alias="../../../../../params/ident-btn"/>
<value type="bool">false</value>
</binding>
</mod-up>
@ -442,7 +505,8 @@
<animation>
<type>translate</type>
<object-name>Ident</object-name>
<property>instrumentation/transponder/inputs/ident-btn</property>
<!--<property>/instrumentation/transponder/inputs/ident-btn</property>-->
<property alias="../../params/ident-btn"/>
<factor> 0.0018 </factor>
<axis>
<x> -1 </x>

View file

@ -134,6 +134,30 @@
<texture-prop>texture-file</texture-prop>
</animation>
<animation>
<type>material</type>
<object-name>CommKnobs</object-name>
<object-name>CommKHz</object-name>
<object-name>CommMHz</object-name>
<object-name>CommToggle</object-name>
<object-name>CommVolume</object-name>
<object-name>NavKnobs</object-name>
<object-name>NavKHz</object-name>
<object-name>NavMHz</object-name>
<object-name>NavToggle</object-name>
<object-name>NavVolume</object-name>
<object-name>Chassis</object-name>
<condition>
<not><property>sim/rendering/rembrandt/enabled</property></not>
</condition>
<emission>
<red> 0.006 </red>
<green> 0.006 </green>
<blue> 0.006 </blue>
<factor-prop alias="../../../params/dimming"/>
</emission>
</animation>
<animation>
<type>select</type>
<object-name>CommUse</object-name>
@ -548,6 +572,15 @@
</condition>
</binding>
</action>
<hovered>
<binding>
<command>set-tooltip</command>
<tooltip-id>comm-volume</tooltip-id>
<label>Volume: %3d%%</label>
<property alias="../../../../params/comm-volume"/>
<mapping>percent</mapping>
</binding>
</hovered>
</animation>
<animation>
@ -667,6 +700,15 @@
<wrap>false</wrap>
</binding>
</action>
<hovered>
<binding>
<command>set-tooltip</command>
<tooltip-id>nav-volume</tooltip-id>
<label>Volume: %3d%%</label>
<property alias="../../../../params/nav-volume"/>
<mapping>percent</mapping>
</binding>
</hovered>
</animation>
<animation>
@ -801,4 +843,4 @@
</animation>
</PropertyList>
</PropertyList>

View file

@ -134,6 +134,30 @@
<texture-prop>texture-file</texture-prop>
</animation>
<animation>
<type>material</type>
<object-name>CommKnobs</object-name>
<object-name>CommKHz</object-name>
<object-name>CommMHz</object-name>
<object-name>CommToggle</object-name>
<object-name>CommVolume</object-name>
<object-name>NavKnobs</object-name>
<object-name>NavKHz</object-name>
<object-name>NavMHz</object-name>
<object-name>NavToggle</object-name>
<object-name>NavVolume</object-name>
<object-name>Chassis</object-name>
<condition>
<not><property>sim/rendering/rembrandt/enabled</property></not>
</condition>
<emission>
<red> 0.006 </red>
<green> 0.006 </green>
<blue> 0.006 </blue>
<factor-prop alias="../../../params/dimming"/>
</emission>
</animation>
<animation>
<type>select</type>
<object-name>CommUse</object-name>
@ -547,6 +571,15 @@
</condition>
</binding>
</action>
<hovered>
<binding>
<command>set-tooltip</command>
<tooltip-id>comm-volume</tooltip-id>
<label>Volume: %3d%%</label>
<property alias="../../../../params/comm-volume"/>
<mapping>percent</mapping>
</binding>
</hovered>
</animation>
<animation>
@ -666,6 +699,15 @@
<wrap>false</wrap>
</binding>
</action>
<hovered>
<binding>
<command>set-tooltip</command>
<tooltip-id>nav-volume</tooltip-id>
<label>Volume: %3d%%</label>
<property alias="../../../../params/nav-volume"/>
<mapping>percent</mapping>
</binding>
</hovered>
</animation>
<animation>
@ -800,4 +842,4 @@
</animation>
</PropertyList>
</PropertyList>

View file

@ -781,7 +781,7 @@
<z-m>-0.141</z-m>
</offsets>
</text>
<!-- ALREADY DISPLAYED BY KX165
<text>
<name>LabelRadio1</name>
<type type="string">literal</type>
@ -827,7 +827,7 @@
<z-m>-0.02</z-m>
</offsets>
</text>
-->
<text>
<name>LabelKMA</name>
<type type="string">literal</type>

View file

@ -126,8 +126,13 @@ to look all around in different directions.
</axis>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~ Hat Switch ~~~~~~~~~~~~~~~~~~~~~~~~ -->
<axis n="5">
<axis>
<desc>Hat Switch: View Direction (use mod buttons for different effects)</desc>
<number>
<unix>5</unix>
<mac>5</mac>
<windows>6</windows>
</number>
<low>
<repeatable>true</repeatable>
<binding>
@ -146,8 +151,13 @@ to look all around in different directions.
</high>
</axis>
<axis n="6">
<axis>
<desc>Hat Switch: View Elevation (use mod buttons for different effects)</desc>
<number>
<unix>6</unix>
<mac>6</mac>
<windows>7</windows>
</number>
<low>
<repeatable>true</repeatable>
<binding>

View file

@ -74,6 +74,7 @@
<!-- Multiplayer menu -->
<multiplayer>Multiplayer</multiplayer>
<mp-settings>Multiplayer Settings</mp-settings>
<fgcom-settings>FGCom Settings</fgcom-settings>
<mp-chat>Chat Dialog</mp-chat>
<mp-chat-menu>Chat Menu</mp-chat-menu>
<mp-list>Pilot List</mp-list>
@ -106,7 +107,7 @@
<print-scene-info>Print Visible Scene Info</print-scene-info>
<rendering-buffers>Hide/Show Rendering Buffers</rendering-buffers>
<rembrandt-buffers-choice>Select Rendering Buffers</rembrandt-buffers-choice>
<interface-config>User-interface options</interface-config>
<interface-config>User-interface options</interface-config>
<!-- Help menu -->
<help>Help</help>

412
gui/dialogs/fgcom.xml Normal file
View file

@ -0,0 +1,412 @@
<?xml version="1.0"?>
<PropertyList>
<name>fgcom</name>
<layout>vbox</layout>
<resizable>false</resizable>
<nasal>
<open><![CDATA[
var autofill = func {
if ((getprop("/sim/fgcom/selected-server") == nil) or
(getprop("/sim/fgcom/selected-server") == "" ) ){
var tx = getprop("/sim/fgcom/server");
var dlg = cmdarg();
#var servers = cmdarg().getChildren("group")[5].getChildren("combo")[0].getChildren("value");
var servers = props.globals.getNode("/sim/gui/dialogs/multiplay/fgcom-servers", 1);
foreach (var s; servers.getChildren("value")) {
var server = s.getValue();
var host = split(" ", server)[0];
if (host == tx) {
setprop("/sim/fgcom/selected-server", server);
}
}
}
}
var servers = props.globals.getNode("/sim/gui/dialogs/multiplay/fgcom-servers", 1);
var updateServers = func {
servers.removeChildren("value");
# get the results list from the server
var serverlist = props.globals.getNode("/sim/multiplay/server-list", 1);
var i=0;
foreach (var s; serverlist.getChildren("fgcom")) {
if (!s.getNode("online").getBoolValue()) {
continue; # skip offline servers
}
# label is name and location, for the moment
# should we include the number of users? or wait until we
# have a better UI toolkit?
var nm = s.getNode("hostname").getValue() ~ " - " ~ s.getNode("location").getValue();
servers.getNode("value[" ~ i ~ "]", 1).setValue(nm);
i += 1;
}
autofill();
gui.dialog_update("fgcom", "server");
}
var static_serverList = [
['fgcom.flightgear.org', 'Avignon, France'],
['delta384.server4you.de', 'Unknown']
];
var updateServersFailed = func {
debug.dump("Failed to retrieve server list!");
servers.removeChildren("value");
var i=0;
foreach (var s; static_serverList) {
# create the node the PUI combo
var nm = s[0] ~ " - " ~ s[1];
servers.getNode("value[" ~ i ~ "]", 1).setValue(nm);
i += 1;
}
autofill();
gui.dialog_update("fgcom", "server");
}
# listen for results arriving
setlistener("/sim/multiplay/got-servers", updateServers);
setlistener("/sim/multiplay/get-servers-failure", updateServersFailed);
fgcommand("xmlhttprequest", props.Node.new({
"url" : "http://liveries.flightgear.org/mpstatus/mpservers.xml",
"targetnode" : "/sim/multiplay/server-list",
"complete" : "/sim/multiplay/got-servers",
"failure" : "/sim/multiplay/get-servers-failure"
}));
]]>
</open>
<close>
</close>
</nasal>
<!-- titlebar -->
<group>
<layout>hbox</layout>
<empty>
<stretch>1</stretch>
</empty>
<text>
<label>FGCom Settings</label>
</text>
<empty>
<stretch>1</stretch>
</empty>
<button>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<legend></legend>
<keynum>27</keynum>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/>
<!-- main dialog area -->
<group>
<layout>table</layout>
<halign>left</halign>
<text>
<row>0</row>
<col>0</col>
<label>Enabled:</label>
<halign>right</halign>
</text>
<checkbox>
<row>0</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<name>enabled</name>
<label></label>
<property>/sim/fgcom/enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>enabled</object-name>
</binding>
</checkbox>
<text>
<row>2</row>
<col>0</col>
<label>Mic Volume:</label>
<halign>right</halign>
</text>
<slider>
<row>2</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<name>mic-vol</name>
<label></label>
<min>0</min>
<max>1.0</max>
<step>0.1</step>
<property>/sim/fgcom/mic-level</property>
<binding>
<command>dialog-apply</command>
<object-name>mic-vol</object-name>
</binding>
</slider>
<text>
<row>3</row>
<col>0</col>
<label>Speaker Volume:</label>
<halign>right</halign>
</text>
<slider>
<row>3</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<name>speaker-vol</name>
<label></label>
<min>0</min>
<max>1.0</max>
<step>0.1</step>
<property>/sim/fgcom/speaker-level</property>
<binding>
<command>dialog-apply</command>
<object-name>speaker-vol</object-name>
</binding>
</slider>
</group>
<hrule/>
<!-- registration -->
<group>
<layout>hbox</layout>
<empty>
<stretch>1</stretch>
</empty>
<text>
<label>Registration</label>
</text>
<empty>
<stretch>1</stretch>
</empty>
</group>
<group>
<layout>table</layout>
<halign>left</halign>
<text>
<row>0</row>
<col>0</col>
<halign>right</halign>
<label>Enabled:</label>
<enable>
<equals>
<property>/sim/fgcom/enabled</property>
<value>0</value>
</equals>
</enable>
</text>
<checkbox>
<row>0</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<name>reg-enabled</name>
<label></label>
<property>/sim/fgcom/register/enabled</property>
<enable>
<equals>
<property>/sim/fgcom/enabled</property>
<value>0</value>
</equals>
</enable>
<binding>
<command>dialog-apply</command>
<object-name>reg-enabled</object-name>
</binding>
</checkbox>
<text>
<row>1</row>
<col>0</col>
<halign>right</halign>
<label>Username:</label>
<enable>
<equals>
<property>/sim/fgcom/enabled</property>
<value>0</value>
</equals>
</enable>
</text>
<input>
<name>username</name>
<row>1</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<pref-width>125</pref-width>
<editable>true</editable>
<property>/sim/fgcom/register/username</property>
<enable>
<equals>
<property>/sim/fgcom/enabled</property>
<value>0</value>
</equals>
</enable>
<binding>
<command>dialog-apply</command>
<object-name>username</object-name>
</binding>
</input>
<text>
<row>2</row>
<col>0</col>
<halign>right</halign>
<label>Password:</label>
<enable>
<equals>
<property>/sim/fgcom/enabled</property>
<value>0</value>
</equals>
</enable>
</text>
<input>
<name>password</name>
<row>2</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<pref-width>125</pref-width>
<editable>true</editable>
<property>/sim/fgcom/register/password</property>
<enable>
<equals>
<property>/sim/fgcom/enabled</property>
<value>0</value>
</equals>
</enable>
<binding>
<command>dialog-apply</command>
<object-name>password</object-name>
</binding>
</input>
</group>
<hrule/>
<!-- server -->
<group>
<layout>hbox</layout>
<empty>
<stretch>1</stretch>
</empty>
<text>
<label>Server</label>
</text>
<empty>
<stretch>1</stretch>
</empty>
</group>
<group>
<layout>table</layout>
<halign>left</halign>
<text>
<row>0</row>
<col>0</col>
<label>Test:</label>
<halign>right</halign>
</text>
<checkbox>
<row>0</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<name>test</name>
<label></label>
<property>/sim/fgcom/test</property>
<binding>
<command>dialog-apply</command>
<object-name>test</object-name>
</binding>
</checkbox>
<combo>
<name>server</name>
<row>1</row>
<col>0</col>
<colspan>6</colspan>
<pref-width>275</pref-width>
<editable>false</editable>
<property>/sim/fgcom/selected-server</property>
<properties>/sim/gui/dialogs/multiplay/fgcom-servers</properties>
<binding>
<command>dialog-apply</command>
<object-name>server</object-name>
</binding>
<binding>
<command>nasal</command>
<script>
<![CDATA[
setprop("/sim/fgcom/enabled", 0);
var server = getprop("/sim/fgcom/selected-server");
server = split(" ", server)[0];
setprop("/sim/fgcom/server", server);
setprop("/sim/fgcom/enabled", 1);
]]>
</script>
</binding>
<binding>
<command>dialog-apply</command>
<object-name>test</object-name>
</binding>
</combo>
</group>
<!-- button area -->
<hrule/>
<group>
<layout>hbox</layout>
<default-padding>10</default-padding>
<empty>
<stretch>true</stretch>
</empty>
<button>
<legend>Close</legend>
<default>true</default>
<equal>true</equal>
<binding>
<command>dialog-close</command>
</binding>
</button>
<empty>
<stretch>true</stretch>
</empty>
</group>
</PropertyList>

View file

@ -446,6 +446,14 @@
</binding>
</item>
<item>
<name>fgcom-settings</name>
<binding>
<command>dialog-show</command>
<dialog-name>fgcom</dialog-name>
</binding>
</item>
<item>
<name>mp-chat</name>
<binding>