fly/fgdata
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
BARANGER Emmanuel 2013-08-22 22:58:14 +02:00
commit 12ab2cafa7
4 changed files with 100 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Aircraft/Instruments-3d/kt76a/KT76A.xml
View file

@ -13,7 +13,7 @@
<path>KT76A.ac</path>
<params>
<transponder-serviceable>instrumentation/transponder/serviceable</transponder-serviceable>
<serviceable>instrumentation/transponder/serviceable</serviceable>
<knob-mode>instrumentation/transponder/inputs/knob-mode</knob-mode>
<ident-btn>instrumentation/transponder/inputs/ident-btn</ident-btn>

6
gui/dialogs/fgcom.xml
View file

@ -358,6 +358,12 @@
<editable>false</editable>
<property>/sim/fgcom/selected-server</property>
<properties>/sim/gui/dialogs/multiplay/fgcom-servers</properties>
<enable>
<equals>
<property>/sim/fgcom/enabled</property>
<value>1</value>
</equals>
</enable>
<binding>
<command>dialog-apply</command>
<object-name>server</object-name>

8
gui/dialogs/sound.xml
View file

@ -356,7 +356,13 @@
if (cmp(current, new) != 0) {
setprop("sim/sound/devices/name", new);
setprop("sim/sound/device-name", new);
fgcommand("reinit", props.Node.new({ "subsystem" : "sound" }));
if(getprop("/sim/fgcom/enabled")) {
setprop("/sim/fgcom/enabled", 0);
settimer( func { fgcommand("reinit", props.Node.new({ "subsystem" : "sound" })); }, 0.5 );
settimer( func { setprop("/sim/fgcom/enabled", 1); print("enable fgcom");}, 1 );
} else {
fgcommand("reinit", props.Node.new({ "subsystem" : "sound" }));
}
}
}

86
mice.xml
View file

@ -309,11 +309,38 @@ current mode for each mouse is held in the
<constrained type="bool">true</constrained>
<pass-through type="bool">false</pass-through>
<!-- extra buttons control FoV -->
<!-- these are often assigned to mouse-wheel motion in Linux -->
<button n="3">
<binding>
<condition>
<property>/devices/status/mice/mouse[0]/button[2]</property>
</condition>
<command>nasal</command>
<script>view.decrease()</script>
</binding>
</button>
<button n="4">
<binding>
<condition>
<property>/devices/status/mice/mouse[0]/button[2]</property>
</condition>
<command>nasal</command>
<script>view.increase()</script>
</binding>
</button>
<!-- Mouse left/right motion -->
<x-axis>
<!-- rotate the view left or right -->
<binding>
<condition>
<not>
<property>/devices/status/mice/mouse[0]/button[1]</property>
</not>
</condition>
<command>property-adjust</command>
<property>/sim/current-view/heading-offset-deg</property>
<factor type="double">-360</factor>
@ -322,6 +349,17 @@ current mode for each mouse is held in the
<wrap type="bool">true</wrap>
</binding>
<!-- Middle button pressed: move the view position left or right -->
<binding>
<condition>
<property>/devices/status/mice/mouse[0]/button[1]</property>
</condition>
<command>property-adjust</command>
<property>/sim/current-view/x-offset-m</property>
<factor type="double">1</factor>
<wrap type="bool">false</wrap>
</binding>
</x-axis>
<!-- Mouse up/down motion -->
@ -329,6 +367,11 @@ current mode for each mouse is held in the
<!-- tilt the view up and down -->
<binding>
<condition>
<not>
<property>/devices/status/mice/mouse[0]/button[1]</property>
</not>
</condition>
<command>property-adjust</command>
<property>/sim/current-view/pitch-offset-deg</property>
<factor type="double">-180</factor>
@ -337,8 +380,51 @@ current mode for each mouse is held in the
<wrap type="bool">false</wrap>
</binding>
<!-- Middle button pressed move the view up and down -->
<binding>
<condition>
<property>/devices/status/mice/mouse[0]/button[1]</property>
</condition>
<command>property-adjust</command>
<property>/sim/current-view/y-offset-m</property>
<factor type="double">-1</factor>
<wrap type="bool">false</wrap>
</binding>
</y-axis>
<y-axis-ctrl>
<!-- Middle button and Ctrl pressed: move the view forward and backward -->
<binding>
<condition>
<property>/devices/status/mice/mouse[0]/button[1]</property>
</condition>
<command>property-adjust</command>
<property>/sim/current-view/z-offset-m</property>
<factor type="double">1</factor>
<wrap type="bool">false</wrap>
</binding>
<binding>
<condition>
<not><property>/devices/status/mice/mouse[0]/button[1]</property></not>
</condition>
<command>property-adjust</command>
<property>/sim/current-view/y-offset-m</property>
<factor type="double">-1</factor>
<wrap type="bool">false</wrap>
</binding>
</y-axis-ctrl>
<x-axis-ctrl>
<binding>
<command>property-adjust</command>
<property>/sim/current-view/x-offset-m</property>
<factor type="double">1</factor>
<wrap type="bool">false</wrap>
</binding>
</x-axis-ctrl>
</mode>
</mouse> <!-- of mouse 0 -->