Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Did some more chopping, added value boxes for volume controls that can be set, also made sure that the sliders stayed the same happy size.

Browse Source
This commit is contained in:
Lirusaito
2012-01-26 23:25:51 -05:00
parent 8e4ea7e3b4
commit 8c35361878
2 changed files with 29 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
indra/newview/skins/default/xui/en-us/panel_audio.xml
View File

@@ -1,60 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="false" follows="left|top|right|bottom" height="160"
label="Audio &amp; Video" name="Media panel" width="175">
<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Master"
label_width="55" left="10" max_val="1" min_val="0" mouse_opaque="true"
name="System Volume" show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_audio" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Music"
label_width="55" left="10" max_val="1" min_val="0" name="Music Volume"
show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_music" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Media"
label_width="55" left="10" max_val="1" min_val="0" name="Media Volume"
show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_media" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Voice"
label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume"
show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_voice" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Sounds"
label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume"
show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Ambient"
label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume"
show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55"
left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
volume="true" width="180" />
<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_ui" tab_stop="false" toggle="true" width="25" />
<panel border="false" height="160" label="Audio &amp; Video" name="Media panel" width="175">
<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="top" height="15" increment="0.05" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_audio" toggle="true" width="25"/>
<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.05" initial_val="0.5" label="Music" label_width="55" left="10" max_val="1" min_val="0" name="Music Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_music" toggle="true" width="25"/>
<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="top" height="15" increment="0.05" initial_val="0.5" label="Media" label_width="55" left="10" max_val="1" min_val="0" name="Media Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_media" toggle="true" width="25"/>
<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="top" height="15" increment="0.05" initial_val="0.5" label="Voice" label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_voice" tab_stop="false" toggle="true" width="25"/>
<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="top" height="15" increment="0.05" initial_val="0.5" label="Sounds" label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25"/>
<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="top" height="15" increment="0.05" initial_val="0.5" label="Ambient" label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_wind" toggle="true" width="25"/>
<slider bottom_delta="-20" control_name="AudioLevelUI" follows="top" height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_ui" toggle="true" width="25"/>
</panel>

82
indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
View File

@@ -1,70 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
height="408" label="Audio &amp; Video" left="102" mouse_opaque="true"
name="Media panel" width="517">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
mouse_opaque="true" name="muting_text" v_pad="0" width="128">
Volume:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
Streaming Preferences:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
Audio Preferences:
</text>
<panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
follows="left|top|right|bottom" height="180" label="Volume" left="148"
mouse_opaque="true" name="Volume Panel" width="260" />
<check_box bottom="-220" control_name="AudioStreamingMusic" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play Streaming Music When Available (uses more bandwidth)"
left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
width="339" />
<check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play Streaming Media When Available (uses more bandwidth)"
left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
width="338" />
<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Automatically play media" left="162"
mouse_opaque="true" name="auto_streaming_video" radio_style="false"
width="338" />
<check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Ask for permission (enables filtering)"
left="162" mouse_opaque="true" name="streaming_video" radio_style="false"
width="338" />
<check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Mute Audio When Window Minimized" left="142" mouse_opaque="true"
name="mute_when_minimized" radio_style="false" width="215" />
<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true"
enabled="true" follows="left|top" height="15" increment="0.1"
initial_val="1" label="Doppler Effect" label_width="100" left="148"
max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
show_text="true" width="250" />
<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
enabled="true" follows="left|top" height="15" increment="0.1"
initial_val="1" label="Rolloff Factor" label_width="100" left="148"
max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
show_text="true" width="250" />
<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
enabled="true" follows="left|top" height="16" increment="10"
initial_val="10" label="[CURRENCY] change threshold:" label_width="128" left="148"
max_val="10000" min_val="0" mouse_opaque="true" name="currency_change_threshold"
width="192" />
<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
decimal_digits="0" enabled="true" follows="left|top" height="16"
increment="10" initial_val="20" label="Health Change Threshold"
label_width="128" left="148" max_val="10000" min_val="0"
mouse_opaque="true" name="Health Change Threshold" width="192" />
<panel border="true" bottom="-409" height="408" label="Audio &amp; Video" left="102" name="Media panel" width="517">
<text bottom="-22" height="12" left="10" name="muting_text">Volume:</text>
<text bottom="-215" name="streaming_prefs_text">Streaming Preferences:</text>
<text bottom="-300" height="12" name="audio_prefs_text">Audio Preferences:</text>
<panel border="true" bottom="-195" filename="panel_audio.xml" height="180" label="Volume" left="148" name="Volume Panel" width="260"/>
<check_box bottom="-220" control_name="AudioStreamingMusic" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" left="142" name="streaming_music"/>
<check_box bottom_delta="-20" control_name="AudioStreamingVideo" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>
<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" name="streaming_video"/>
<check_box bottom_delta="-25" control_name="MuteWhenMinimized" follows="top" height="16" initial_value="true" label="Mute Audio When Window Minimized" left="142" name="mute_when_minimized"/>
<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Doppler Effect" label_width="100" left="148" max_val="2" min_val="0" name="Doppler Effect" show_text="true" width="250" />
<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Rolloff Factor" label_width="100" max_val="2" min_val="0" name="Rolloff Factor" width="250"/>
<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="10" label="[CURRENCY] change threshold:" label_width="128" max_val="10000" min_val="0" name="currency_change_threshold" width="192"/>
<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="20" label="Health Change Threshold" label_width="128" max_val="10000" min_val="0" name="Health Change Threshold" width="192" />
</panel>