Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate to boost::bind for a bunch of CommitCallbacks. Converted several static member functions to nonstatic member functions

Browse Source
This commit is contained in:
Shyotl
2012-12-06 17:13:17 -06:00
parent ef6f411b70
commit 26191dd274
27 changed files with 326 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/floaterlocalassetbrowse.cpp
View File

@@ -800,13 +800,13 @@ FloaterLocalAssetBrowser::FloaterLocalAssetBrowser()
mUploadBtn->setClickedCallback( onClickUpload, this);
// combo callback
mTypeComboBox->setCommitCallback(onCommitTypeCombo);
mTypeComboBox->setCommitCallback(boost::bind(&FloaterLocalAssetBrowser::onCommitTypeCombo,this));
// scrolllist callbacks
mBitmapList->setCommitCallback(onChooseBitmapList);
mBitmapList->setCommitCallback(boost::bind(&FloaterLocalAssetBrowser::onChooseBitmapList,this));
// checkbox callbacks
mUpdateChkBox->setCommitCallback(onClickUpdateChkbox);
mUpdateChkBox->setCommitCallback(boost::bind(&FloaterLocalAssetBrowser::onClickUpdateChkbox,this));
}
@@ -857,34 +857,33 @@ void FloaterLocalAssetBrowser::onClickUpload(void* userdata)
}
}
void FloaterLocalAssetBrowser::onChooseBitmapList(LLUICtrl* ctrl, void *userdata)
void FloaterLocalAssetBrowser::onChooseBitmapList()
{
bool button_status = sLFInstance->mBitmapList->isEmpty();
sLFInstance->mDelBtn->setEnabled(!button_status);
sLFInstance->mUploadBtn->setEnabled(!button_status);
bool button_status = mBitmapList->isEmpty();
mDelBtn->setEnabled(!button_status);
mUploadBtn->setEnabled(!button_status);
sLFInstance->UpdateRightSide();
UpdateRightSide();
}
void FloaterLocalAssetBrowser::onClickUpdateChkbox(LLUICtrl *ctrl, void *userdata)
void FloaterLocalAssetBrowser::onClickUpdateChkbox()
{
std::string temp_str = sLFInstance->mBitmapList->getSelectedItemLabel(BITMAPLIST_COL_ID);
std::string temp_str = mBitmapList->getSelectedItemLabel(BITMAPLIST_COL_ID);
if ( !temp_str.empty() )
{
gLocalBrowser->onUpdateBool( (LLUUID)temp_str );
sLFInstance->UpdateRightSide();
UpdateRightSide();
}
}
void FloaterLocalAssetBrowser::onCommitTypeCombo(LLUICtrl* ctrl, void *userdata)
void FloaterLocalAssetBrowser::onCommitTypeCombo()
{
std::string temp_str = sLFInstance->mBitmapList->getSelectedItemLabel(BITMAPLIST_COL_ID);
std::string temp_str = mBitmapList->getSelectedItemLabel(BITMAPLIST_COL_ID);
if ( !temp_str.empty() )
{
S32 selection = sLFInstance->mTypeComboBox->getCurrentIndex();
gLocalBrowser->onSetType( (LLUUID)temp_str, selection );
}
}