From be06bebffcc1a08c3018ab3712048599455e025b Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Mon, 10 Sep 2012 20:12:27 +0300
Subject: CHUI-282 WIP Modified conversation view item and IM floater container
 so that the folder view handles the positioning of items in conversations
 list.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..d1f25b45fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="left|top|right"
+ height="24"
+ layout="topleft"
+ mouse_opaque="flase"
+ name="conversation_list_item"
+ width="120">
+    <avatar_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Person"
+     layout="topleft"
+     left="5"
+     mouse_opaque="true"
+     top="2"
+     width="20" />
+    <layout_stack
+     animate="false"
+     follows="all"
+     height="24"
+     layout="topleft"
+     left_pad="5"
+     name="caonversation_item_stack"
+     orientation="horizontal"
+     top="0"
+     width="90">
+        <layout_panel
+         auto_resize="false"
+         user_resize="false"        
+         height="24"
+         name="call_icon_panel"
+         visible="false"
+         width="20">
+            <icon
+             height="20"
+             follows="top|right|left"
+             image_name="Conv_toolbar_hang_up"
+             layout="topleft"
+             left="0"
+             name="selected_icon"
+             top="2"
+             width="20" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="true"
+         user_resize="false"
+         left_pad="0"        
+         height="24"
+         name="conversation_title_panel"
+         min_dim="50"
+         width="70"
+         expanded_min_dim="50">
+		    <text
+		     follows="left|top|right"
+		     font="SansSerifSmall"
+		     height="15"
+		     layout="topleft"
+		     left="5"
+		     name="conversation_title"
+		     parse_urls="false"
+		     top="6"
+		     use_ellipses="true"
+		     value="(loading)"
+		     width="35" />
+		    <output_monitor
+		     auto_update="true"
+		     follows="top|right"
+		     draw_border="false"
+		     height="16"
+		     layout="topleft"
+		     left_pad="5"
+		     mouse_opaque="true"
+		     name="speaking_indicator"
+		     width="20" />
+        </layout_panel>
+    </layout_stack>
+</panel>
-- 
cgit v1.2.3


From 4b52515b543546844835064dfb89e5af2bbbd948 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 13 Sep 2012 20:10:45 +0300
Subject: CHUI-282 WIP Fixed conversation list items selection. Fixed
 displaying session participants only when session item is open.

---
 .../xui/en/panel_conversation_list_item.xml        | 22 +++++++++++-----------
 .../xui/en/widgets/conversation_view_session.xml   |  9 +++++++++
 2 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index d1f25b45fe..375ea79ebe 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -3,8 +3,8 @@
  follows="left|top|right"
  height="24"
  layout="topleft"
- mouse_opaque="flase"
  name="conversation_list_item"
+ mouse_opaque="false"
  width="120">
     <avatar_icon
      follows="top|left"
@@ -12,7 +12,6 @@
      default_icon_name="Generic_Person"
      layout="topleft"
      left="5"
-     mouse_opaque="true"
      top="2"
      width="20" />
     <layout_stack
@@ -21,7 +20,8 @@
      height="24"
      layout="topleft"
      left_pad="5"
-     name="caonversation_item_stack"
+     mouse_opaque="false"
+     name="conversation_item_stack"
      orientation="horizontal"
      top="0"
      width="90">
@@ -29,6 +29,7 @@
          auto_resize="false"
          user_resize="false"        
          height="24"
+         mouse_opaque="false"
          name="call_icon_panel"
          visible="false"
          width="20">
@@ -44,13 +45,11 @@
         </layout_panel>
         <layout_panel
          auto_resize="true"
-         user_resize="false"
-         left_pad="0"        
+         user_resize="false"    
          height="24"
+         mouse_opaque="false"
          name="conversation_title_panel"
-         min_dim="50"
-         width="70"
-         expanded_min_dim="50">
+         width="70">
 		    <text
 		     follows="left|top|right"
 		     font="SansSerifSmall"
@@ -70,9 +69,10 @@
 		     height="16"
 		     layout="topleft"
 		     left_pad="5"
-		     mouse_opaque="true"
-		     name="speaking_indicator"
-		     width="20" />
+ 		     mouse_opaque="true"
+ 		     name="speaking_indicator"
+ 		     visible="false"
+ 		     width="20" />
         </layout_panel>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
new file mode 100644
index 0000000000..f44731ea3d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<conversation_view_session
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="8"
+  item_height="24" 
+  item_top_pad="4"
+  selection_image="Rounded_Square"
+  mouse_opaque="true"
+  follows="left|top|right"/>
-- 
cgit v1.2.3