summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-06-03 16:21:56 +0300
committerAndrew Dyukov <adyukov@productengine.com>2010-06-03 16:21:56 +0300
commit7902899df5f22794d5ccd2d977d2cb1361021d5e (patch)
treeddf20d03e024982146d02e07eec6f81adb86037c /indra/newview/skins
parent7e0c07b6a64a2e1816cbfe6436215c309af58452 (diff)
EXT-7511 FIXED Fixed problems in appearance UI
- Made slight changes in xml according to requirements. - Added mForceNoLinksOnIcons bool member to LLPanelInventoryListItemBase. It is used in LLPanelWearableListItem to disable showing of link icons as was requested in ticket. - Created icon for divider 3 pixels high as asked by Erica in EXT-7233. To properly show and hide it made changes to LLCOFWearables::buildClothingListItem which now not only showes separator but also reshapes panel depending on its visibility. Increased heights of body parts, dummy clothing and attachment items because dividers are now 2 pxls higher and they always have dividers. Changed heights of buttons accordingly. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/502/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/textures/textures.xml2
-rw-r--r--indra/newview/skins/default/textures/windows/Wearables_Divider.pngbin0 -> 97 bytes
-rw-r--r--indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml46
-rw-r--r--indra/newview/skins/default/xui/en/panel_clothing_list_item.xml57
-rw-r--r--indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml27
-rw-r--r--indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml26
6 files changed, 89 insertions, 69 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1d9f0cade7..4b781dee8c 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -570,6 +570,8 @@ with the same filename but different name
<texture name="VoicePTT_Off" file_name="bottomtray/VoicePTT_Off.png" preload="false" />
<texture name="VoicePTT_On" file_name="bottomtray/VoicePTT_On.png" preload="false" />
+ <texture name="Wearables_Divider" file_name="windows/Wearables_Divider.png" preload="false" />
+
<texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
diff --git a/indra/newview/skins/default/textures/windows/Wearables_Divider.png b/indra/newview/skins/default/textures/windows/Wearables_Divider.png
new file mode 100644
index 0000000000..9dce7bf45c
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Wearables_Divider.png
Binary files differ
diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
index 2edd643cc5..a0bbc8f2ee 100644
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="top|right|left"
- height="23"
+ height="25"
layout="topleft"
left="0"
name="wearable_item"
@@ -9,22 +9,22 @@
width="380">
<icon
follows="top|right|left"
- height="23"
+ height="22"
image_name="ListItem_Over"
layout="topleft"
left="0"
name="hovered_icon"
- top="0"
+ top="1"
visible="false"
width="380" />
<icon
- height="23"
+ height="22"
follows="top|right|left"
image_name="ListItem_Select"
layout="topleft"
left="0"
name="selected_icon"
- top="0"
+ top="1"
visible="false"
width="380" />
<icon
@@ -53,7 +53,6 @@
name="btn_lock"
layout="topleft"
follows="top|right"
- image_name="Locked_Icon"
top="0"
left="0"
height="23"
@@ -70,24 +69,35 @@
width="9"
tab_stop="false" />
</panel>
- <button
- name="btn_edit"
+ <panel
+ background_visible="false"
+ name="btn_edit_panel"
layout="topleft"
follows="top|right"
- image_overlay="Edit_Wrench"
top="0"
left_pad="3"
- height="23"
- width="23"
- tab_stop="false" />
- <panel
- background_visible="true"
- bg_alpha_color="0.4 0.4 0.4 1.0"
- bottom="0"
+ height="24"
+ width="27"
+ tab_stop="false">
+ <button
+ name="btn_edit"
+ layout="topleft"
+ follows="top|right"
+ image_overlay="Edit_Wrench"
+ top="0"
+ left="0"
+ height="24"
+ width="24"
+ tab_stop="false" />
+ </panel>
+ <icon
follows="left|right|top"
- height="1"
+ height="3"
+ image_name="Wearables_Divider"
layout="bottomleft"
left="0"
- name="wearable_type_separator_panel"
+ name="wearable_type_separator_icon"
+ top="3"
+ visible="true"
width="380"/>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
index 035e8607ec..e41141f6bd 100644
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
@@ -9,22 +9,22 @@
width="380">
<icon
follows="top|right|left"
- height="23"
+ height="22"
image_name="ListItem_Over"
layout="topleft"
left="0"
name="hovered_icon"
- top="0"
+ top="1"
visible="false"
width="380" />
<icon
- height="23"
+ height="22"
follows="top|right|left"
image_name="ListItem_Select"
layout="topleft"
left="0"
name="selected_icon"
- top="0"
+ top="1"
visible="false"
width="380" />
<button
@@ -33,10 +33,10 @@
follows="top|left"
image_unselected="Toast_CloseBtn"
image_selected="Toast_CloseBtn"
- top="0"
+ top="2"
left="0"
- height="20"
- width="20"
+ height="18"
+ width="18"
tab_stop="false" />
<icon
height="16"
@@ -66,8 +66,8 @@
image_overlay="UpArrow_Off"
top="0"
left="0"
- height="23"
- width="23"
+ height="24"
+ width="24"
tab_stop="false" />
<button
name="btn_move_down"
@@ -76,15 +76,14 @@
image_overlay="DownArrow_Off"
top="0"
left_pad="3"
- height="23"
- width="23"
+ height="24"
+ width="24"
tab_stop="false" />
<panel
background_visible="false"
name="btn_lock"
layout="topleft"
follows="top|right"
- image_name="Locked_Icon"
top="0"
left="0"
height="23"
@@ -101,25 +100,35 @@
width="9"
tab_stop="false" />
</panel>
- <button
- name="btn_edit"
+ <panel
+ background_visible="false"
+ name="btn_edit_panel"
layout="topleft"
follows="top|right"
- image_overlay="Edit_Wrench"
top="0"
left_pad="3"
- height="23"
- width="23"
- tab_stop="false" />
- <panel
- background_visible="true"
- bg_alpha_color="0.4 0.4 0.4 1.0"
- bottom="0"
+ height="24"
+ width="27"
+ tab_stop="false">
+ <button
+ name="btn_edit"
+ layout="topleft"
+ follows="top|right"
+ image_overlay="Edit_Wrench"
+ top="0"
+ left="0"
+ height="24"
+ width="24"
+ tab_stop="false" />
+ </panel>
+ <icon
follows="left|right|top"
- height="1"
+ height="3"
+ image_name="Wearables_Divider"
layout="bottomleft"
left="0"
- name="wearable_type_separator_panel"
+ name="wearable_type_separator_icon"
+ top="0"
visible="false"
width="380"/>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
index 2f37b9d3c9..b006d125ee 100644
--- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="top|right|left"
- height="23"
+ height="25"
layout="topleft"
left="0"
name="deletable_wearable_item"
@@ -9,22 +9,22 @@
width="380">
<icon
follows="top|right|left"
- height="20"
+ height="22"
image_name="ListItem_Over"
layout="topleft"
left="0"
name="hovered_icon"
- top="0"
+ top="1"
visible="false"
width="380" />
<icon
- height="20"
+ height="22"
follows="top|right|left"
image_name="ListItem_Select"
layout="topleft"
left="0"
name="selected_icon"
- top="0"
+ top="1"
visible="false"
width="380" />
<button
@@ -33,10 +33,10 @@
follows="top|left"
image_unselected="Toast_CloseBtn"
image_selected="Toast_CloseBtn"
- top="0"
+ top="2"
left="0"
- height="20"
- width="20"
+ height="18"
+ width="18"
tab_stop="false" />
<icon
height="16"
@@ -59,15 +59,14 @@
top="4"
value="..."
width="359" />
- <panel
- background_visible="true"
- bg_alpha_color="0.4 0.4 0.4 1.0"
- bottom="0"
+ <icon
follows="left|right|top"
- height="1"
+ height="3"
+ image_name="Wearables_Divider"
layout="bottomleft"
left="0"
- name="wearable_type_separator_panel"
+ name="wearable_type_separator_icon"
+ top="3"
visible="true"
width="380"/>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index 06371b7489..6c43635d49 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="top|right|left"
- height="23"
+ height="25"
layout="topleft"
left="0"
name="dummy_clothing_item"
@@ -9,22 +9,22 @@
width="380">
<icon
follows="top|right|left"
- height="23"
+ height="22"
image_name="ListItem_Over"
layout="topleft"
left="0"
name="hovered_icon"
- top="0"
+ top="1"
visible="false"
width="380" />
<icon
- height="23"
+ height="22"
follows="top|right|left"
image_name="ListItem_Select"
layout="topleft"
left="0"
name="selected_icon"
- top="0"
+ top="1"
visible="false"
width="380" />
<icon
@@ -56,17 +56,17 @@
image_overlay="AddItem_Off"
top="0"
left="0"
- height="23"
- width="23"
+ height="24"
+ width="24"
tab_stop="false" />
- <panel
- background_visible="true"
- bg_alpha_color="0.4 0.4 0.4 1.0"
- bottom="0"
+ <icon
follows="left|right|top"
- height="1"
+ height="3"
+ image_name="Wearables_Divider"
layout="bottomleft"
left="0"
- name="wearable_type_separator_panel"
+ name="wearable_type_separator_icon"
+ top="3"
+ visible="true"
width="380"/>
</panel>