diff options
author | Eugene Mutavchi <emutavchi@productengine.com> | 2009-11-04 18:19:32 +0200 |
---|---|---|
committer | Eugene Mutavchi <emutavchi@productengine.com> | 2009-11-04 18:19:32 +0200 |
commit | 0fd7ff59f58dc9c5d9b043830d513020ac7a6cdd (patch) | |
tree | d8ff618af685fb211fd34b8b23b4ed8cd643bc6b /indra/newview/skins/default | |
parent | a1e7bef9e70312929b6c1b437a17954e6198c1db (diff) |
Implemented normal sub-task EXT-2142 (Call, End Call and Oen Voice Controls buttons should be located on their own panel at the bottom of the control panel (all types of IMs))
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
4 files changed, 139 insertions, 99 deletions
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 88aca005cf..8eeff0a9e4 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -12,13 +12,13 @@ can_dock="true" can_minimize="true" visible="true" - width="400" + width="520" can_resize="true" min_width="200" min_height="150"> <layout_stack follows="left|top|right|bottom" height="344" - width="400" + width="520" layout="topleft" orientation="horizontal" name="im_panels" @@ -34,7 +34,7 @@ auto_resize="false" user_resize="false" /> <layout_panel height="344" - width="235" + width="355" left_delta="146" top="0" user_resize="false"> @@ -61,9 +61,9 @@ name="chat_history" parse_highlights="true" allow_html="true" - width="230"> + width="350"> </chat_history> - <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="225"> + <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="345"> </line_editor> </layout_panel> </layout_stack> 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 index 8dbcfe6360..52017218d6 100644 --- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml @@ -19,26 +19,39 @@ top="10" width="180"/> - <button - height="20" - label="Call Group" - left_delta="27" - name="call_btn" - width="125"/> + <panel + background_visible="true" + bg_alpha_color="0.2 0.2 0.2 1" + border="false" + bottom="1" + follows="left|bottom" + height="78" + left="0" + name="panel_buttons" + width="180"> - <button - height="20" - label="Leave Call" - name="end_call_btn" - visible="false" - width="125"/> + <button + height="20" + label="Call Group" + left_delta="27" + name="call_btn" + width="125"/> - <button - enabled="false" - height="20" - label="Open Voice Controls" - name="voice_ctrls_btn" - visible="false" - width="125"/> + <button + height="20" + label="Leave Call" + name="end_call_btn" + visible="false" + width="125"/> + + <button + enabled="false" + height="20" + label="Open Voice Controls" + name="voice_ctrls_btn" + visible="false" + width="125"/> + + </panel> </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 index 737bb5bcb6..daa44ac75c 100644 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -19,32 +19,44 @@ top="10" width="180"/> - <button - height="20" - label="Group Info" - left_delta="27" - name="group_info_btn" - width="125"/> + <panel + background_visible="true" + bg_alpha_color="0.2 0.2 0.2 1" + border="false" + bottom="1" + follows="left|bottom" + height="98" + left="0" + name="panel_buttons" + width="180"> - <button - height="20" - label="Call Group" - name="call_btn" - width="125"/> + <button + height="20" + label="Group Info" + left_delta="28" + name="group_info_btn" + width="125"/> - <button - height="20" - label="Leave Call" - name="end_call_btn" - visible="false" - width="125"/> + <button + height="20" + label="Call Group" + name="call_btn" + width="125"/> - <button - enabled="false" - height="20" - label="Open Voice Controls" - name="voice_ctrls_btn" - visible="false" - width="125"/> + <button + height="20" + label="Leave Call" + name="end_call_btn" + visible="false" + width="125"/> + <button + enabled="false" + height="20" + label="Open Voice Controls" + name="voice_ctrls_btn" + visible="false" + width="125"/> + + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 35be31983c..d144d71dce 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -2,73 +2,88 @@ <panel border="false" height="327" + layout="topleft" name="panel_im_control_panel" - width="128"> + width="131"> <avatar_icon follows="left|top" height="125" left_delta="3" name="avatar_icon" + top="-10" width="125"/> - <button + <panel + background_visible="true" + bg_alpha_color="0.2 0.2 0.2 1" + border="false" + bottom="1" follows="left|bottom" - height="20" - label="View Profile" - name="view_profile_btn" - width="125"/> + height="195" + left="0" + name="panel_buttons" + width="131"> - <button - follows="left|bottom" - height="20" - label="Add Friend" - name="add_friend_btn" - width="125"/> + <button + follows="left|bottom" + height="20" + label="View Profile" + left_delta="3" + name="view_profile_btn" + width="125"/> - <button - follows="left|bottom" - height="20" - label="Call" - name="call_btn" - width="125"/> + <button + follows="left|bottom" + height="20" + label="Add Friend" + name="add_friend_btn" + width="125"/> - <button - follows="left|bottom" - height="20" - label="Leave Call" - name="end_call_btn" - visible="false" - width="125"/> + <button + follows="left|bottom" + height="20" + label="Call" + name="call_btn" + width="125"/> - <button - enabled="false" - follows="left|bottom" - height="20" - label="Open Voice Controls" - name="voice_ctrls_btn" - visible="false" - width="125"/> + <button + follows="left|bottom" + height="20" + label="Leave Call" + name="end_call_btn" + visible="false" + width="125"/> - <button - follows="left|bottom" - height="20" - label="Teleport" - name="teleport_btn" - width="125"/> + <button + enabled="false" + follows="left|bottom" + height="20" + label="Open Voice Controls" + name="voice_ctrls_btn" + visible="false" + width="125"/> - <button - follows="left|bottom" - height="20" - label="Share" - name="share_btn" - width="125"/> + <button + follows="left|bottom" + height="20" + label="Teleport" + name="teleport_btn" + width="125"/> - <button - follows="left|bottom" - height="20" - label="Pay" - name="pay_btn" - width="125"/> + <button + follows="left|bottom" + height="20" + label="Share" + name="share_btn" + width="125"/> + + <button + follows="left|bottom" + height="20" + label="Pay" + name="pay_btn" + width="125"/> + </panel> </panel> |