From bba0f4f74e56d911df8fc534d83cd4a84993bc8b Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 31 May 2012 16:37:22 +0300
Subject: CHUI-119 WIP

---
 .../skins/default/xui/en/floater_chat_bar.xml      | 202 ---------------------
 .../skins/default/xui/en/floater_im_session.xml    | 119 +++++++++---
 .../default/xui/en/panel_adhoc_control_panel.xml   |  95 ----------
 .../default/xui/en/panel_group_control_panel.xml   |  60 ------
 .../skins/default/xui/en/panel_nearby_chat.xml     |  19 +-
 5 files changed, 100 insertions(+), 395 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_chat_bar.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_group_control_panel.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
deleted file mode 100644
index 7688525e13..0000000000
--- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- open_positioning="specified"
- specified_left="10"
- specified_bottom="10"
- background_visible="true"
- default_tab_group="1"
- height="355"
- help_topic="chat_bar"
- layout="topleft"
- name="chat_bar"
- can_dock="false"
- can_minimize="true"
- can_close="true"
- visible="false"
- width="394"
- can_resize="true"
- can_tear_off="false"
- min_width="250"
- min_height="80"
- single_instance="true"
- title="Nearby chat">
-    <floater.string name="call_btn_start">VoicePTT_Off</floater.string>
-    <floater.string name="call_btn_stop">VoicePTT_On</floater.string>
-    <floater.string
-     name="collapse_icon"
-     value="TabIcon_Open_Off"/>
-    <floater.string
-     name="expand_icon"
-     value="TabIcon_Close_Off"/>
-    <floater.string
-     name="tear_off_icon"
-     value="tearoffbox.tga"/>
-    <floater.string
-     name="return_icon"
-     value="Icon_Dock_Foreground"/>
-     <view
-        follows="all"
-        layout="topleft"
-        name="contents_view"
-        top="0"
-        left="0"
-        height="355"
-        width="394">
-      <panel
-         follows="left|top|right"
-         layout="topleft"
-         name="toolbar_panel"
-         top="0"
-         left="0"
-         height="35"
-         width="394">         
-             <menu_button
-                 menu_filename="menu_im_session_showmodes.xml"
-                 follows="top|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Left_Over"
-                 image_overlay="OptionsMenu_Off"
-                 image_selected="Toolbar_Left_Selected"
-                 image_unselected="Toolbar_Left_Off"
-                 layout="topleft"
-                 left="5"
-                 name="view_options_btn"
-                 top="5"
-                 width="31" />
-             <button
-                 follows="top|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="AddItem_Off"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_pad="4"
-                 name="add_btn"
-                 width="31">
-                 <commit_callback
-                    function="Chats.add" />
-             </button>   
-             <button
-                 follows="top|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Right_Over"
-                 image_overlay="VoicePTT_Off"
-                 image_selected="Toolbar_Right_Selected"
-                 image_unselected="Toolbar_Right_Off"
-                 layout="topleft"
-                 top="5"
-                 left_pad="4"
-                 name="voice_call_btn"
-                 width="31">
-                 <commit_callback
-                    function="Chats.add" />
-             </button>
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Icon_Close_Foreground"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left="283"
-                 name="close_btn"
-                 width="31">
-             </button>
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="TabIcon_Open_Off"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_pad="5"
-                 name="expand_collapse_btn"
-                 width="31">
-             </button>
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="tearoffbox.tga"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_pad="5"
-                 name="tear_off_btn"
-                 width="31">
-             </button>
-     </panel>
-    <panel
-        top="35"
-        left="0"
-        class="panel_nearby_chat"
-        follow="all"
-        width="390"
-        height="0"
-        visible="false"
-        filename="panel_nearby_chat.xml"
-        name="nearby_chat" />
-    <panel
-    	width="390"
-    	height="10"
-    	visible="true" />
-    <panel width="394" 
-           height="31" 
-           left="0" 
-           name="bottom_panel"
-           bottom="-1" 
-           follows="left|right|bottom" 
-           tab_group="1">
-      <line_editor
-        border_style="line"
-        border_thickness="1"
-        follows="left|right"
-        height="20"
-        label="Click here to chat."
-        layout="topleft"
-        left="1"
-        max_length_bytes="1023"
-        name="chat_box"
-        tool_tip="Press Enter to say, Ctrl+Enter to shout"
-        top="2"
-        width="384" />
-      <output_monitor
-        auto_update="true"
-        follows="right"
-        draw_border="false"
-        height="16"
-        layout="topleft"
-        left_pad="-24"
-        mouse_opaque="true"
-        name="chat_zone_indicator"
-        top="6"
-        visible="true"
-        width="20" />
-      <button
-        follows="right"
-        visible="false"
-        is_toggle="true"
-        width="20"
-        top="2"
-        layout="topleft"
-        left_pad="12"
-        image_disabled="ComboButton_UpOff"
-        image_unselected="ComboButton_UpOff"
-        image_selected="ComboButton_On"
-        image_pressed="ComboButton_UpSelected"
-        image_pressed_selected="ComboButton_Selected"
-        height="23"
-        chrome="true"
-        name="show_nearby_chat"
-        tool_tip="Shows/hides nearby chat log">
-      </button>
-    </panel>
-  </view>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index a332bb5b12..c5cacab9f4 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -138,18 +138,24 @@
   top_pad="0"
   left="0">
     <layout_panel
