1
0
Fork 0

Updated sound dialog, improving layout.

This commit is contained in:
stuart 2009-12-13 18:06:54 +00:00
parent f72f1b3cd6
commit cab075f86b

View file

@ -14,196 +14,208 @@
<hrule/> <hrule/>
<text>
<halign>fill</halign>
<label>Sound Device:</label>
</text>
<combo>
<name>source-selection</name>
<halign>fill</halign>
<stretch>true</stretch>
<property>sim/gui/dialogs/sound-dialog/source-selection</property>
<binding>
<command>dialog-apply</command>
<object-name>source-selection</object-name>
</binding>
<binding>
<command>dialog-update</command>
<object-name>metar</object-name>
</binding>
</combo>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>left</halign> <text>
<halign>right</halign>
<label>Sound Device:</label>
</text>
<empty><width>10</width></empty> <combo>
<name>source-selection</name>
<group> <halign>fill</halign>
<layout>hbox</layout> <stretch>true</stretch>
<property>sim/gui/dialogs/sound-dialog/source-selection</property>
<text> <binding>
<label>Enabled</label> <command>dialog-apply</command>
</text> <object-name>source-selection</object-name>
</binding>
<text> <binding>
<label>Volume</label> <command>dialog-update</command>
</text> <object-name>sound-dialog</object-name>
</group> </binding>
</combo>
</group> </group>
<hrule/>
<group> <group>
<layout>hbox</layout> <layout>table</layout>
<halign>left</halign> <halign>center</halign>
<empty><width>10</width></empty> <text>
<row>0</row>
<col>0</col>
<label>Channel</label>
<padding>10</padding>
</text>
<text>
<row>0</row>
<col>1</col>
<label>Enabled</label>
<padding>10</padding>
</text>
<group> <text>
<layout>hbox</layout> <row>0</row>
<col>2</col>
<label>Volume</label>
<padding>10</padding>
</text>
<checkbox> <text>
<property>/sim/sound/enabled</property> <row>0</row>
<label>Master</label> <col>3</col>
<binding> <label>External</label>
<command>dialog-apply</command> <padding>10</padding>
</binding> </text>
</checkbox>
<slider> <text>
<height>25</height> <row>1</row>
<property>/sim/sound/volume</property> <col>0</col>
<binding> <label>Master</label>
<command>dialog-apply</command> <halign>left</halign>
</binding> </text>
</slider>
</group> <checkbox>
<row>1</row>
<col>1</col>
<property>/sim/sound/enabled</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<slider>
<row>1</row>
<col>2</col>
<property>/sim/sound/volume</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<row>2</row>
<col>0</col>
<label>Effects</label>
<halign>left</halign>
</text>
<checkbox>
<row>2</row>
<col>1</col>
<property>/sim/sound/effects/enabled</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<slider>
<row>2</row>
<col>2</col>
<property>/sim/sound/effects/volume</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<row>3</row>
<col>0</col>
<label>Chatter</label>
<halign>left</halign>
</text>
<checkbox>
<row>3</row>
<col>1</col>
<property>/sim/sound/chatter/enabled</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<slider>
<row>3</row>
<col>2</col>
<property>/sim/sound/chatter/volume</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<row>4</row>
<col>0</col>
<label>Avionics</label>
<halign>left</halign>
</text>
<checkbox>
<row>4</row>
<col>1</col>
<property>/sim/sound/avionics/enabled</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<slider>
<row>4</row>
<col>2</col>
<property>/sim/sound/avionics/volume</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<checkbox>
<row>4</row>
<col>3</col>
<property>/sim/sound/avionics/external-view</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<text>
<row>5</row>
<col>0</col>
<label>ATC</label>
<halign>left</halign>
</text>
<checkbox>
<row>5</row>
<col>1</col>
<property>/sim/sound/atc/enabled</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<slider>
<row>5</row>
<col>2</col>
<property>/sim/sound/atc/volume</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<checkbox>
<row>5</row>
<col>3</col>
<property>/sim/sound/atc/external-view</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group> </group>
<group> <hrule/>
<layout>hbox</layout>
<halign>left</halign>
<empty><width>10</width></empty>
<group>
<layout>hbox</layout>
<checkbox>
<property>/sim/sound/effects/enabled</property>
<label>Effects</label>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<slider>
<height>25</height>
<property>/sim/sound/effects/volume</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
</group>
</group>
<group>
<layout>hbox</layout>
<halign>left</halign>
<empty><width>10</width></empty>
<group>
<layout>hbox</layout>
<checkbox>
<property>/sim/sound/chatter/enabled</property>
<label>Chatter</label>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<slider>
<height>25</height>
<property>/sim/sound/chatter/volume</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
</group>
</group>
<group>
<layout>hbox</layout>
<halign>left</halign>
<empty><width>10</width></empty>
<group>
<layout>hbox</layout>
<checkbox>
<property>/sim/sound/avionics/enabled</property>
<label>Avionics</label>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<slider>
<height>25</height>
<property>/sim/sound/avionics/volume</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<checkbox>
<property>/sim/sound/avionics/external-view</property>
<label>External View</label>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
</group>
<group>
<layout>hbox</layout>
<halign>left</halign>
<empty><width>10</width></empty>
<group>
<layout>hbox</layout>
<checkbox>
<width>300</width>
<property>/sim/sound/atc/enabled</property>
<label>ATC</label>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<slider>
<height>25</height>
<property>/sim/sound/atc/volume</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<checkbox>
<property>/sim/sound/atc/external-view</property>
<label>External View</label>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
</group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
@ -246,7 +258,7 @@
return nil; return nil;
}; };
# fill the sounde device combo box # Fill the sound device combo box
var combo = findElementByName( dlg_root, "source-selection" ); var combo = findElementByName( dlg_root, "source-selection" );
var wsn = props.globals.getNode( "sim/sound/devices" ); var wsn = props.globals.getNode( "sim/sound/devices" );
if( wsn != nil ) { if( wsn != nil ) {