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

merge from PE's viewer-public

meow-7.2.2
Tofu Linden 2010-07-19 09:13:05 +01:00
parent b73ef2f338 c754951397
commit f1c9e56e93
15 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/llaccordionctrltab.cpp
View File

@ -358,6 +358,7 @@ LLAccordionCtrlTab::LLAccordionCtrlTab(const LLAccordionCtrlTab::Params&p)
,mPaddingBottom(p.padding_bottom)
,mCanOpenClose(true)
,mFitPanel(p.fit_panel)
,mSelectionEnabled(p.selection_enabled)
,mContainerPanel(NULL)
,mScrollbar(NULL)
{
@ -371,7 +372,7 @@ LLAccordionCtrlTab::LLAccordionCtrlTab(const LLAccordionCtrlTab::Params&p)
mHeader = LLUICtrlFactory::create<LLAccordionCtrlTabHeader>(headerParams);
addChild(mHeader, 1);
if (p.selection_enabled)
if (mSelectionEnabled)
{
LLFocusableElement::setFocusReceivedCallback(boost::bind(&LLAccordionCtrlTab::selectOnFocusReceived, this));
}
@ -797,7 +798,7 @@ void LLAccordionCtrlTab::showAndFocusHeader()
{
LLAccordionCtrlTabHeader* header = getChild<LLAccordionCtrlTabHeader>(DD_HEADER_NAME);
header->setFocus(true);
header->setSelected(true);
header->setSelected(mSelectionEnabled);
LLRect screen_rc;
LLRect selected_rc = header->getRect();

2
indra/llui/llaccordionctrltab.h
View File

@ -241,6 +241,8 @@ private:
bool mStoredOpenCloseState;
bool mWasStateStored;
bool mSelectionEnabled;
LLScrollbar* mScrollbar;
LLView* mContainerPanel;

8
indra/newview/llcofwearables.cpp
View File

@ -163,7 +163,7 @@ public:
}
protected:
static void replaceWearable()
static void replaceWearable(const LLUUID& item_id)
{
// *TODO: Most probable that accessing to LLPanelOutfitEdit instance should be:
// LLSideTray::getInstance()->getSidepanelAppearance()->getPanelOutfitEdit()
@ -175,7 +175,7 @@ protected:
"panel_outfit_edit"));
if (panel_outfit_edit != NULL)
{
panel_outfit_edit->showAddWearablesPanel(true);
panel_outfit_edit->onReplaceMenuItemClicked(item_id);
}
}
@ -187,7 +187,7 @@ protected:
functor_t take_off = boost::bind(&LLAppearanceMgr::removeItemFromAvatar, LLAppearanceMgr::getInstance(), _1);
registrar.add("Clothing.TakeOff", boost::bind(handleMultiple, take_off, mUUIDs));
registrar.add("Clothing.Replace", boost::bind(replaceWearable));
registrar.add("Clothing.Replace", boost::bind(replaceWearable, selected_id));
registrar.add("Clothing.Edit", boost::bind(LLAgentWearables::editWearable, selected_id));
registrar.add("Clothing.Create", boost::bind(&CofClothingContextMenu::createNew, this, selected_id));
@ -244,7 +244,7 @@ protected:
// *HACK* need to pass pointer to LLPanelOutfitEdit instead of LLSideTray::getInstance()->getPanel().
// LLSideTray::getInstance()->getPanel() is rather slow variant
LLPanelOutfitEdit* panel_oe = dynamic_cast<LLPanelOutfitEdit*>(LLSideTray::getInstance()->getPanel("panel_outfit_edit"));
registrar.add("BodyPart.Replace", boost::bind(&LLPanelOutfitEdit::onReplaceBodyPartMenuItemClicked, panel_oe, selected_id));
registrar.add("BodyPart.Replace", boost::bind(&LLPanelOutfitEdit::onReplaceMenuItemClicked, panel_oe, selected_id));
registrar.add("BodyPart.Edit", boost::bind(LLAgentWearables::editWearable, selected_id));
registrar.add("BodyPart.Create", boost::bind(&CofBodyPartContextMenu::createNew, this, selected_id));

3
indra/newview/llexpandabletextbox.cpp
View File

