diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
3 files changed, 192 insertions, 19 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index 5b77f11d71..216766c3a6 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -3,7 +3,7 @@ can_resize="true" can_minimize="true" can_close="false" - height="202" + height="205" layout="topleft" min_height="124" min_width="190" @@ -50,7 +50,7 @@ user_resize="false" auto_resize="false" layout="topleft" - height="26" + height="20" name="my_panel"> <avatar_icon enabled="false" @@ -86,23 +86,38 @@ visible="true" width="20" /> </layout_panel> - <layout_panel - auto_resize="false" - user_resize="false" - follows="top|left" - height="26" - visible="true" - layout="topleft" - name="leave_call_btn_panel" - width="100"> - <button - follows="right|top" - height="23" - top_pad="0" - label="Leave Call" - name="leave_call_btn" - width="100" /> - </layout_panel> + <layout_stack + clip="true" + auto_resize="false" + follows="left|top|right" + height="26" + layout="topleft" + mouse_opaque="false" + name="voice_effect_and_leave_call_stack" + orientation="horizontal" + width="262"> + <panel + class="panel_voice_effect" + name="panel_voice_effect" + visiblity_control="VoiceEffectEnabled" + filename="panel_voice_effect.xml" /> + <layout_panel + auto_resize="false" + user_resize="false" + follows="top|right" + height="23" + visible="true" + layout="topleft" + name="leave_call_btn_panel" + width="100"> + <button + follows="right|top" + height="23" + label="Leave Call" + name="leave_call_btn" + width="100" /> + </layout_panel> + </layout_stack> <layout_panel follows="all" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml new file mode 100644 index 0000000000..5627eb3aff --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="465" + name="voice_effects" + help_topic="voice_effects" + title="VOICE EFFECTS" + background_visible="true" + follows="all" + label="Places" + layout="topleft" + min_height="350" + min_width="240" + width="313"> + <string name="no_voice_effect"> + No Voice Effect + </string> + <scroll_list + bottom_delta="400" + draw_heading="true" + follows="all" + layout="topleft" + left="0" + multi_select="false" + top="20" + name="voice_effect_list"> + <scroll_list.columns + label="New" + name="new" + width="48" /> + <scroll_list.columns + label="Name" + name="name" + width="153" /> + <scroll_list.columns + label="Expires" + name="expires" + width="100" /> + <scroll_list.columns + label="" + name="key" + width="-1" /> + </scroll_list> + <panel + background_visible="true" + bevel_style="none" + top_pad="0" + follows="left|right|bottom" + height="30" + label="bottom_panel" + layout="topleft" + left="0" + name="bottom_panel" + width="313"> +<!-- + <button + follows="bottom|left" + font="SansSerifBigBold" + height="10" + image_hover_selected="Activate_Checkmark" + image_selected="Activate_Checkmark" + image_unselected="Activate_Checkmark" + layout="topleft" + left="10" + name="activate_btn" + tool_tip="Activate/Deactivate selected voice effect" + top="10" + width="10" + <button.commit_callback + function="VoiceEffect.Activate" /> + </button> +--> + </panel> + <button + follows="left|bottom" + height="23" + label="Record" + layout="topleft" + left="6" + name="record_btn" + top_pad="5" + width="83"> + <button.commit_callback + function="VoiceEffect.Record" /> + </button> + <button + follows="left|bottom" + height="23" + label="Stop" + layout="topleft" + left_delta="0" + name="record_stop_btn" + top_delta="0" + width="83"> + <button.commit_callback + function="VoiceEffect.Record" /> + </button> + <button + follows="left|bottom" + height="23" + label="Play" + layout="topleft" + left_pad="6" + name="play_btn" + top_delta="0" + width="83"> + <button.commit_callback + function="VoiceEffect.Play" /> + </button> + <button + follows="left|bottom" + height="23" + label="Stop" + layout="topleft" + left_delta="0" + name="play_stop_btn" + top_delta="0" + width="83"> + <button.commit_callback + function="VoiceEffect.Play" /> + </button> +</floater> diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml new file mode 100644 index 0000000000..dac2f5ebed --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="all" + height="26" + layout="topleft" + name="panel_voice_effect" + width="200"> + <string name="no_voice_effect"> + No Voice Effect + </string> + <string name="get_voice_effects_url"> + https://secondlife.com/my/account/voice.php + </string> + <string name="get_voice_effects"> + Add voice effects ▶ + </string> + <string name="preview_voice_effects"> + Preview ▶ + </string> + <combo_box + enabled="false" + follows="left|top|right" + height="23" + name="voice_effect" + top_pad="0" + width="200"> + <combo_box.item + label="No Voice Effect" + name="no_voice_effect" + top_pad="0" + value="0" /> + <combo_box.commit_callback + function="Voice.CommitVoiceEffect" /> + </combo_box> +</panel> |