-      name="im_control_panel_holder"
+      name="speakers_list_panel"
       min_width="115"
       width="150" 
       height="310" 
       auto_resize="false">
-      <panel
-        name="panel_im_control_panel"
-        layout="topleft"
-        height="310"
-        width="150" 
-        follows="all"/>
-      </layout_panel>
+            <avatar_list
+             color="DkGray2"
+             follows="all"
+             height="100"
+             ignore_online_status="true"
+             layout="topleft"
+             name="speakers_list"
+             opaque="false"
+             show_info_btn="true"
+             show_profile_btn="false"
+             show_speaking_indicator="false"
+             width="145" />
+    </layout_panel>
     <layout_panel
        default_tab_group="3"
        left="0"
@@ -158,27 +164,82 @@
        height="200"
 	    width="254"
        user_resize="true">
-        <chat_history
-	     font="SansSerifSmall"
-         follows="all"
-         height="170"
-         name="chat_history"
-         parse_highlights="true"
-         parse_urls="true"
-         left="1"
-         width="249">
-        </chat_history>
-        <line_editor
-         bottom="0"
-         follows="left|right|bottom"
-	     font="SansSerifSmall"
-         height="20"
-         label="To"
-         layout="bottomleft"
-         name="chat_editor"
-         tab_group="3"
-         width="249">
-        </line_editor>
+         <layout_stack
+          animate="true" 
+          default_tab_group="2"
+          follows="all"
+          height="200"
+          width="254"
+          layout="topleft"
+          orientation="vertical"
+          name="chat_area"
+          tab_group="1"
+          left_pad="0"
+          top="0">
+            <layout_panel
+             auto_resize="false"
+             height="26"
+             layout="topleft"
+             left_delta="0"
+             name="translate_chat_checkbox_lp"
+             top_delta="0"
+             visible="true"
+             width="230">
+                <check_box
+                 top="10"
+                 control_name="TranslateChat"
+                 enabled="true"
+                 height="16"
+                 label="Translate chat"
+                 layout="topleft"
+                 left="5"
+                 name="translate_chat_checkbox"
+                 width="230" />
+            </layout_panel>
+            <layout_panel
+             auto_resize="false"
+             height="170"
+             layout="topleft"
+             left_delta="0"
+             name="translate_chat_checkbox_lp"
+             top_delta="0"
+             visible="true"
+             width="230">      
+           		<chat_history
+    	     		font="SansSerifSmall"
+             		follows="all"
+             		height="170"
+            	 	name="chat_history"
+             		parse_highlights="true"
+             		parse_urls="true"
+             		left="1"
+             		width="229">
+            	</chat_history>
+            	<line_editor
+             		bottom="0"
+             		follows="left|right|bottom"
+	         		font="SansSerifSmall"
+             		height="20"
+             		label="To"
+             		layout="bottomleft"
+             		name="chat_editor"
+             		tab_group="3"
+             		width="230">
+            	</line_editor>
+            	<output_monitor
+                 auto_update="true"
+                 follows="right"
+                 draw_border="false"
+                 height="16"
+                 layout="topleft"
+                 left_pad="-24"
+                 mouse_opaque="true"
+                 name="chat_zone_indicator"
+                 top="6"
+                 visible="true"
+                 width="20" />           	
+            </layout_panel>
+        </layout_stack>
     </layout_panel>
   </layout_stack>
     </view>
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
deleted file mode 100644
index d68fa6ca6c..0000000000
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- follows="all"
- height="215"
- name="panel_im_control_panel"
- width="150">
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="215"
-     layout="topleft"
-     left="3"
-     name="vertical_stack"
-     orientation="vertical"
-     top="0"
-     width="147">
-        <layout_panel
-         auto_resize="true"
-         follows="top|left"
-         height="130"
-         layout="topleft"
-         left="0"
-         min_height="0"
-         mouse_opaque="false"
-         width="147"
-         top="0"
-         name="speakers_list_panel">
-            <avatar_list
-             color="DkGray2"
-             follows="all"
-             height="130"
-             ignore_online_status="true"
-             layout="topleft"
-             name="speakers_list"
-             opaque="false"
-             show_info_btn="true"
-             show_profile_btn="false"
-             show_speaking_indicator="false"
-             width="147" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Call"
-             name="call_btn"
-             width="130"
-             top="0" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="end_call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Leave Call"
-             name="end_call_btn"
-             top="0"/>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Voice Controls"
-             name="voice_ctrls_btn"
-             top="0"
-             use_ellipses="true" />
-        </layout_panel>
-    </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
deleted file mode 100644
index a5295ebe01..0000000000
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- follows="all"
- height="238"
- name="panel_im_control_panel"
- width="150">
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="238"
-     layout="topleft"
-     left="5"
-     name="vertical_stack"
-     orientation="vertical"
-     top="0"
-     width="145">
-        <layout_panel
-         auto_resize="true"
-         follows="top|left"
-         height="100"
-         layout="topleft"
-         min_height="0"
-         mouse_opaque="false"
-         width="145"
-         top="0"
-         name="speakers_list_panel">
-            <avatar_list
-             color="DkGray2"
-             follows="all"
-             height="100"
-             ignore_online_status="true"
-             layout="topleft"
-             name="speakers_list"
-             opaque="false"
-             show_info_btn="true"
-             show_profile_btn="false"
-             show_speaking_indicator="false"
-             width="145" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="23"
-             label="Open Voice Controls"
-             name="voice_ctrls_btn"
-             use_ellipses="true" />
-        </layout_panel>
-    </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
index b415ba780d..4de56b424e 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
@@ -6,16 +6,17 @@
  help_topic="nearby_chat"
  layout="topleft"
  name="nearby_chat"
