From 2d39f05cc1403da307be05edc972d2ebcec6cfc7 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Fri, 11 Aug 2023 18:07:13 -0700 Subject: SL-20109: Now that it seems that the tool might be useful, make a new version with a proper name and start worknig on it. Prototype bulky thumbs one will be removed after new version is working --- indra/newview/llfloaterinventorythumbnailshelper.h | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 indra/newview/llfloaterinventorythumbnailshelper.h (limited to 'indra/newview/llfloaterinventorythumbnailshelper.h') diff --git a/indra/newview/llfloaterinventorythumbnailshelper.h b/indra/newview/llfloaterinventorythumbnailshelper.h new file mode 100644 index 0000000000..69ce3e1fec --- /dev/null +++ b/indra/newview/llfloaterinventorythumbnailshelper.h @@ -0,0 +1,69 @@ +/** + * @file llfloaterinventorythumbnailshelper.h + * @author Callum Prentice + * @brief Helper floater for bulk processing of inventory thumbnails + * + * $LicenseInfo:firstyear=2008&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_LLFLOATERINVENTORYTHUMBNAILSHELPER_H +#define LL_LLFLOATERINVENTORYTHUMBNAILSHELPER_H + +#include "llfloater.h" +class LLTextEditor; +class LLMediaCtrl; +class LLViewerInventoryItem; +class LLUUID; + +class LLFloaterInventoryThumbnailsHelper: + public LLFloater +{ + friend class LLFloaterReg; + private: + LLFloaterInventoryThumbnailsHelper(const LLSD& key); + BOOL postBuild() override; + ~LLFloaterInventoryThumbnailsHelper(); + + LLUICtrl* mPasteItemsBtn; + void onPasteItems(); + + LLUICtrl* mPasteTexturesBtn; + void onPasteTextures(); + + LLTextEditor* mOutputLog; + + LLUICtrl* mMergeItemsTexturesBtn; + void onMergeItemsTextures(); + + LLUICtrl* mWriteThumbnailsBtn; + void onWriteThumbnails(); + + void recordInventoryItemEntry(LLViewerInventoryItem* item); + void recordTextureItemEntry(LLViewerInventoryItem* item); + + std::map mItemNamesIDs; + std::map mTextureNamesIDs; + + std::map> mNameItemIDTextureId; +}; + +#endif // LL_LLFLOATERINVENTORYTHUMBNAILSHELPER_H -- cgit v1.2.3 From abb8d0402c8498dc5ce8dfec1438f2fedbaecce9 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Fri, 11 Aug 2023 18:31:21 -0700 Subject: SL-20109: Some small UI tweaks before moving onto the meat of the functionality --- indra/newview/llfloaterinventorythumbnailshelper.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llfloaterinventorythumbnailshelper.h') diff --git a/indra/newview/llfloaterinventorythumbnailshelper.h b/indra/newview/llfloaterinventorythumbnailshelper.h index 69ce3e1fec..3942214fe1 100644 --- a/indra/newview/llfloaterinventorythumbnailshelper.h +++ b/indra/newview/llfloaterinventorythumbnailshelper.h @@ -51,8 +51,7 @@ class LLFloaterInventoryThumbnailsHelper: LLTextEditor* mOutputLog; - LLUICtrl* mMergeItemsTexturesBtn; - void onMergeItemsTextures(); + void mergeItemsTextures(); LLUICtrl* mWriteThumbnailsBtn; void onWriteThumbnails(); -- cgit v1.2.3 From cf60c97f6f232f97666884ef692779403fb449f8 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Mon, 14 Aug 2023 17:37:10 -0700 Subject: SL-20109: New, helper version coming together slowly modulo XUI pain --- indra/newview/llfloaterinventorythumbnailshelper.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llfloaterinventorythumbnailshelper.h') diff --git a/indra/newview/llfloaterinventorythumbnailshelper.h b/indra/newview/llfloaterinventorythumbnailshelper.h index 3942214fe1..ec83d5b7e0 100644 --- a/indra/newview/llfloaterinventorythumbnailshelper.h +++ b/indra/newview/llfloaterinventorythumbnailshelper.h @@ -30,6 +30,7 @@ #include "llfloater.h" class LLTextEditor; +class LLScrollListCtrl; class LLMediaCtrl; class LLViewerInventoryItem; class LLUUID; @@ -43,6 +44,8 @@ class LLFloaterInventoryThumbnailsHelper: BOOL postBuild() override; ~LLFloaterInventoryThumbnailsHelper(); + LLScrollListCtrl* mInventoryThumbnailsList; + LLUICtrl* mPasteItemsBtn; void onPasteItems(); @@ -58,6 +61,7 @@ class LLFloaterInventoryThumbnailsHelper: void recordInventoryItemEntry(LLViewerInventoryItem* item); void recordTextureItemEntry(LLViewerInventoryItem* item); + void populateThumbnailNames(); std::map mItemNamesIDs; std::map mTextureNamesIDs; -- cgit v1.2.3 From 10276ee967a5ad860fbf8750ce1012db3c5ae78a Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 17 Aug 2023 15:49:50 -0700 Subject: Small updates to bulky thumbs but mainly, this is about the first version of the Inventory Thumbnail Helper tool - see source file for a link to Confluence page listing how to use it --- indra/newview/llfloaterinventorythumbnailshelper.h | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'indra/newview/llfloaterinventorythumbnailshelper.h') diff --git a/indra/newview/llfloaterinventorythumbnailshelper.h b/indra/newview/llfloaterinventorythumbnailshelper.h index ec83d5b7e0..b42a85d1a5 100644 --- a/indra/newview/llfloaterinventorythumbnailshelper.h +++ b/indra/newview/llfloaterinventorythumbnailshelper.h @@ -1,7 +1,7 @@ /** * @file llfloaterinventorythumbnailshelper.h * @author Callum Prentice - * @brief Helper floater for bulk processing of inventory thumbnails + * @brief Helper floater for bulk processing of inventory thumbnails tool * * $LicenseInfo:firstyear=2008&license=viewerlgpl$ * Second Life Viewer Source Code @@ -31,7 +31,6 @@ #include "llfloater.h" class LLTextEditor; class LLScrollListCtrl; -class LLMediaCtrl; class LLViewerInventoryItem; class LLUUID; @@ -46,27 +45,38 @@ class LLFloaterInventoryThumbnailsHelper: LLScrollListCtrl* mInventoryThumbnailsList; + LLTextEditor* mOutputLog; + LLUICtrl* mPasteItemsBtn; void onPasteItems(); LLUICtrl* mPasteTexturesBtn; void onPasteTextures(); - LLTextEditor* mOutputLog; - - void mergeItemsTextures(); - LLUICtrl* mWriteThumbnailsBtn; void onWriteThumbnails(); + LLUICtrl* mLogMissingThumbnailsBtn; + void onLogMissingThumbnails(); + + LLUICtrl* mClearThumbnailsBtn; + void onClearThumbnails(); + void recordInventoryItemEntry(LLViewerInventoryItem* item); void recordTextureItemEntry(LLViewerInventoryItem* item); - void populateThumbnailNames(); + void updateButtonStates(); + void updateDisplayList(); + void writeToLog(std::string logline, bool prepend_newline); - std::map mItemNamesIDs; + std::map mItemNamesItems; std::map mTextureNamesIDs; - std::map> mNameItemIDTextureId; + enum EListColumnNum + { + NAME = 0, + EXISTING_TEXTURE = 1, + NEW_TEXTURE = 2 + }; }; #endif // LL_LLFLOATERINVENTORYTHUMBNAILSHELPER_H -- cgit v1.2.3