@ -34,6 +34,7 @@
#include "llexpandabletextbox.h"
#include "llscrollcontainer.h"
#include "lltrans.h"
#include "llwindow.h"
#include "llviewerwindow.h"
@ -117,7 +118,7 @@ LLExpandableTextBox::LLTextBoxEx::Params::Params()
LLExpandableTextBox::LLTextBoxEx::LLTextBoxEx(const Params& p)
: LLTextEditor(p),
mExpanderLabel(p.label),
mExpanderLabel(p.label.isProvided() ? p.label : LLTrans::getString("More")),
mExpanderVisible(false)
{
setIsChrome(TRUE);

4
indra/newview/llpanelmaininventory.cpp
View File

@ -45,6 +45,7 @@
#include "llinventorypanel.h"
#include "llfiltereditor.h"
#include "llfloaterreg.h"
#include "lloutfitobserver.h"
#include "llpreviewtexture.h"
#include "llresmgr.h"
#include "llscrollcontainer.h"
@ -919,6 +920,9 @@ void LLPanelMainInventory::initListCommandsHandlers()
mEnableCallbackRegistrar.add("Inventory.GearDefault.Enable", boost::bind(&LLPanelMainInventory::isActionEnabled, this, _2));
mMenuGearDefault = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_inventory_gear_default.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
mMenuAdd = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_inventory_add.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
// Update the trash button when selected item(s) get worn or taken off.
LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&LLPanelMainInventory::updateListCommands, this));
}
void LLPanelMainInventory::updateListCommands()

4
indra/newview/llpaneloutfitedit.cpp
View File

@ -746,11 +746,11 @@ void LLPanelOutfitEdit::onAddWearableClicked(void)
}
}
void LLPanelOutfitEdit::onReplaceBodyPartMenuItemClicked(LLUUID selected_item_id)
void LLPanelOutfitEdit::onReplaceMenuItemClicked(LLUUID selected_item_id)
{
LLViewerInventoryItem* item = gInventory.getLinkedItem(selected_item_id);
if (item && item->getType() == LLAssetType::AT_BODYPART)
if (item)
{
showFilteredWearablesListView(item->getWearableType());
}

2
indra/newview/llpaneloutfitedit.h
View File

@ -170,7 +170,7 @@ public:
void onRemoveFromOutfitClicked(void);
void onEditWearableClicked(void);
void onAddWearableClicked(void);
void onReplaceBodyPartMenuItemClicked(LLUUID selected_item_id);
void onReplaceMenuItemClicked(LLUUID selected_item_id);
void onShopButtonClicked();
void displayCurrentOutfit();

1
indra/newview/skins/default/xui/en/floater_event.xml
View File

@ -244,7 +244,6 @@
layout="topleft"
left="6"
name="event_desc"
textbox.label="More"
width="322">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</expandable_text>
</layout_panel>

1
indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
View File

@ -65,7 +65,6 @@
left="103"
name="description"
textbox.max_length="1024"
textbox.label="More"
textbox.show_context_menu="false"
top_pad="0"
width="178"

1
indra/newview/skins/default/xui/en/panel_landmark_info.xml
View File

@ -139,7 +139,6 @@
layout="topleft"
left="10"
name="description"
textbox.label="More"
top_pad="10"
value="Du waltz die spritz"
width="280" />

3
indra/newview/skins/default/xui/en/panel_my_profile.xml
View File

@ -118,7 +118,6 @@
layout="topleft"
left="107"
textbox.max_length="512"
textbox.label="More"
textbox.show_context_menu="true"
name="sl_description_edit"
top_pad="-3"
@ -174,7 +173,6 @@
layout="topleft"
left="107"
textbox.max_length="512"
textbox.label="More"
textbox.show_context_menu="true"
name="fl_description_edit"
top_pad="-3"
@ -316,7 +314,6 @@
name="sl_groups"
top_pad="0"
translate="false"
textbox.label="More"
textbox.show_context_menu="true"
width="298"
expanded_bg_visible="true"

1
indra/newview/skins/default/xui/en/panel_pick_list_item.xml
View File

@ -65,7 +65,6 @@
left="103"
name="picture_descr"
textbox.max_length="1024"
textbox.label="More"
textbox.show_context_menu="false"
top_pad="0"
width="178"

1
indra/newview/skins/default/xui/en/panel_place_profile.xml
View File

@ -293,7 +293,6 @@
layout="topleft"
left="5"
name="description"
textbox.label="More"
top_pad="10"
value="Du waltz die spritz"
width="300" />

3
indra/newview/skins/default/xui/en/panel_profile.xml
View File

@ -108,7 +108,6 @@
layout="topleft"
left="107"
textbox.max_length="512"
textbox.label="More"
textbox.show_context_menu="true"
name="sl_description_edit"
top_pad="-3"
@ -155,7 +154,6 @@
layout="topleft"
left="107"
textbox.max_length="512"
textbox.label="More"
textbox.show_context_menu="true"
name="fl_description_edit"
top_pad="-3"
@ -295,7 +293,6 @@
left="7"
name="sl_groups"
textbox.max_length="512"
textbox.label="More"
textbox.show_context_menu="true"
top_pad="0"
translate="false"

1
indra/newview/skins/default/xui/en/widgets/expandable_text.xml
View File

@ -5,7 +5,6 @@
parse_urls="true"
allow_scroll="true"
bg_visible="false"
label="More"
follows="left|top|right"
name="text"
read_only="true"