From f42062aaacf7819333a141cdaf9c9aa6fdee1bf3 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Fri, 18 Jun 2010 16:15:49 +0100
Subject: EXT-7933 FIXED Slim down the Voice Morph preview floater

---
 .../default/xui/en/floater_voice_controls.xml      |  6 +--
 .../skins/default/xui/en/floater_voice_effect.xml  | 60 +++++++++++++---------
 .../skins/default/xui/en/panel_voice_effect.xml    |  6 +--
 3 files changed, 43 insertions(+), 29 deletions(-)

(limited to 'indra/newview/skins')

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 0569b4d515..bf5bd87ad6 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -47,8 +47,8 @@
          width="263">
         <layout_panel
          follows="top|left|right"
-          user_resize="false" 
-         auto_resize="false" 
+         user_resize="false"
+         auto_resize="false"
          layout="topleft"
          height="20"
          name="my_panel">
@@ -123,7 +123,7 @@
           layout="topleft"
           left="2"
           top_pad="0"
-          height="132" 
+          height="132"
           name="callers_panel"
           user_resize="false" 
           width="280">
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 edc25348e4..44ab15a3f2 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
+ legacy_header_height="27"
  can_resize="true"
- height="420"
+ height="500"
  name="voice_effects"
  help_topic="voice_effects"
- title="PREVIEW VOICE MORPHING"
+ title="VOICE MORPHING"
  background_visible="true"
  follows="all"
  label="Places"
  layout="topleft"
- min_height="350"
- min_width="330"
- width="455">
+ min_height="360"
+ min_width="200"
+ width="300">
   <string name="no_voice_effect">
     (No Voice Morph)
   </string>
@@ -25,31 +25,43 @@
   <string name="new_voice_effect">
     (New!)
   </string>
-  <text
-   height="68"
+ <text
+   height="16"
    word_wrap="true"
    use_ellipses="true"
    type="string"
    follows="left|top|right"
    layout="topleft"
+   font="SansSerifBold"
+   color="White"
    left="10"
    name="status_text"
    right="-10"
-   top="25">
-To preview any of the Voice Morphing effects, click the Record button to record a short snippet of voice, then click any Voice Morph in the list to hear how it will sound.
-
-To reconnect to Nearby Voice simply close this window.
+   top="27">To Preview
+   </text>
+  <text
+   height="23"
+   word_wrap="true"
+   use_ellipses="true"
+   type="string"
+   follows="left|top|right"
+   layout="topleft"
+   left="10"
+   name="status_text"
+   right="-5"
+   top_pad="0">
+Record a sample, then click on a voice to hear how it will sound.
   </text>
   <button
    follows="left|top"
    height="23"
-   label="Record Sample"
+   label="Record"
    layout="topleft"
    left="10"
    name="record_btn"
    tool_tip="Record a sample of your voice."
    top_pad="5"
-   width="150">
+   width="100">
     <button.commit_callback
      function="VoiceEffect.Record" />
   </button>
@@ -61,22 +73,22 @@ To reconnect to Nearby Voice simply close this window.
    left_delta="0"
    name="record_stop_btn"
    top_delta="0"
-   width="150">
+   width="100">
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
   <text
-   height="18"
+   height="23"
    halign="right"
    use_ellipses="true"
    type="string"
    follows="left|top|right"
    layout="topleft"
    left_pad="10"
+   top_delta="10"
    name="voice_morphing_link"
-   right="-10"
-   top_delta="5">
-    [[URL] Get Voice Morphing]
+   right="-10">
+    [[URL] Subscribe Now]
   </text>
   <scroll_list
    bottom="-10"
@@ -88,14 +100,16 @@ To reconnect to Nearby Voice simply close this window.
    name="voice_effect_list"
    right="-10"
    tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="128">
+   top="95">
     <scroll_list.columns
-     label="Voice Morph"
-     name="name" relative_width="0.41"/>
+     label="Voice Name"
+     name="name"
+     relative_width="0.60" />
     <scroll_list.columns
      dynamic_width="true"
      label="Expires"
      name="expires"
-	 relative_width="0.59" />
+     relative_width="0.30" />
   </scroll_list>
+
 </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
index c575ca468c..93e79b7328 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -6,7 +6,7 @@
  name="panel_voice_effect"
  width="200">
   <string name="no_voice_effect">
-    No Voice Morph
+    Voice Morphing Off
   </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
@@ -19,11 +19,11 @@
    follows="left|top|right"
    height="23"
    name="voice_effect"
-   tool_tip="Select a Voice Morphing effect to change your voice."
+   tool_tip="Select a Voice Morph to change your voice"
    top_pad="0"
    width="200">
     <combo_box.item
-     label="No Voice Morph"
+     label="Voice Morphing Off"
      name="no_voice_effect"
 	 top_pad="0"
      value="0" />
-- 
cgit v1.2.3