livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flyout volume control now includes every channel. [FIRE-1633]

meow-7.2.2
WoLf 2011-07-11 04:34:48 +02:00
parent 8ffde36e43
commit b2fb6c9c0f
2 changed files with 277 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llstatusbar.cpp
View File

@ -576,7 +576,7 @@ void LLStatusBar::onMouseEnterVolume()
LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect();
volume_pulldown_rect.setLeftTopAndSize(
(vol_btn_rect.mLeft + media_panel_rect.mLeft) -
(volume_pulldown_rect.getWidth() - vol_btn_rect.getWidth())/2,
(volume_pulldown_rect.getWidth() - vol_btn_rect.getWidth()),
vol_btn_rect.mBottom,
volume_pulldown_rect.getWidth(),
volume_pulldown_rect.getHeight());

300
indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
View File

@ -8,31 +8,12 @@
border="false"
chrome="true"
follows="bottom"
height="150"
height="155"
layout="topleft"
name="volumepulldown_floater"
width="32">
<slider
control_name="AudioLevelMaster"
follows="left|top"
left="0"
top="1"
orientation="vertical"
height="120"
increment="0.05"
initial_value="0.5"
layout="topleft"
name="mastervolume"
show_text="false"
slider_label.halign="right"
top_pad="2"
volume="true">
<slider.commit_callback
function="Vol.setControlFalse"
parameter="MuteAudio" />
</slider>
<button
left="10"
width="210">
<button
left="187"
top_pad="9"
width="12"
height="12"
@ -44,5 +25,276 @@
scale_image="false">
<button.commit_callback
function="Vol.GoAudioPrefs" />
</button>
</button>
<slider
control_name="AudioLevelMaster"
follows="top|left"
font.style="BOLD"
height="15"
increment="0.025"
initial_value="0.5"
label="Master"
label_width="50"
left="10"
width="150"
layout="topleft"
name="System Volume"
show_text="false"
top="10"
volume="true">
<slider.commit_callback
function="Pref.setControlFalse"
parameter="MuteAudio" />
</slider>
<button
control_name="MuteAudio"
follows="top|left"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="5"
name="mute_audio"
tab_stop="false"
width="16" />
<slider
control_name="AudioLevelUI"
disabled_control="MuteAudio"
follows="left|top"
height="15"
increment="0.025"
initial_value="0.5"
label="Buttons"
label_width="50"
left="10"
width="150"
layout="topleft"
name="UI Volume"
show_text="false"
top_pad="4"
volume="true">
<slider.commit_callback
function="Pref.setControlFalse"
parameter="MuteUI" />
</slider>
<button
control_name="MuteUI"
disabled_control="MuteAudio"
follows="top|left"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="5"
name="mute_audio"
tab_stop="false"
width="16" />
<slider
control_name="AudioLevelAmbient"
disabled_control="MuteAudio"
follows="left|top"
height="15"
increment="0.025"
initial_value="0.5"
label="Ambient"
label_width="50"
left="10"
width="150"
layout="topleft"
name="Wind Volume"
show_text="false"
top_pad="4"
volume="true">
<slider.commit_callback
function="Pref.setControlFalse"
parameter="MuteAmbient" />
</slider>
<button
control_name="MuteAmbient"
disabled_control="MuteAudio"
follows="top|left"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="5"
name="mute_audio"
tab_stop="false"
width="16" />
<slider
control_name="AudioLevelSFX"
disabled_control="MuteAudio"
follows="left|top"
height="15"
increment="0.025"
initial_value="0.5"
label="Sounds"
label_width="50"
left="10"
width="150"
layout="topleft"
name="SFX Volume"
show_text="false"
top_pad="4"
volume="true">
<slider.commit_callback
function="Pref.setControlFalse"
parameter="MuteSounds" />
</slider>
<button
control_name="MuteSounds"
disabled_control="MuteAudio"
follows="top|left"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="5"
name="mute_audio"
tab_stop="false"
width="16">
<button.commit_callback
function="Pref.SetSounds"/>
</button>
<slider
control_name="AudioLevelMusic"
disabled_control="MuteAudio"
follows="left|top"
height="15"
increment="0.025"
initial_value="0.5"
label="Music"
label_width="50"
left="10"
width="150"
layout="topleft"
name="Music Volume"
show_text="false"
top_pad="4"
volume="true">
<slider.commit_callback
function="Pref.setControlFalse"
parameter="MuteMusic" />
</slider>
<button
control_name="MuteMusic"
disabled_control="MuteAudio"
follows="top|left"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="5"
name="mute_audio"
tab_stop="false"
width="16" />
<check_box
control_name="AudioStreamingMusic"
height="16"
tool_tip="Enable Streaming Music"
layout="topleft"
left_pad="5"
name="enable_music"
top_delta="2"
width="350">
<check_box.commit_callback
function="Pref.updateMediaAutoPlayCheckbox"/>
</check_box>
<slider
control_name="AudioLevelMedia"
disabled_control="MuteAudio"
follows="left|top"
height="16"
increment="0.025"
initial_value="0.5"
label="Media"
label_width="50"
left="10"
width="150"
layout="topleft"
name="Media Volume"
show_text="false"
top_pad="4"
volume="true">
<slider.commit_callback
function="Pref.setControlFalse"
parameter="MuteMedia" />
</slider>
<button
control_name="MuteMedia"
disabled_control="MuteAudio"
follows="top|left"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="5"
name="mute_audio"
tab_stop="false"
width="16" />
<check_box
label_text.halign="left"
follows="left|top"
height="16"
control_name ="AudioStreamingMedia"
tool_tip="Enable Streaming Media"
layout="topleft"
top_delta="2"
left_pad="5"
name="enable_media"
width="110">
<check_box.commit_callback
function="Pref.updateMediaAutoPlayCheckbox"/>
</check_box>
<slider
control_name="AudioLevelVoice"
disabled_control="MuteAudio"
follows="left|top"
height="16"
increment="0.025"
initial_value="0.5"
label="Voice"
label_width="50"
left="10"
width="150"
layout="topleft"
top_pad="4"
name="Voice Volume"
show_text="false"
volume="true">
<slider.commit_callback
function="Pref.setControlFalse"
parameter="MuteVoice" />
</slider>
<button
control_name="MuteVoice"
disabled_control="MuteAudio"
follows="top|left"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="5"
name="mute_audio"
tab_stop="false"
width="16" />
<check_box
label_text.halign="left"
follows="left|top"
height="16"
control_name ="EnableVoiceChat"
disabled_control="CmdLineDisableVoice"
tool_tip="Enable Voice Chat"
layout="topleft"
top_delta="2"
left_pad="5"
name="enable_voice_check"
width="110"/>
</panel>