livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-2130 : XUI cleanup 

Reformatted sidepanel_inventory
Took out tab container from both sidepanel_inventory and sidepanel_item_info

--HG--
branch : avatar-pipeline
meow-7.2.2
Loren Shih 2009-11-03 19:46:57 -05:00
parent 4692244422
commit f263d119c4
5 changed files with 588 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
indra/newview/llsidepanelinventory.cpp
View File

@ -44,7 +44,7 @@ static LLRegisterPanelClassWrapper<LLSidepanelInventory> t_inventory("sidepanel_
LLSidepanelInventory::LLSidepanelInventory()
: LLPanel(),
mSidepanelItemInfo(NULL)
mItemPanel(NULL)
{
//LLUICtrlFactory::getInstance()->buildPanel(this, "panel_inventory.xml"); // Called from LLRegisterPanelClass::defaultPanelClassBuilder()
@ -56,36 +56,40 @@ LLSidepanelInventory::~LLSidepanelInventory()
BOOL LLSidepanelInventory::postBuild()
{
mInfoBtn = getChild<LLButton>("info_btn");
mInfoBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onInfoButtonClicked, this));
mShareBtn = getChild<LLButton>("share_btn");
mShareBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onShareButtonClicked, this));
mShareBtn = getChild<LLButton>("share_btn");
mShareBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onShareButtonClicked, this));
mWearBtn = getChild<LLButton>("wear_btn");
mWearBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onWearButtonClicked, this));
mPlayBtn = getChild<LLButton>("play_btn");
mPlayBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onPlayButtonClicked, this));
mTeleportBtn = getChild<LLButton>("teleport_btn");
mTeleportBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onTeleportButtonClicked, this));
mOverflowBtn = getChild<LLButton>("overflow_btn");
mOverflowBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onOverflowButtonClicked, this));
mTabContainer = getChild<LLTabContainer>("Inventory Tabs");
mSidepanelItemInfo = getChild<LLSidepanelItemInfo>("sidepanel_item_info");
mPanelMainInventory = getChild<LLPanelMainInventory>("panel_main_inventory");
mPanelMainInventory->setSelectCallback(boost::bind(&LLSidepanelInventory::onSelectionChange, this, _1, _2));
LLButton* back_btn = mSidepanelItemInfo->getChild<LLButton>("back_btn");
back_btn->setClickedCallback(boost::bind(&LLSidepanelInventory::onBackButtonClicked, this));
// UI elements from inventory panel
{
mInventoryPanel = getChild<LLPanel>("sidepanel__inventory_panel");
mInfoBtn = mInventoryPanel->getChild<LLButton>("info_btn");
mInfoBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onInfoButtonClicked, this));
mShareBtn = mInventoryPanel->getChild<LLButton>("share_btn");
mShareBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onShareButtonClicked, this));
mWearBtn = mInventoryPanel->getChild<LLButton>("wear_btn");
mWearBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onWearButtonClicked, this));
mPlayBtn = mInventoryPanel->getChild<LLButton>("play_btn");
mPlayBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onPlayButtonClicked, this));
mTeleportBtn = mInventoryPanel->getChild<LLButton>("teleport_btn");
mTeleportBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onTeleportButtonClicked, this));
mOverflowBtn = mInventoryPanel->getChild<LLButton>("overflow_btn");
mOverflowBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onOverflowButtonClicked, this));
LLPanelMainInventory *panel_main_inventory = mInventoryPanel->getChild<LLPanelMainInventory>("panel_main_inventory");
panel_main_inventory->setSelectCallback(boost::bind(&LLSidepanelInventory::onSelectionChange, this, _1, _2));
}
// UI elements from item panel
{
mItemPanel = getChild<LLSidepanelItemInfo>("sidepanel__item_panel");
LLButton* back_btn = mItemPanel->getChild<LLButton>("back_btn");
back_btn->setClickedCallback(boost::bind(&LLSidepanelInventory::onBackButtonClicked, this));
}
return TRUE;
}
@ -94,16 +98,16 @@ void LLSidepanelInventory::onOpen(const LLSD& key)
if(key.size() == 0)
return;
mSidepanelItemInfo->reset();
mItemPanel->reset();
if (key.has("id"))
{
mSidepanelItemInfo->setItemID(key["id"].asUUID());
mItemPanel->setItemID(key["id"].asUUID());
}
if (key.has("object"))
{
mSidepanelItemInfo->setObjectID(key["object"].asUUID());
mItemPanel->setObjectID(key["object"].asUUID());
}
toggleItemInfoPanel(TRUE);
@ -114,8 +118,8 @@ void LLSidepanelInventory::onInfoButtonClicked()
LLInventoryItem *item = getSelectedItem();
if (item)
{
mSidepanelItemInfo->reset();
mSidepanelItemInfo->setItemID(item->getUUID());
mItemPanel->reset();
mItemPanel->setItemID(item->getUUID());
toggleItemInfoPanel(TRUE);
}
}
@ -126,13 +130,13 @@ void LLSidepanelInventory::onShareButtonClicked()
void LLSidepanelInventory::performActionOnSelection(const std::string &action)
{
LLInventoryPanel *panel = mPanelMainInventory->getActivePanel();
LLFolderViewItem* current_item = panel->getRootFolder()->getCurSelectedItem();
LLPanelMainInventory *panel_main_inventory = mInventoryPanel->getChild<LLPanelMainInventory>("panel_main_inventory");
LLFolderViewItem* current_item = panel_main_inventory->getActivePanel()->getRootFolder()->getCurSelectedItem();
if (!current_item)
{
return;
}
current_item->getListener()->performAction(panel->getRootFolder(), panel->getModel(), action);
current_item->getListener()->performAction(panel_main_inventory->getActivePanel()->getRootFolder(), panel_main_inventory->getActivePanel()->getModel(), action);
}
void LLSidepanelInventory::onWearButtonClicked()
@ -168,17 +172,18 @@ void LLSidepanelInventory::onSelectionChange(const std::deque<LLFolderViewItem*>
void LLSidepanelInventory::toggleItemInfoPanel(BOOL visible)
{
mSidepanelItemInfo->setVisible(visible);
mTabContainer->setVisible(!visible);
mItemPanel->setVisible(visible);
mInventoryPanel->setVisible(!visible);
if (visible)
{
mSidepanelItemInfo->dirty();
mSidepanelItemInfo->setEditMode(FALSE);
mItemPanel->dirty();
mItemPanel->setEditMode(FALSE);
/*
LLRect rect = getRect();
LLRect new_rect = LLRect(rect.mLeft, rect.mTop, rect.mRight, mTabContainer->getRect().mBottom);
mSidepanelItemInfo->reshape(new_rect.getWidth(),new_rect.getHeight());
LLRect new_rect = LLRect(rect.mLeft, rect.mTop, rect.mRight, mInventoryPanel->getRect().mBottom);
mItemPanel->reshape(new_rect.getWidth(),new_rect.getHeight());
*/
}
}
@ -226,7 +231,8 @@ void LLSidepanelInventory::updateVerbs()
LLInventoryItem *LLSidepanelInventory::getSelectedItem()
{
LLFolderViewItem* current_item = mPanelMainInventory->getActivePanel()->getRootFolder()->getCurSelectedItem();
LLPanelMainInventory *panel_main_inventory = mInventoryPanel->getChild<LLPanelMainInventory>("panel_main_inventory");
LLFolderViewItem* current_item = panel_main_inventory->getActivePanel()->getRootFolder()->getCurSelectedItem();
if (!current_item)
{
return NULL;

6
indra/newview/llsidepanelinventory.h
View File

@ -36,7 +36,6 @@
class LLInventoryItem;
class LLSidepanelItemInfo;
class LLTabContainer;
class LLPanelMainInventory;
class LLFolderViewItem;
@ -78,9 +77,8 @@ private:
LLButton* mTeleportBtn;
LLButton* mOverflowBtn;
LLTabContainer* mTabContainer;
LLSidepanelItemInfo* mSidepanelItemInfo;
LLPanelMainInventory* mPanelMainInventory;
LLPanel* mInventoryPanel; // Main inventory view
LLSidepanelItemInfo* mItemPanel; // Individual item view
};
#endif //LL_LLSIDEPANELINVENTORY_H

830
indra/newview/skins/default/xui/en/panel_main_inventory.xml
View File

@ -1,415 +1,415 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
label="Things"
layout="topleft"
min_height="350"
min_width="240"
name="inventory panel"
width="330">
<panel.string
name="Title">
Things
</panel.string>
<filter_editor
text_pad_left="12"
follows="left|top|right"
font="SanSerif"
height="20"
label="Filter"
layout="topleft"
left="15"
name="inventory search editor"
top="34"
width="300" />
<tab_container
follows="left|top|right|bottom"
height="300"
layout="topleft"
left_delta="-4"
name="inventory filter tabs"
tab_position="top"
top_pad="4"
width="305">
<inventory_panel
follows="left|top|right|bottom"
height="295"
label="All Items"
layout="topleft"
left="1"
name="All Items"
top="16"
width="290" />
<inventory_panel
follows="left|top|right|bottom"
height="295"
label="Recent Items"
layout="topleft"
left_delta="0"
name="Recent Items"
top_delta="0"
width="290" />
</tab_container>
<menu_bar
bg_visible="false"
follows="left|top|right"
height="18"
layout="topleft"
left_delta="0"
mouse_opaque="false"
name="Inventory Menu"
top_delta="-45"
width="290">
<menu
height="101"
label="File"
layout="topleft"
left="0"
mouse_opaque="false"
name="File"
tear_off="true"
top="-117"
width="128">
<menu_item_call
label="Open"
layout="topleft"
name="Open">
<menu_item_call.on_click
function="Inventory.DoToSelected"
parameter="open" />
</menu_item_call>
<menu
create_jump_keys="true"
label="Upload"
layout="topleft"
name="upload"
tear_off="true">
<menu_item_call
label="Image (L$[COST])..."
layout="topleft"
name="Upload Image"
shortcut="control|U">
<menu_item_call.on_click
function="File.UploadImage"
parameter="" />
<menu_item_call.on_enable
function="File.EnableUpload" />
</menu_item_call>
<menu_item_call
label="Sound (L$[COST])..."
layout="topleft"
name="Upload Sound">
<menu_item_call.on_click
function="File.UploadSound"
parameter="" />
<menu_item_call.on_enable
function="File.EnableUpload" />
</menu_item_call>
<menu_item_call
label="Animation (L$[COST])..."
layout="topleft"
name="Upload Animation">
<menu_item_call.on_click
function="File.UploadAnim"
parameter="" />
<menu_item_call.on_enable
function="File.EnableUpload" />
</menu_item_call>
<menu_item_call
label="Bulk (L$[COST] per file)..."
layout="topleft"
name="Bulk Upload">
<menu_item_call.on_click
function="File.UploadBulk"
parameter="" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
</menu>
<menu_item_separator
layout="topleft" />
<menu_item_call
label="New Window"
layout="topleft"
name="New Window">
<menu_item_call.on_click
function="Inventory.NewWindow" />
</menu_item_call>
<menu_item_separator
layout="topleft"
name="separator2" />
<menu_item_call
label="Show Filters"
layout="topleft"
name="Show Filters">
<menu_item_call.on_click
function="Inventory.ShowFilters" />
</menu_item_call>
<menu_item_call
label="Reset Filters"
layout="topleft"
name="Reset Current">
<menu_item_call.on_click
function="Inventory.ResetFilter" />
</menu_item_call>
<menu_item_call
label="Close All Folders"
layout="topleft"
name="Close All Folders">
<menu_item_call.on_click
function="Inventory.CloseAllFolders" />
</menu_item_call>
<menu_item_separator
layout="topleft"
name="separator3" />
<menu_item_call
label="Empty Trash"
layout="topleft"
name="Empty Trash">
<menu_item_call.on_click
function="Inventory.EmptyTrash" />
</menu_item_call>
<menu_item_call
label="Empty Lost And Found"
layout="topleft"
name="Empty Lost And Found">
<menu_item_call.on_click
function="Inventory.EmptyLostAndFound" />
</menu_item_call>
</menu>
<menu
height="121"
label="Create"
layout="topleft"
left="0"
mouse_opaque="false"
name="Create"
tear_off="true"
top="-201"
width="121">
<menu_item_call
label="New Folder"
layout="topleft"
name="New Folder">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="category" />
</menu_item_call>
<menu_item_call
label="New Script"
layout="topleft"
name="New Script">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="lsl" />
</menu_item_call>
<menu_item_call
label="New Note"
layout="topleft"
name="New Note">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="notecard" />
</menu_item_call>
<menu_item_call
label="New Gesture"
layout="topleft"
name="New Gesture">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="gesture" />
</menu_item_call>
<menu
height="175"
label="New Clothes"
layout="topleft"
left_delta="0"
mouse_opaque="false"
name="New Clothes"
top_pad="514"
width="125">
<menu_item_call
label="New Shirt"
layout="topleft"
name="New Shirt">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="shirt" />
</menu_item_call>
<menu_item_call
label="New Pants"
layout="topleft"
name="New Pants">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="pants" />
</menu_item_call>
<menu_item_call
label="New Shoes"
layout="topleft"
name="New Shoes">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="shoes" />
</menu_item_call>
<menu_item_call
label="New Socks"
layout="topleft"
name="New Socks">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="socks" />
</menu_item_call>
<menu_item_call
label="New Jacket"
layout="topleft"
name="New Jacket">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="jacket" />
</menu_item_call>
<menu_item_call
label="New Skirt"
layout="topleft"
name="New Skirt">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="skirt" />
</menu_item_call>
<menu_item_call
label="New Gloves"
layout="topleft"
name="New Gloves">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="gloves" />
</menu_item_call>
<menu_item_call
label="New Undershirt"
layout="topleft"
name="New Undershirt">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="undershirt" />
</menu_item_call>
<menu_item_call
label="New Underpants"
layout="topleft"
name="New Underpants">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="underpants" />
</menu_item_call>
<menu_item_call
label="New Alpha"
layout="topleft"
name="New Alpha">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="alpha" />
</menu_item_call>
<menu_item_call
label="New Tattoo"
layout="topleft"
name="New Tattoo">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="tattoo" />
</menu_item_call>
</menu>
<menu
height="85"
label="New Body Parts"
layout="topleft"
left_delta="0"
mouse_opaque="false"
name="New Body Parts"
top_pad="514"
width="118">
<menu_item_call
label="New Shape"
layout="topleft"
name="New Shape">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="shape" />
</menu_item_call>
<menu_item_call
label="New Skin"
layout="topleft"
name="New Skin">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="skin" />
</menu_item_call>
<menu_item_call
label="New Hair"
layout="topleft"
name="New Hair">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="hair" />
</menu_item_call>
<menu_item_call
label="New Eyes"
layout="topleft"
name="New Eyes">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="eyes" />
</menu_item_call>
</menu>
</menu>
<menu
height="49"
label="Sort"
layout="topleft"
left="0"
mouse_opaque="false"
name="Sort"
tear_off="true"
top="-113"
width="118">
<menu_item_check
control_name="Inventory.SortByName"
label="By Name"
layout="topleft"
name="By Name">
<menu_item_check.on_click
function="Inventory.SetSortBy"
parameter="name" />
</menu_item_check>
<menu_item_check
control_name="Inventory.SortByDate"
label="By Date"
layout="topleft"
name="By Date">
<menu_item_check.on_click
function="Inventory.SetSortBy"
parameter="date" />
</menu_item_check>
<menu_item_separator
layout="topleft" />
<menu_item_check
control_name="Inventory.FoldersAlwaysByName"
label="Folders Always By Name"
layout="topleft"
name="Folders Always By Name">
<menu_item_check.on_click
function="Inventory.SetSortBy"
parameter="foldersalwaysbyname" />
</menu_item_check>
<menu_item_check
control_name="Inventory.SystemFoldersToTop"
label="System Folders To Top"
layout="topleft"
name="System Folders To Top">
<menu_item_check.on_click
function="Inventory.SetSortBy"
parameter="systemfolderstotop" />
</menu_item_check>
</menu>
</menu_bar>
</panel>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
label="Things"
layout="topleft"
min_height="350"
min_width="240"
name="main inventory panel"
width="330">
<panel.string
name="Title">
Things
</panel.string>
<filter_editor
text_pad_left="12"
follows="left|top|right"
font="SanSerif"
height="20"
label="Filter"
layout="topleft"
left="15"
name="inventory search editor"
top="34"
width="300" />
<tab_container
follows="left|top|right|bottom"
height="300"
layout="topleft"
left_delta="-4"
name="inventory filter tabs"
tab_position="top"
top_pad="4"
width="305">
<inventory_panel
follows="left|top|right|bottom"
height="295"
label="All Items"
layout="topleft"
left="1"
name="All Items"
top="16"
width="290" />
<inventory_panel
follows="left|top|right|bottom"
height="295"
label="Recent Items"
layout="topleft"
left_delta="0"
name="Recent Items"
top_delta="0"
width="290" />
</tab_container>
<menu_bar
bg_visible="false"
follows="left|top|right"
height="18"
layout="topleft"
left_delta="0"
mouse_opaque="false"
name="Inventory Menu"
top_delta="-45"
width="290">
<menu
height="101"
label="File"
layout="topleft"
left="0"
mouse_opaque="false"
name="File"
tear_off="true"
top="-117"
width="128">
<menu_item_call
label="Open"
layout="topleft"
name="Open">
<menu_item_call.on_click
function="Inventory.DoToSelected"
parameter="open" />
</menu_item_call>
<menu
create_jump_keys="true"
label="Upload"
layout="topleft"
name="upload"
tear_off="true">
<menu_item_call
label="Image (L$[COST])..."
layout="topleft"
name="Upload Image"
shortcut="control|U">
<menu_item_call.on_click
function="File.UploadImage"
parameter="" />
<menu_item_call.on_enable
function="File.EnableUpload" />
</menu_item_call>
<menu_item_call
label="Sound (L$[COST])..."
layout="topleft"
name="Upload Sound">
<menu_item_call.on_click
function="File.UploadSound"
parameter="" />
<menu_item_call.on_enable
function="File.EnableUpload" />
</menu_item_call>
<menu_item_call
label="Animation (L$[COST])..."
layout="topleft"
name="Upload Animation">
<menu_item_call.on_click
function="File.UploadAnim"
parameter="" />
<menu_item_call.on_enable
function="File.EnableUpload" />
</menu_item_call>
<menu_item_call
label="Bulk (L$[COST] per file)..."
layout="topleft"
name="Bulk Upload">
<menu_item_call.on_click
function="File.UploadBulk"
parameter="" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
</menu>
<menu_item_separator
layout="topleft" />
<menu_item_call
label="New Window"
layout="topleft"
name="New Window">
<menu_item_call.on_click
function="Inventory.NewWindow" />
</menu_item_call>
<menu_item_separator
layout="topleft"
name="separator2" />
<menu_item_call
label="Show Filters"
layout="topleft"
name="Show Filters">
<menu_item_call.on_click
function="Inventory.ShowFilters" />
</menu_item_call>
<menu_item_call
label="Reset Filters"
layout="topleft"
name="Reset Current">
<menu_item_call.on_click
function="Inventory.ResetFilter" />
</menu_item_call>
<menu_item_call
label="Close All Folders"
layout="topleft"
name="Close All Folders">
<menu_item_call.on_click
function="Inventory.CloseAllFolders" />
</menu_item_call>
<menu_item_separator
layout="topleft"
name="separator3" />
<menu_item_call
label="Empty Trash"
layout="topleft"
name="Empty Trash">
<menu_item_call.on_click
function="Inventory.EmptyTrash" />
</menu_item_call>
<menu_item_call
label="Empty Lost And Found"
layout="topleft"
name="Empty Lost And Found">
<menu_item_call.on_click
function="Inventory.EmptyLostAndFound" />
</menu_item_call>
</menu>
<menu
height="121"
label="Create"
layout="topleft"
left="0"
mouse_opaque="false"
name="Create"
tear_off="true"
top="-201"
width="121">
<menu_item_call
label="New Folder"
layout="topleft"
name="New Folder">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="category" />
</menu_item_call>
<menu_item_call
label="New Script"
layout="topleft"
name="New Script">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="lsl" />
</menu_item_call>
<menu_item_call
label="New Note"
layout="topleft"
name="New Note">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="notecard" />
</menu_item_call>
<menu_item_call
label="New Gesture"
layout="topleft"
name="New Gesture">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="gesture" />
</menu_item_call>
<menu
height="175"
label="New Clothes"
layout="topleft"
left_delta="0"
mouse_opaque="false"
name="New Clothes"
top_pad="514"
width="125">
<menu_item_call
label="New Shirt"
layout="topleft"
name="New Shirt">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="shirt" />
</menu_item_call>
<menu_item_call
label="New Pants"
layout="topleft"
name="New Pants">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="pants" />
</menu_item_call>
<menu_item_call
label="New Shoes"
layout="topleft"
name="New Shoes">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="shoes" />
</menu_item_call>
<menu_item_call
label="New Socks"
layout="topleft"
name="New Socks">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="socks" />
</menu_item_call>
<menu_item_call
label="New Jacket"
layout="topleft"
name="New Jacket">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="jacket" />
</menu_item_call>
<menu_item_call
label="New Skirt"
layout="topleft"
name="New Skirt">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="skirt" />
</menu_item_call>
<menu_item_call
label="New Gloves"
layout="topleft"
name="New Gloves">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="gloves" />
</menu_item_call>
<menu_item_call
label="New Undershirt"
layout="topleft"
name="New Undershirt">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="undershirt" />
</menu_item_call>
<menu_item_call
label="New Underpants"
layout="topleft"
name="New Underpants">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="underpants" />
</menu_item_call>
<menu_item_call
label="New Alpha"
layout="topleft"
name="New Alpha">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="alpha" />
</menu_item_call>
<menu_item_call
label="New Tattoo"
layout="topleft"
name="New Tattoo">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="tattoo" />
</menu_item_call>
</menu>
<menu
height="85"
label="New Body Parts"
layout="topleft"
left_delta="0"
mouse_opaque="false"
name="New Body Parts"
top_pad="514"
width="118">
<menu_item_call
label="New Shape"
layout="topleft"
name="New Shape">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="shape" />
</menu_item_call>
<menu_item_call
label="New Skin"
layout="topleft"
name="New Skin">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="skin" />
</menu_item_call>
<menu_item_call
label="New Hair"
layout="topleft"
name="New Hair">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="hair" />
</menu_item_call>
<menu_item_call
label="New Eyes"
layout="topleft"
name="New Eyes">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="eyes" />
</menu_item_call>
</menu>
</menu>
<menu
height="49"
label="Sort"
layout="topleft"
left="0"
mouse_opaque="false"
name="Sort"
tear_off="true"
top="-113"
width="118">
<menu_item_check
control_name="Inventory.SortByName"
label="By Name"
layout="topleft"
name="By Name">
<menu_item_check.on_click
function="Inventory.SetSortBy"
parameter="name" />
</menu_item_check>
<menu_item_check
control_name="Inventory.SortByDate"
label="By Date"
layout="topleft"
name="By Date">
<menu_item_check.on_click
function="Inventory.SetSortBy"
parameter="date" />
</menu_item_check>
<menu_item_separator
layout="topleft" />
<menu_item_check
control_name="Inventory.FoldersAlwaysByName"
label="Folders Always By Name"
layout="topleft"
name="Folders Always By Name">
<menu_item_check.on_click
function="Inventory.SetSortBy"
parameter="foldersalwaysbyname" />
</menu_item_check>
<menu_item_check
control_name="Inventory.SystemFoldersToTop"
label="System Folders To Top"
layout="topleft"
name="System Folders To Top">
<menu_item_check.on_click
function="Inventory.SetSortBy"
parameter="systemfolderstotop" />
</menu_item_check>
</menu>
</menu_bar>
</panel>

225
indra/newview/skins/default/xui/en/sidepanel_inventory.xml
View File

@ -1,122 +1,113 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
label="Things"
layout="topleft"
min_height="350"
min_width="240"
name="objects panel"
width="333">
<tab_container
follows="all"
height="390"
layout="topleft"
left="9"
name="Inventory Tabs"
tab_position="top"
top="0"
width="313"
tab_height="0"
visible="true">
background_visible="true"
follows="all"
height="570"
label="Things"
layout="topleft"
min_height="350"
min_width="240"
name="objects panel"
width="333">
<panel
class="panel_main_inventory"
filename="panel_main_inventory.xml"
follows="all"
layout="topleft"
left="0"
name="panel_main_inventory"
top="15"
label=""
height="330"
width="467">
<panel
height="25"
layout="bottomright"
left="0"
help_topic="item_button_tab"
name="button_panel"
bottom="0"
width="313">
<button
enabled="true"
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Info"
layout="topleft"
left="0"
name="info_btn"
top="0"
width="60" />
<button
enabled="true"
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Share"
layout="topleft"
left_pad="5"
name="share_btn"
top="0"
width="60" />
<button
enabled="false"
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Wear"
layout="topleft"
left="130"
name="wear_btn"
top="0"
width="60" />
<button
enabled="false"
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Play"
layout="topleft"
name="play_btn"
left="130"
top="0"
width="50" />
<button
enabled="false"
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Teleport"
layout="topleft"
left="130"
name="teleport_btn"
top="0"
width="77" />
<button
follows="bottom|right"
font="SansSerifSmallBold"
height="25"
label="v"
layout="topleft"
name="overflow_btn"
right="-10"
top="0"
width="30" />
</panel>
</panel>
</tab_container>
follows="all"
layout="topleft"
left="0"
name="sidepanel__inventory_panel"
top="0"
label=""
height="570"
visible="true"
width="330">
<panel
class="panel_main_inventory"
filename="panel_main_inventory.xml"
follows="all"
layout="topleft"
left="0"
name="panel_main_inventory"
top="0"
label=""
height="500"
width="330" />
<panel
height="25"
layout="bottomright"
help_topic="item_button_tab"
name="button_panel"
left="5"
bottom="5"
width="313">
<button
enabled="true"
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Info"
layout="topleft"
left="0"
name="info_btn"
top="0"
width="60" />
<button
enabled="true"
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Share"
layout="topleft"
left_pad="5"
name="share_btn"
top="0"
width="60" />
<button
enabled="false"
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Wear"
layout="topleft"
left="130"
name="wear_btn"
top="0"
width="60" />
<button
enabled="false"
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Play"
layout="topleft"
name="play_btn"
left="130"
top="0"
width="50" />
<button
enabled="false"
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Teleport"
layout="topleft"
left="130"
name="teleport_btn"
top="0"
width="77" />
</panel>
</panel>
<panel
follows="all"
layout="topleft"
left="0"
class="sidepanel_item_info"
filename="sidepanel_item_info.xml"
name="sidepanel__item_panel"
top="0"
label=""
height="570"
visible="false"
width="330">
</panel>
<panel
class="sidepanel_item_info"
filename="sidepanel_item_info.xml"
follows="all"
height="360"
layout="topleft"
left="0"
help_topic="item_info_tab"
name="sidepanel_item_info"
top="30"
visible="false" />
</panel>

35
indra/newview/skins/default/xui/en/sidepanel_item_info.xml
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
auto_tile="true"
height="560"
height="570"
layout="topleft"
name="item properties"
help_topic="item_properties"
save_rect="true"
title="Inventory Item Properties"
width="325">
width="333">
<panel.string
name="unknown">
(unknown)
@ -49,28 +49,15 @@
tab_stop="false"
top="0"
width="25" />
<tab_container
follows="all"
height="450"
layout="topleft"
left="10"
name="tabs"
tab_min_width="70"
tab_height="0"
tab_position="top"
top_pad="10"
width="313">
<panel
follows="all"
height="500"
height="450"
label=""
layout="topleft"
left="0"
left="5"
help_topic="people_nearby_tab"
name="nearby_panel"
top="0"
border="1"
top="30"
width="313">
<text
type="string"
@ -487,22 +474,22 @@
Price: L$
</text-->
</panel>
</tab_container>
<panel
height="25"
layout="bottomright"
left="0"
help_topic="places_button_tab"
help_topic="button_tab"
name="button_panel"
left="5"
bottom="5"
width="325">
width="313">
<button
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Edit"
layout="topleft"
left="10"
left="0"
name="edit_btn"
top="0"
width="50" />
@ -513,7 +500,7 @@
label="Cancel"
layout="topleft"
name="cancel_btn"
right="-10"
right="-1"
top="0"
width="70" />
<button