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

SH-4035: Hooked up logic to handle 'me->appearance'. Refactored out some commonly used code in llfloatersidepanelcontainer

master
prep@lindenlab.com 2013-05-13 11:54:37 -05:00
parent c542c275ac
commit 69df2f1b04
4 changed files with 87 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
indra/newview/llfloatersidepanelcontainer.cpp
View File

@ -56,30 +56,11 @@ BOOL LLFloaterSidePanelContainer::postBuild()
}
void LLFloaterSidePanelContainer::onConfirmationClose( const LLSD &confirm )
{
/*
LLPanelOutfitEdit* panel_outfit_edit = dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::getPanel("appearance", "panel_outfit_edit"));
if (panel_outfit_edit)
{
LLFloater *parent = gFloaterView->getParentFloater(panel_outfit_edit);
if (parent == this )
{
LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
panel_appearance->onClose(this);
}
else
{
LLFloater::onClickCloseBtn();
}
}
else
{
LLFloater::onClickCloseBtn();
}
*/
{
onClickCloseBtn();
}
LLFloaterSidePanelContainer::~LLFloaterSidePanelContainer()
{
LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::GLOBAL, this);
@ -92,20 +73,10 @@ void LLFloaterSidePanelContainer::onOpen(const LLSD& key)
void LLFloaterSidePanelContainer::onClickCloseBtn()
{
LLPanelOutfitEdit* panel_outfit_edit =
dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::getPanel("appearance", "panel_outfit_edit"));
if (panel_outfit_edit)
LLSidepanelAppearance* panel = getSidePanelAppearance();
if ( panel )
{
LLFloater *parent = gFloaterView->getParentFloater(panel_outfit_edit);
if (parent == this )
{
LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
panel_appearance->onClose(this);
}
else
{
LLFloater::onClickCloseBtn();
}
panel->onClose( this );
}
else
{
@ -114,7 +85,7 @@ void LLFloaterSidePanelContainer::onClickCloseBtn()
}
void LLFloaterSidePanelContainer::close()
{
LLFloater::onClickCloseBtn();
LLFloater::onClickCloseBtn();
}
LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_name, const LLSD& params)
@ -124,7 +95,7 @@ LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_na
if (!getVisible())
{
openFloater();
openFloater();
}
LLPanel* panel = NULL;
@ -145,10 +116,30 @@ LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_na
void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const LLSD& key)
{
LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
//If we're already open then check whether anything is dirty
LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
if (floaterp)
{
floaterp->openChildPanel(sMainPanelName, key);
if ( floaterp->getVisible() )
{
LLSidepanelAppearance* panel = floaterp->getSidePanelAppearance();
if ( panel )
{
if ( panel->checkForDirtyEdits() )
{
panel->onClickConfirmExitWithoutSaveIntoAppearance();
}
else
{
//or a call into some new f() that just shows inv panel?
floaterp->openChildPanel(sMainPanelName, key);
}
}
}
else
{
floaterp->openChildPanel(sMainPanelName, key);
}
}
}
@ -172,3 +163,19 @@ LLPanel* LLFloaterSidePanelContainer::getPanel(const std::string& floater_name,
return NULL;
}
LLSidepanelAppearance* LLFloaterSidePanelContainer::getSidePanelAppearance()
{
LLSidepanelAppearance* panel_appearance = NULL;
LLPanelOutfitEdit* panel_outfit_edit = dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::getPanel("appearance", "panel_outfit_edit"));
if (panel_outfit_edit)
{
LLFloater *parent = gFloaterView->getParentFloater(panel_outfit_edit);
if (parent == this )
{
panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
}
}
return panel_appearance;
}

5
indra/newview/llfloatersidepanelcontainer.h
View File

@ -30,6 +30,8 @@
#include "llfloater.h"
class LLSidepanelAppearance;
/**
* Class LLFloaterSidePanelContainer
*
@ -81,6 +83,9 @@ public:
}
return panel;
}
private:
LLSidepanelAppearance* getSidePanelAppearance();
};
#endif // LL_LLFLOATERSIDEPANELCONTAINER_H

34
indra/newview/llsidepanelappearance.cpp
View File

@ -114,6 +114,35 @@ void LLSidepanelAppearance::onClickConfirmExitWithoutSaveViaClose()
}
}
bool LLSidepanelAppearance::callBackExitWithoutSaveIntoAppearance(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if ( option == 0 )
{
//revert current edits
mEditWearable->revertChanges();
toggleWearableEditPanel(FALSE);
LLVOAvatarSelf::onCustomizeEnd( FALSE );
//mLLFloaterSidePanelContainer->close();
showOutfitsInventoryPanel();
return true;
}
return false;
}
void LLSidepanelAppearance::onClickConfirmExitWithoutSaveIntoAppearance()
{
if ( LLAppearanceMgr::getInstance()->isOutfitDirty() && !LLAppearanceMgr::getInstance()->isOutfitLocked() )
{
LLSidepanelAppearance* pSelf = (LLSidepanelAppearance *)this;
LLNotificationsUtil::add("ConfirmExitWithoutSave", LLSD(), LLSD(), boost::bind(&LLSidepanelAppearance::callBackExitWithoutSaveIntoAppearance,pSelf,_1,_2) );
}
else
{
showOutfitsInventoryPanel();
}
}
void LLSidepanelAppearance::onClickConfirmExitWithoutSaveViaBack()
{
if ( LLAppearanceMgr::getInstance()->isOutfitDirty() && !mSidePanelJustOpened /*&& !LLAppearanceMgr::getInstance()->isOutfitLocked()*/ )
@ -629,3 +658,8 @@ void LLSidepanelAppearance::updateScrollingPanelList()
mEditWearable->updateScrollingPanelList();
}
}
bool LLSidepanelAppearance::checkForDirtyEdits()
{
return ( mEditWearable->isDirty() ) ? true : false;
}

4
indra/newview/llsidepanelappearance.h
View File

@ -73,7 +73,9 @@ public:
void onClickConfirmExitWithoutSaveViaBack();
bool callBackExitWithoutSaveViaClose(const LLSD& notification, const LLSD& response);
void onClickConfirmExitWithoutSaveViaClose();
bool checkForDirtyEdits();
bool callBackExitWithoutSaveIntoAppearance(const LLSD& notification, const LLSD& response);
void onClickConfirmExitWithoutSaveIntoAppearance();
private:
void onFilterEdit(const std::string& search_string);