From cf34437506cabdc54466cdf5010979a61a99154b Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 21:29:09 +0100
Subject: EXT-7337 WIP Rearrange controls in the voice morphing preview. Added
 link to marketing page.

---
 indra/newview/llfloatervoiceeffect.cpp             |   2 +-
 .../skins/default/xui/en/floater_voice_effect.xml  | 141 +++++++--------------
 2 files changed, 47 insertions(+), 96 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index bd469a85da..9529f947c1 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -66,7 +66,7 @@ BOOL LLFloaterVoiceEffect::postBuild()
 {
 	setDefaultBtn("record_btn");
 	getChild<LLButton>("record_btn")->setFocus(true);
-
+	childSetTextArg("voice_morphing_link", "[URL]", LLTrans::getString("voice_morphing_url"));
 
 	mVoiceEffectList = getChild<LLScrollListCtrl>("voice_effect_list");
 	if (mVoiceEffectList)
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 7335488e73..73e4a694eb 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="415"
+ height="400"
  name="voice_effects"
  help_topic="voice_effects"
  title="PREVIEW VOICE MORPHING"
@@ -12,7 +12,7 @@
  layout="topleft"
  min_height="350"
  min_width="240"
- width="313">
+ width="300">
   <string name="no_voice_effect">
     (No Voice Effect)
   </string>
@@ -22,111 +22,25 @@
   <string name="new_voice_effect">
     New!
   </string>
-  <scroll_list
-   bottom_delta="300"
-   draw_heading="true"
-   follows="all"
-   layout="topleft"
-   left="0"
-   multi_select="false"
-   tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="20"
-   name="voice_effect_list">
-    <scroll_list.columns
-     label="Name"
-     name="name"
-     width="153" />
-    <scroll_list.columns
-     label="New"
-     name="new"
-     width="64" />
-    <scroll_list.columns
-     label="Expires"
-     name="expires"
-     width="100" />
-  </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">
-<!--
-    <menu_button
-     follows="bottom|left"
-     height="18"
-     image_disabled="OptionsMenu_Disabled"
-     image_selected="OptionsMenu_Press"
-     image_unselected="OptionsMenu_Off"
-     layout="topleft"
-     left="10"
-     menu_filename="menu_voice_effect_gear.xml"
-     name="gear_btn"
-     top="5"
-     tool_tip="More options"
-     width="18" />
--->
-    <button
-     follows="bottom|left"
-     font="SansSerifBigBold"
-     height="18"
-     image_selected="AddItem_Press"
-     image_unselected="AddItem_Off"
-     image_disabled="AddItem_Disabled"
-     layout="topleft"
-     left="10"
-     name="add_voice_effect_btn"
-     tool_tip="Get more voice effects"
-     top="5"
-     width="18">
-      <button.commit_callback
-       function="VoiceEffect.Add" />
-    </button>
-<!--
-    <button
-     follows="bottom|left"
-     font="SansSerifBigBold"
-     height="10"
-     image_hover_selected="Activate_Checkmark"
-     image_selected="Activate_Checkmark"
-     image_unselected="Activate_Checkmark"
-     layout="topleft"
-     left_pad="5"
-     name="activate_btn"
-     tool_tip="Activate/Deactivate selected voice effect"
-     top="10"
-     width="10">
-      <button.commit_callback
-       function="VoiceEffect.Activate" />
-    </button>
--->
-  </panel>
   <text
    height="40"
    word_wrap="true"
    use_ellipses="true"
    type="string"
-   text_color="LabelSelectedDisabledColor"
-   length="1"
-   follows="left|bottom|right"
+   follows="left|top|right"
    layout="topleft"
-   left="6"
+   left="10"
    name="status_text"
-   top_pad="10"
-   width="300">
+   right="-10"
+   top="25">
     Record a sample of your voice, and then select an effect to preview. Close this window to return to in-world voice.
   </text>
   <button
-   follows="left|bottom"
+   follows="left|top"
    height="23"
    label="Record Sample"
    layout="topleft"
-   left="6"
+   left="5"
    name="record_btn"
    tool_tip="Record a sample of your voice."
    top_pad="5"
@@ -135,7 +49,7 @@
      function="VoiceEffect.Record" />
   </button>
   <button
-   follows="left|bottom"
+   follows="left|top"
    height="23"
    label="Stop"
    layout="topleft"
@@ -146,4 +60,41 @@
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
+  <scroll_list
+   bottom_delta="280"
+   draw_heading="true"
+   follows="all"
+   layout="topleft"
+   left_delta="0"
+   multi_select="false"
+   name="voice_effect_list"
+   right="-5"
+   tool_tip="Record a sample of your voice, then click an effect to preview."
+   top="100">
+    <scroll_list.columns
+     label="Name"
+     name="name"
+     width="120" />
+    <scroll_list.columns
+     label="New"
+     name="new"
+     width="60" />
+    <scroll_list.columns
+     label="Expires"
+     name="expires"
+     width="110" />
+  </scroll_list>
+  <text
+   height="20"
+   word_wrap="true"
+   use_ellipses="true"
+   type="string"
+   follows="left|bottom|right"
+   layout="topleft"
+   left="10"
+   name="voice_morphing_link"
+   right="-10"
+   top_pad="5">
+    [[URL] Get Voice Morphing]
+  </text>
 </floater>
-- 
cgit v1.2.3