summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-03-19 17:03:32 +0200
committerMike Antipov <mantipov@productengine.com>2010-03-19 17:03:32 +0200
commit4347af5763672d0b575ad255aa3565a51c0a632e (patch)
treed04ed9b22bd7fce4a25309dc1af32e1173c7f7c1 /indra/newview/skins
parent8f40c559f37ec33886e34c42dc076d4bb28ab609 (diff)
Done normal task EXT-6267 ([TRUNCATION] [EN XUI REWORK] - Side panel, profiles: the teleport button is truncated. need 'en' xui designer rework)
* moved Map Button into the dropdown menu (with enable/click logic). New <menu_item_call label="Map" name="show_on_map"> is added into the menu_profile_overflow.xml * redesigned rest of buttons to accommodate available space Now buttons' widths are enough to not truncate labels in all locales. NOTE: New "Map" item menu should be localized (just move values from panel_profile.xml to menu_profile_overflow.xml) in other locales. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/59/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_profile_overflow.xml9
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml30
2 files changed, 17 insertions, 22 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
index 5162a4902f..b0b7b554b0 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
@@ -6,6 +6,15 @@
name="profile_overflow_menu"
width="120">
<menu_item_call
+ label="Map"
+ layout="topleft"
+ name="show_on_map">
+ <menu_item_call.on_click
+ function="Profile.ShowOnMap" />
+ <menu_item_call.on_enable
+ function="Profile.EnableShowOnMap" />
+ </menu_item_call>
+ <menu_item_call
label="Pay"
layout="topleft"
name="pay">
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 9fcabc7722..30191aecb6 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -311,7 +311,7 @@
height="23"
label="Add Friend"
layout="topleft"
- left="1"
+ left="2"
mouse_opaque="false"
name="add_friend"
pad_left="1"
@@ -319,7 +319,7 @@
tool_tip="Offer friendship to the Resident"
top="5"
use_ellipses="true"
- width="105" />
+ width="117" />
<button
follows="bottom|left"
height="23"
@@ -328,8 +328,8 @@
name="im"
tool_tip="Open instant message session"
top="5"
- left_pad="0"
- width="19" />
+ left_pad="1"
+ width="21" />
<button
follows="bottom|left"
height="23"
@@ -337,26 +337,12 @@
layout="topleft"
name="call"
tool_tip="Call this Resident"
- left_pad="0"
+ left_pad="1"
pad_left="1"
pad_right="1"
top="5"
use_ellipses="true"
- width="48" />
- <button
- enabled="false"
- follows="bottom|left"
- height="23"
- label="Map"
- layout="topleft"
- name="show_on_map_btn"
- pad_left="1"
- pad_right="1"
- tool_tip="Show the Resident on the map"
- top="5"
- left_pad="0"
- use_ellipses="true"
- width="33" />
+ width="51" />
<button
follows="bottom|left"
height="23"
@@ -364,12 +350,12 @@
layout="topleft"
name="teleport"
tool_tip="Offer teleport"
- left_pad="0"
+ left_pad="1"
pad_left="1"
pad_right="1"
top="5"
use_ellipses="true"
- width="81" />
+ width="92" />
<button
follows="bottom|right"
height="23"