diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-17 10:36:11 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-17 10:36:11 -0500 |
commit | 32dccaf3d89b40b711d69088a3e390119c7efc7f (patch) | |
tree | 4bc6870bcf560fabffd9f3a1b3e7da862e3799e8 /indra/newview/skins/default/xui | |
parent | b88778ca7d2de5b381eb59722d9075c8e02ccb39 (diff) |
Sidepanel Appearance refactoring. Work in progress.
1. Changed sidepanel names to have "sidepanel" (e.g. panel_appearance -> sidepanel_appearance)
2. Changed some "Looks" names to "Outfits"
3. Changed LLPanelLooks to LLPanelOutfitsInventory (to match other inventory panel naming)
4. Took out tab from sidepanel_appearance.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/skins/default/xui')
4 files changed, 189 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml index b48c962413..7cfcac8a9a 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory.xml @@ -30,7 +30,7 @@ name="Fetched"> Fetched </floater.string> -<panel + <panel bottom="560" class="panel_main_inventory" filename="panel_main_inventory.xml" diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml new file mode 100644 index 0000000000..f511ec0d6f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel name="Outfits" + bottom="0" + height="326" + left="0" + width="310" + border="true" + follows="left|top|right|bottom"> + <inventory_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="326" + left="0" + mouse_opaque="true" + name="outfits_list" + width="310" + start_folder="My Outfits"/> + <button bottom="0" + halign="center" + height="16" + label=">" + enabled="false" + mouse_opaque="false" + name="selector" + width="20" + left="0" + visible="false" + follows="right|bottom" + tool_tip="View outfit properties"/> + <panel + background_visible="true" + bevel_style="none" + bottom="0" + follows="left|right|bottom" + height="30" + layout="bottomleft" + left="0" + visible="true" + name="bottom_panel" + width="310"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="10" + name="options_gear_btn" + picture_style="true" + top="6" + width="18" /> + <button + follows="bottom|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="5" + name="add_btn" + picture_style="true" + tool_tip="Add new item" + width="18" /> + <dnd_button + follows="bottom|right" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + right="-5" + name="trash_btn" + picture_style="true" + tool_tip="Remove selected item" + top="6" + width="18" /> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index a419a02d75..d02354a647 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -120,9 +120,9 @@ background_visible="true" > <panel - class="panel_appearance" - name="panel_appearance" - filename="panel_appearance.xml" + class="sidepanel_appearance" + name="sidepanel_appearance" + filename="sidepanel_appearance.xml" label="Edit Appearance" font="SansSerifBold" /> diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml new file mode 100644 index 0000000000..d87211d432 --- /dev/null +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + follows="all" + height="400" + label="Appearance" + layout="topleft" + min_height="350" + min_width="240" + name="appearance panel" + width="333"> + <string + name="looks_tab_title" + value="Looks" /> + <panel + left="5" width="320" height="55" + background_visible="true" + background_opaque="false" + bg_alpha_color="0.2 0.2 0.2 1.0" + name="panel_currentlook" + follows="left|top|right"> + <text + top="-5" width="200" left="5" height="10" follows="left|right|top" + font="SansSerif" text_color="LtGray" word_wrap="true" + mouse_opaque="false" name="currentlook_title"> + Current Look + </text> + <text + top="-30" left="8" height="10" follows="left|right|top" + font="SansSerifBold" text_color="white" word_wrap="true" + mouse_opaque="false" name="currentlook_name" > + MyLook + </text> + <button + follows="left|right|top" + font="SansSerif" + top="28" right="-105" width="60" height="20" + layout="topleft" + label="Edit" + name="editappearance_btn"/> + </panel> + + <filter_editor + follows="left|top|right" + font="SansSerif" + label="Filter" + layout="topleft" + left="15" + width="313" + height="20" + name="Filter" /> + <panel + class="panel_outfits_inventory" + filename="panel_outfits_inventory.xml" + name="panel_outfits_inventory" + follows="all" + height="271" + halign="center" + layout="topleft" + left="10" + top_pad="19" + width="313" /> + <button + follows="bottom|left" + font="SansSerifSmallBold" + height="25" + label="Wear" + layout="topleft" + left="10" + name="wear_btn" + top_pad="0" + width="80" /> + <button + follows="bottom|left" + font="SansSerifSmallBold" + height="25" + label="New Look" + layout="topleft" + left_pad="0" + name="newlook_btn" + top_delta="0" + width="90" /> + + <panel + class="panel_look_info" + filename="panel_look_info.xml" + follows="all" + layout="topleft" + left="0" + name="panel_look_info" + top="-200" + visible="false" /> + + <panel + class="panel_edit_wearable" + filename="panel_edit_wearable.xml" + follows="all" + layout="topleft" + left="0" + name="panel_edit_wearable" + top="-200" + visible="false" + width="333" /> +</panel> |