1
0
Fork 0

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

This commit is contained in:
BARANGER Emmanuel 2011-07-31 16:21:05 +02:00
commit 0481fc5010
3 changed files with 84 additions and 86 deletions

View file

@ -45,7 +45,7 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Show worst-case frame latency</label> <label>Show frame spacing</label>
<property>/sim/rendering/frame-latency-display</property> <property>/sim/rendering/frame-latency-display</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>

View file

@ -73,7 +73,6 @@
</checkbox> </checkbox>
<!-- <!--
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
@ -93,16 +92,18 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
-->
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Use point sprites for runway lights</label> <label>Use point sprites for runway lights (requires restart)</label>
<property>/sim/rendering/point-sprites</property> <property>/sim/rendering/point-sprites</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
<!--
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Enhanced runway lighting</label> <label>Enhanced runway lighting</label>
@ -129,7 +130,6 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
--> -->
<group> <group>
@ -690,8 +690,6 @@
</text> </text>
</group> </group>
</group> </group>
</group> </group>

View file

@ -77,7 +77,7 @@
</slider> </slider>
<text> <text>
<label>12345678</label> <label>12345678</label>
<format>%.2f</format> <format>%.2f m</format>
<live>true</live> <live>true</live>
<property>/sim/rendering/osg-displaysettings/screen-distance</property> <property>/sim/rendering/osg-displaysettings/screen-distance</property>
</text> </text>
@ -98,7 +98,7 @@
</slider> </slider>
<text> <text>
<label>12345678</label> <label>12345678</label>
<format>%.2f</format> <format>%.2f m</format>
<live>true</live> <live>true</live>
<property>/sim/rendering/osg-displaysettings/eye-separation</property> <property>/sim/rendering/osg-displaysettings/eye-separation</property>
</text> </text>