summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-06-24 13:16:35 +0300
committerMike Antipov <mantipov@productengine.com>2010-06-24 13:16:35 +0300
commitc99bfaf6ed7bf280a3355c10630a66f5c5affbc1 (patch)
treebfc514fbf84c10f2001861e450210ef8215e3bbf /indra/newview/skins/default/xui/en
parenta3d8f6ee4549d301fab51a08fbac7a9f48e22be2 (diff)
EXT-7961 FIXED Added possibility to show label on the back button in Edit Wearables panel.
Implemented behavior: * Normally Back button appears narrow without label * When wearable is changed - "Save" label is set and button gets wide. Left Border of Title is moved to the right. Note: "Save" label is shown without truncation in all languages, Title can be truncated with dots. * When changes are saved/reverted - label is removed, button shrinks, Title left border is moved to the its default place. * Added consistent tooltip for title (the same as a title). * Added tooltip for button: "Save changes if necessary and return back" Details: * added getter for button's font * implemented derived from LLButton class for Back button to enable setting necessary label's padding in xml Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/636/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_wearable.xml13
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index fc1caca9e9..484617df34 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -131,19 +131,25 @@
name="tattoo_desc_text">
Tattoo:
</string>
- <button
+ <!-- Default width of the button should be to show it without label.
+ Button will be extedned in code to show whole label when wearable is being changed.
+ -->
+ <labeled_back_button
follows="top|left"
height="24"
image_hover_unselected="BackButton_Over"
image_pressed="BackButton_Press"
image_unselected="BackButton_Off"
layout="topleft"
+ label="Save"
left="11"
name="back_btn"
+ pad_left="24"
+ tool_tip="Return to Edit Outfit"
top="3"
width="30" />
<text
- follows="top|left"
+ follows="top|left|right"
font="SansSerifHugeBold"
height="22"
layout="topleft"
@@ -152,7 +158,8 @@
text_color="white"
top="3"
value="Editing Shape"
- width="270" />
+ use_ellipses="true"
+ width="274" />
<panel
background_opaque="true"
background_visible="true"