From 9f9b240dcee53a50b56a0ccb8d255a86d0ce62c9 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 6 Apr 2010 11:39:01 +0100
Subject: Added voice font selection to the voice floater.

---
 .../default/xui/en/floater_voice_controls.xml      | 38 +++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(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 c4411db8c5..100a060557 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -33,6 +33,9 @@
      name="no_one_near">
         No one near has voice enabled
     </string>
+    <floater.string name="no_voice_font">
+        No Voice Effect
+    </floater.string>
       <layout_stack
          clip="false"
          follows="all"
@@ -84,7 +87,39 @@
              visible="true"
              width="20" />
         </layout_panel>
-         <layout_panel
+        <layout_stack
+         clip="false"
+         auto_resize="false"
+         follows="left|right"
+         height="23"
+         layout="topleft"
+         left="10"
+         mouse_opaque="false"
+         name="voice_font_and_leave_call_stack"
+         orientation="horizontal"
+         width="263">
+          <layout_panel
+           auto_resize="false"
+           user_resize="false"
+           follows="top|left"
+           height="26"
+           visible="true"
+           layout="topleft"
+           name="voice_font_panel"
+           width="120">
+            <combo_box
+             follows="left|top"
+             height="23"
+             name="voice_font"
+             top_pad="0"
+             width="120">
+              <combo_box.item
+                label="No Voice Effect"
+                name="no_voice_font"
+                value="0" />
+            </combo_box>
+          </layout_panel>
+        <layout_panel
           auto_resize="false"
           user_resize="false" 
           follows="top|left"
@@ -101,6 +136,7 @@
             name="leave_call_btn"
             width="100" />
          </layout_panel>
+      </layout_stack>
       <layout_panel
           follows="all"
           layout="topleft"
-- 
cgit v1.2.3


From cacfa18643092547e7665b36d482ad9c8c5dfc54 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 28 Apr 2010 03:33:15 +0100
Subject: Persist Voice Font selection.

Added 'VoiceFontDefault' saved setting.
Implemented LLVoiceClientFontsObserver to update the UI when the voice font list is received.
Renamed LLVoiceClientParticipantObserver::onChange() to onParticipantsChanged to avoid ambiguity and make the code more readable.
Made the Voice Font combo in the VCP auto resize to make best use of the available space when the 'Leave Call button is not visible.
---
 .../newview/skins/default/xui/en/floater_voice_controls.xml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 e7c5770a08..885c8304eb 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -101,20 +101,20 @@
          orientation="horizontal"
          width="263">
           <layout_panel
-           auto_resize="false"
+           auto_resize="true"
            user_resize="false"
            follows="top|left"
            height="26"
            visible="true"
            layout="topleft"
            name="voice_font_panel"
-           width="120">
+           width="150">
             <combo_box
-             follows="left|top"
+             follows="left|top|right"
              height="23"
              name="voice_font"
              top_pad="0"
-             width="120">
+             width="150">
               <combo_box.item
                 label="No Voice Effect"
                 name="no_voice_font"
@@ -124,14 +124,14 @@
         <layout_panel
           auto_resize="false"
           user_resize="false" 
-          follows="top|left"
+          follows="top|right"
           height="26"
           visible="true"
           layout="topleft"
           name="leave_call_btn_panel"
           width="100">
            <button
-          follows="right|top"
+            follows="right|top"
             height="23"
             top_pad="0"
             label="Leave Call"
-- 
cgit v1.2.3


From 46897efc3efade25feaaa1dc67bc131c35202d12 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 29 Apr 2010 02:37:07 +0100
Subject: Make a proper XUI commit_callback for the Voice Font combo

---
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 885c8304eb..44840a82d0 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -110,15 +110,18 @@
            name="voice_font_panel"
            width="150">
             <combo_box
+             enabled="false"
              follows="left|top|right"
              height="23"
              name="voice_font"
              top_pad="0"
              width="150">
               <combo_box.item
-                label="No Voice Effect"
-                name="no_voice_font"
-                value="0" />
+               label="No Voice Effect"
+               name="no_voice_font"
+               value="0" />
+              <combo_box.commit_callback
+               function="Voice.CommitVoiceFont" />
             </combo_box>
           </layout_panel>
         <layout_panel
-- 
cgit v1.2.3


From 93a93dfc92d5339a70f6174ae74b96fc4cb2813f Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 29 Apr 2010 13:42:34 +0100
Subject: Added VoiceFontUI setting for SLE

---
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 44840a82d0..ce81a39fe0 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -105,7 +105,7 @@
            user_resize="false"
            follows="top|left"
            height="26"
-           visible="true"
+           visiblity_control="VoiceFontUI"
            layout="topleft"
            name="voice_font_panel"
            width="150">
-- 
cgit v1.2.3


From 29c2e7ebeca288b051d4851d148b1f82a06d24ef Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 29 Apr 2010 13:47:50 +0100
Subject: Clip the layout_stack so that the "Leave Call" button isn't seen
 flying in and out of the floater!

---
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 ce81a39fe0..370bc05c28 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -90,9 +90,9 @@
              width="20" />
         </layout_panel>
         <layout_stack
-         clip="false"
+         clip="true"
          auto_resize="false"
-         follows="left|right"
+         follows="left|top|right"
          height="23"
          layout="topleft"
          left="10"
-- 
cgit v1.2.3


From 7a6474129c6015e102b30570fa474ba48e4c85e0 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Fri, 30 Apr 2010 19:38:52 +0100
Subject: Move the Voice Font control from LLCallFloater to its own panel so
 that it can be reused.

---
 .../default/xui/en/floater_voice_controls.xml      | 66 +++++++---------------
 1 file changed, 21 insertions(+), 45 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 370bc05c28..83380577ca 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"
@@ -35,9 +35,6 @@
      name="no_one_near">
         No one near has voice enabled
     </string>
-    <floater.string name="no_voice_font">
-        No Voice Effect
-    </floater.string>
       <layout_stack
          clip="false"
          follows="all"
@@ -53,7 +50,7 @@
           user_resize="false" 
          auto_resize="false" 
          layout="topleft"
-         height="26"
+         height="20"
          name="my_panel">
             <avatar_icon
              enabled="false"
@@ -93,55 +90,34 @@
          clip="true"
          auto_resize="false"
          follows="left|top|right"
-         height="23"
+         height="26"
          layout="topleft"
-         left="10"
          mouse_opaque="false"
          name="voice_font_and_leave_call_stack"
          orientation="horizontal"
-         width="263">
+         width="262">
+          <panel
+           class="panel_voice_font"
+           name="panel_voice_font"
+           visiblity_control="VoiceFontUI"
+           filename="panel_voice_font.xml" />
           <layout_panel
-           auto_resize="true"
+           auto_resize="false"
            user_resize="false"
-           follows="top|left"
-           height="26"
-           visiblity_control="VoiceFontUI"
+           follows="top|right"
+           height="23"
+           visible="true"
            layout="topleft"
-           name="voice_font_panel"
-           width="150">
-            <combo_box
-             enabled="false"
-             follows="left|top|right"
+           name="leave_call_btn_panel"
+           width="100">
+            <button
+             follows="right|top"
              height="23"
-             name="voice_font"
-             top_pad="0"
-             width="150">
-              <combo_box.item
-               label="No Voice Effect"
-               name="no_voice_font"
-               value="0" />
-              <combo_box.commit_callback
-               function="Voice.CommitVoiceFont" />
-            </combo_box>
+             label="Leave Call"
+             name="leave_call_btn"
+             width="100" />
           </layout_panel>
-        <layout_panel
-          auto_resize="false"
-          user_resize="false" 
-          follows="top|right"
-          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>
+        </layout_stack>
       <layout_panel
           follows="all"
           layout="topleft"
-- 
cgit v1.2.3


From f3df31078c48c5a98ce47bf04a14a1938da3bdc8 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 13 May 2010 15:09:51 +0100
Subject: EXT-7138 Forgot to rename panel_voice_font.xml to
 panel_voice_effect.xml oops!

---
 .../skins/default/xui/en/panel_voice_effect.xml    | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_voice_effect.xml

(limited to 'indra/newview/skins')

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>
-- 
cgit v1.2.3


From 24c55c9a689aaf7c8c961a5eb4aab5283b0fb1fa Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 18 May 2010 14:16:25 +0100
Subject: EXT-7337 WIP Implemented prototype voice font preview floater.

---
 .../skins/default/xui/en/floater_voice_effect.xml  | 123 +++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_voice_effect.xml

(limited to 'indra/newview/skins')

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>
-- 
cgit v1.2.3