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

SL-20109: Some small UI tweaks before moving onto the meat of the functionality

master
Callum Prentice 2023-08-11 18:31:21 -07:00
parent 2d39f05cc1
commit abb8d0402c
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llfloaterinventorythumbnailshelper.cpp
View File

@ -62,11 +62,11 @@ BOOL LLFloaterInventoryThumbnailsHelper::postBuild()
mOutputLog = getChild<LLTextEditor>("output_log");
mOutputLog->setMaxTextLength(0xffff * 0x10);
mMergeItemsTexturesBtn = getChild<LLUICtrl>("merge_items_textures");
mMergeItemsTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures, this));
mMergeItemsTexturesBtn->setEnabled(false);
//mMergeItemsTexturesBtn = getChild<LLUICtrl>("merge_items_textures");
//mMergeItemsTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures, this));
//mMergeItemsTexturesBtn->setEnabled(false);
mWriteThumbnailsBtn = getChild<LLUICtrl>("write_items_thumbnails");
mWriteThumbnailsBtn = getChild<LLUICtrl>("write_thumbnails_btn");
mWriteThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onWriteThumbnails, this));
mWriteThumbnailsBtn->setEnabled(false);
@ -158,8 +158,6 @@ void LLFloaterInventoryThumbnailsHelper::onPasteItems()
}
mOutputLog->setCursorAndScrollToEnd();
mMergeItemsTexturesBtn->setEnabled(true);
}
void LLFloaterInventoryThumbnailsHelper::recordTextureItemEntry(LLViewerInventoryItem* item)
@ -240,11 +238,9 @@ void LLFloaterInventoryThumbnailsHelper::onPasteTextures()
}
mOutputLog->setCursorAndScrollToEnd();
mMergeItemsTexturesBtn->setEnabled(true);
}
void LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures()
void LLFloaterInventoryThumbnailsHelper::mergeItemsTextures()
{
mOutputLog->appendText(
STRINGIZE(
@ -320,7 +316,7 @@ void LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures()
#if 1
// *TODO$: LLInventoryCallback should be deprecated to conform to the new boost::bind/coroutine model.
// temp code in transition
void bulkyInventoryCb(LLPointer<LLInventoryCallback> cb, LLUUID id)
void inventoryThumbnailsHelperCb(LLPointer<LLInventoryCallback> cb, LLUUID id)
{
if (cb.notNull())
{
@ -329,7 +325,7 @@ void bulkyInventoryCb(LLPointer<LLInventoryCallback> cb, LLUUID id)
}
#endif
bool writeThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
bool writeInventoryThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
{
if (AISAPI::isAvailable())
{
@ -339,7 +335,7 @@ bool writeThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
LLPointer<LLInventoryCallback> cb;
AISAPI::completion_t cr = boost::bind(&bulkyInventoryCb, cb, _1);
AISAPI::completion_t cr = boost::bind(&inventoryThumbnailsHelperCb, cb, _1);
AISAPI::UpdateItem(item_id, updates, cr);
return true;
@ -382,7 +378,7 @@ void LLFloaterInventoryThumbnailsHelper::onWriteThumbnails()
LLUUID item_id = ((*iter).second).first;
LLUUID thumbnail_asset_id = ((*iter).second).second;
writeThumbnailID(item_id, thumbnail_asset_id);
writeInventoryThumbnailID(item_id, thumbnail_asset_id);
++iter;
}

3
indra/newview/llfloaterinventorythumbnailshelper.h
View File

@ -51,8 +51,7 @@ class LLFloaterInventoryThumbnailsHelper:
LLTextEditor* mOutputLog;
LLUICtrl* mMergeItemsTexturesBtn;
void onMergeItemsTextures();
void mergeItemsTextures();
LLUICtrl* mWriteThumbnailsBtn;
void onWriteThumbnails();

7
indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
View File

@ -38,7 +38,10 @@
left="8"
right="-8"
name="output_log"
width="480"></text_editor>
font="Monospace"
text_color="0.1 0.5 0.1 1.0"
width="480">
</text_editor>
<button
follows="left|bottom"
height="20"
@ -63,7 +66,7 @@
label="Write Thumbnails"
layout="topleft"
left_delta="0"
name="write_items_thumbnails_btn"
name="write_thumbnails_btn"
top_delta="26 "
width="235" />
<button