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 2010-09-24 00:43:23 +02:00
commit c7bf747b50
3 changed files with 719 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
gui/dialogs/osg_display_settings.xml → gui/dialogs/stereoscopic-view-options.xml
View file

@ -2,8 +2,7 @@
<PropertyList>
<!-- Control the weather -->
<name>osg-display-settings</name>
<name>stereoscopic-view-options</name>
<modal>false</modal>
<resizable>false</resizable>
<layout>vbox</layout>
@ -18,7 +17,7 @@
</empty>
<text>
<label>OSG Display Settings (experimental)</label>
<label>Stereoscopic View Options</label>
</text>
<empty>
@ -71,7 +70,7 @@
<empty><stretch>true</stretch></empty>
<slider>
<min>0</min>
<max>1.0</max>
<max>10.0</max>
<property>/sim/rendering/osg-displaysettings/screen-distance</property>
<binding>
<command>dialog-apply</command>
@ -106,77 +105,4 @@
</text>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Double Buffer</label></text>
<empty><stretch>true</stretch></empty>
<checkbox>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/double-buffer</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Depth Buffer</label></text>
<empty><stretch>true</stretch></empty>
<checkbox>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/depth-buffer</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>RGB</label></text>
<empty><stretch>true</stretch></empty>
<checkbox>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/rgb</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Screen Width</label></text>
<empty><stretch>true</stretch></empty>
<input>
<width>100</width>
<height>25</height>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/screen-width</property>
<binding>
<command>dialog-apply</command>
</binding>
</input>
</group>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<text><label>Screen Height</label></text>
<empty><stretch>true</stretch></empty>
<input>
<width>100</width>
<height>25</height>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/screen-height</property>
<binding>
<command>dialog-apply</command>
</binding>
</input>
</group>
</PropertyList>

808
gui/dialogs/weather.xml
View file

File diff suppressed because it is too large Load diff

18
gui/menubar.xml
View file

@ -193,6 +193,14 @@
<dialog-name>replay</dialog-name>
</binding>
</item>
<item>
<label>Stereoscopic View Options</label>
<binding>
<command>dialog-show</command>
<dialog-name>stereoscopic-view-options</dialog-name>
</binding>
</item>
</menu>
<menu>
@ -649,16 +657,6 @@
</binding>
</item>
<item>
<label>OSG Display Settings</label>
<binding>
<command>dialog-show</command>
<dialog-name>osg-display-settings</dialog-name>
</binding>
</item>
</menu>