- width="394">
+ width="242"
+ height="169">
   <layout_stack
    follows="all"
-   height="278"
+   height="164"
    layout="topleft"
    left="0"
    name="stack"
    top="5"
    orientation="vertical"
-   width="394">
+   width="242">
     <layout_panel
      auto_resize="false"
      height="26"
@@ -24,7 +25,7 @@
      name="translate_chat_checkbox_lp"
      top_delta="0"
      visible="true"
-     width="387">
+     width="230">
       <check_box
        top="10"
        control_name="TranslateChat"
@@ -34,15 +35,15 @@
        layout="topleft"
        left="5"
        name="translate_chat_checkbox"
-       width="374" />
+       width="230" />
     </layout_panel>
     <layout_panel
      auto_resize="true"
-     height="256"
+     height="138"
      left_delta="0"
      layout="topleft"
      name="chat_history_lp"
-     width="394">
+     width="242">
       <chat_history
        bg_readonly_color="ChatHistoryBgColor"
        bg_writeable_color="ChatHistoryBgColor"
@@ -50,7 +51,7 @@
        layout="topleft"
        left="5"
        left_widget_pad="0"
-       height="240"
+       height="138"
        name="chat_history"
        parse_highlights="true"
        parse_urls="true"
@@ -58,7 +59,7 @@
        text_color="ChatHistoryTextColor"
        text_readonly_color="ChatHistoryTextColor"
        top="0"
-       width="384" />
+       width="237" />
     </layout_panel>
   </layout_stack>
 </panel>
-- 
cgit v1.2.3