diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
9 files changed, 165 insertions, 79 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml index 9c3151fe07..8c8bb29baf 100644 --- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml @@ -8,6 +8,9 @@ name="wear_replace"> <on_click function="Outfit.WearReplace" /> + <on_enable + function="Outfit.OnEnable" + parameter="wear_replace" /> <on_visible function="Outfit.OnVisible" parameter="wear_replace" /> diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml new file mode 100644 index 0000000000..84431a2f69 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + layout="topleft" + name="Gear Wearing"> + <menu_item_call + label="Edit Outfit" + layout="topleft" + name="edit"> + <on_click + function="Gear.Edit" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml new file mode 100644 index 0000000000..85505f9972 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Wearing"> + <menu_item_call + label="Edit Outfit" + layout="topleft" + name="edit"> + <on_click + function="Wearing.Edit" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml index f016c27b0a..d2c8ab159f 100644 --- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml @@ -31,6 +31,7 @@ item_pad="3" layout="topleft" left="0" + keep_selection_visible_on_reshape="true" multi_select="true" name="list_attachments" top="0" @@ -45,6 +46,7 @@ follows="all" height="10" item_pad="3" + keep_selection_visible_on_reshape="true" layout="topleft" left="0" multi_select="true" @@ -61,6 +63,7 @@ follows="all" height="10" item_pad="3" + keep_selection_visible_on_reshape="true" layout="topleft" left="0" multi_select="true" 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 1ab9f722d0..fc1caca9e9 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -12,95 +12,125 @@ top="0" width="333"> <string - name="edit_shape_title" - value="Editing Shape" /> + name="edit_shape_title"> + Editing Shape + </string> <string - name="edit_skin_title" - value="Editing Skin" /> + name="edit_skin_title"> + Editing Skin + </string> <string - name="edit_hair_title" - value="Editing Hair" /> + name="edit_hair_title"> + Editing Hair + </string> <string - name="edit_eyes_title" - value="Editing Eyes" /> + name="edit_eyes_title"> + Editing Eyes + </string> <string - name="edit_shirt_title" - value="Editing Shirt" /> + name="edit_shirt_title"> + Editing Shirt + </string> <string - name="edit_pants_title" - value="Editing Pants" /> + name="edit_pants_title"> + Editing Pants + </string> <string - name="edit_shoes_title" - value="Editing Shoes" /> + name="edit_shoes_title"> + Editing Shoes + </string> <string - name="edit_socks_title" - value="Editing Socks" /> + name="edit_socks_title"> + Editing Socks + </string> <string - name="edit_jacket_title" - value="Editing Jacket" /> + name="edit_jacket_title"> + Editing Jacket + </string> <string - name="edit_skirt_title" - value="Editing Skirt" /> + name="edit_skirt_title"> + Editing Skirt + </string> <string - name="edit_gloves_title" - value="Editing Gloves" /> + name="edit_gloves_title"> + Editing Gloves + </string> <string - name="edit_undershirt_title" - value="Editing Undershirt" /> + name="edit_undershirt_title"> + Editing Undershirt + </string> <string - name="edit_underpants_title" - value="Editing Underpants" /> + name="edit_underpants_title"> + Editing Underpants + </string> <string - name="edit_alpha_title" - value="Editing Alpha Mask" /> + name="edit_alpha_title"> + Editing Alpha Mask + </string> <string - name="edit_tattoo_title" - value="Editing Tattoo" /> + name="edit_tattoo_title"> + Editing Tattoo + </string> <string - name="shape_desc_text" - value="Shape:" /> + name="shape_desc_text"> + Shape: + </string> <string - name="skin_desc_text" - value="Skin:" /> + name="skin_desc_text"> + Skin: + </string> <string - name="hair_desc_text" - value="Hair:" /> + name="hair_desc_text"> + Hair: + </string> <string - name="eyes_desc_text" - value="Eyes:" /> + name="eyes_desc_text"> + Eyes: + </string> <string - name="shirt_desc_text" - value="Shirt:" /> + name="shirt_desc_text"> + Shirt: + </string> <string - name="pants_desc_text" - value="Pants:" /> + name="pants_desc_text"> + Pants: + </string> <string - name="shoes_desc_text" - value="Shoes:" /> + name="shoes_desc_text"> + Shoes: + </string> <string - name="socks_desc_text" - value="Socks:" /> + name="socks_desc_text"> + Socks: + </string> <string - name="jacket_desc_text" - value="Jacket:" /> + name="jacket_desc_text"> + Jacket: + </string> <string - name="skirt_desc_text" - value="Skirt:" /> + name="skirt_desc_text"> + Skirt: + </string> <string - name="gloves_desc_text" - value="Gloves:" /> + name="gloves_desc_text"> + Gloves: + </string> <string - name="undershirt_desc_text" - value="Undershirt:" /> + name="undershirt_desc_text"> + Undershirt: + </string> <string - name="underpants_desc_text" - value="Underpants:" /> + name="underpants_desc_text"> + Underpants: + </string> <string - name="alpha_desc_text" - value="Alpha Mask:" /> + name="alpha_desc_text"> + Alpha Mask: + </string> <string - name="tattoo_desc_text" - value="Tattoo:" /> + name="tattoo_desc_text"> + Tattoo: + </string> <button follows="top|left" height="24" @@ -390,7 +420,7 @@ <button follows="bottomleft" height="23" - label="Revert" + label="Undo Changes" layout="topleft" left_pad="7" name="revert_button" diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index d6549adfef..4abd7dceac 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -391,12 +391,12 @@ It is calculated as border_size + 2*UIResizeBarOverlap follows="bottom|right" height="25" image_hover_unselected="Toolbar_Middle_Over" - image_overlay="AddItem_Off" + image_overlay="Shop" image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" layout="topleft" left_pad="0" - name="shop_btn" + name="shop_btn_1" top="1" width="31" /> </panel> @@ -472,8 +472,20 @@ It is calculated as border_size + 2*UIResizeBarOverlap layout="topleft" left_pad="1" name="dummy_right_icon" - width="184" > + width="153" > </icon> + <button + follows="bottom|right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Shop" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="0" + name="shop_btn_2" + top="1" + width="31" /> </panel> <!-- SAVE AND REVERT BUTTONS --> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index a59070496e..b365540d1f 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -34,22 +34,32 @@ follows="all" label="MY OUTFITS" layout="topleft" - width="315" /> - <inventory_panel - follows="all" + width="312" /> + <panel background_visible="true" - background_opaque="true" - label="WEARING" + class="panel_wearing" + follows="all" + height="490" help_topic="now_wearing_tab" - allow_multi_select="true" - border="false" - left="0" - top="0" - mouse_opaque="true" + label="WEARING" + layout="topleft" name="cof_tab" - start_folder="Current Outfit" - use_label_suffix="true" - width="315" /> + width="312"> + <wearable_items_list + allow_select="true" + follows="all" + height="490" + keep_one_selected="true" + left="1" + multi_select="true" + name="cof_items_list" + standalone="false" + top="0" + translate="false" + width="310" + worn_indication_enabled="false" + /> + </panel> </tab_container> <panel background_visible="true" @@ -84,7 +94,7 @@ width="241" /> - <dnd_button + <button follows="bottom|right" height="25" image_hover_unselected="Toolbar_Right_Over" diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index e189d11d35..9a07d3a48a 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -21,6 +21,9 @@ width="333"> <string name="Now Wearing" value="Now wearing..." /> + <string + name="Changing outfits" + value="Changing outfits" /> <panel background_opaque="true" background_visible="true" diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml index dbe1ea2874..50be0ac1a1 100644 --- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml @@ -14,5 +14,6 @@ <!-- style for inventory list item WORN on avatar --> <worn_style font="SansSerifSmall" - font.style="BOLD" /> + font.style="BOLD" + color="EmphasisColor" /> </inventory_list_item> |