diff options
Diffstat (limited to 'indra/newview/llinventoryitemslist.h')
| -rw-r--r-- | indra/newview/llinventoryitemslist.h | 106 |
1 files changed, 62 insertions, 44 deletions
diff --git a/indra/newview/llinventoryitemslist.h b/indra/newview/llinventoryitemslist.h index ca90427659..b496f4b9e9 100644 --- a/indra/newview/llinventoryitemslist.h +++ b/indra/newview/llinventoryitemslist.h @@ -3,26 +3,33 @@ * @brief A list of inventory items represented by LLFlatListView. * * Class LLInventoryItemsList implements a flat list of inventory items. + * Class LLPanelInventoryListItem displays inventory item as an element + * of LLInventoryItemsList. + * + * $LicenseInfo:firstyear=2010&license=viewergpl$ + * + * Copyright (c) 2010, Linden Research, Inc. * - * $LicenseInfo:firstyear=2010&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 + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. * $/LicenseInfo$ */ @@ -31,16 +38,46 @@ #include "lldarray.h" +#include "llpanel.h" + // newview #include "llflatlistview.h" +class LLIconCtrl; +class LLTextBox; class LLViewerInventoryItem; -class LLInventoryItemsList : public LLFlatListViewEx +class LLPanelInventoryListItem : public LLPanel { - LOG_CLASS(LLInventoryItemsList); public: - struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params> + static LLPanelInventoryListItem* createItemPanel(const LLViewerInventoryItem* item); + + virtual ~LLPanelInventoryListItem(); + + /*virtual*/ BOOL postBuild(); + /*virtual*/ void setValue(const LLSD& value); + + void updateItem(); + + void onMouseEnter(S32 x, S32 y, MASK mask); + void onMouseLeave(S32 x, S32 y, MASK mask); + +protected: + LLPanelInventoryListItem(const LLViewerInventoryItem* item); + +private: + LLIconCtrl* mIcon; + LLTextBox* mTitle; + + LLUIImagePtr mItemIcon; + std::string mItemName; + std::string mHighlightedText; +}; + +class LLInventoryItemsList : public LLFlatListView +{ +public: + struct Params : public LLInitParam::Block<Params, LLFlatListView::Params> { Params(); }; @@ -49,29 +86,14 @@ public: void refreshList(const LLDynamicArray<LLPointer<LLViewerInventoryItem> > item_array); - boost::signals2::connection setRefreshCompleteCallback(const commit_signal_t::slot_type& cb); - /** - * Let list know items need to be refreshed in next doIdle() + * Let list know items need to be refreshed in next draw() */ void setNeedsRefresh(bool needs_refresh){ mNeedsRefresh = needs_refresh; } bool getNeedsRefresh(){ return mNeedsRefresh; } - /** - * Sets the flag indicating that the list needs to be refreshed even if it is - * not currently visible. - */ - void setForceRefresh(bool force_refresh){ mForceRefresh = force_refresh; } - - /** - * Idle routine used to refresh the list regardless of the current list - * visibility, unlike draw() which is called only for the visible list. - * This is needed for example to filter items of the list hidden by closed - * accordion tab. - */ - void doIdle(); // Real idle routine - static void idle(void* user_data); // static glue to doIdle() + /*virtual*/ void draw(); protected: friend class LLUICtrlFactory; @@ -81,7 +103,7 @@ protected: /** * Refreshes list items, adds new items and removes deleted items. - * Called from doIdle() until all new items are added, + * Called from draw() until all new items are added, , * maximum 50 items can be added during single call. */ void refresh(); @@ -95,16 +117,12 @@ protected: /** * Add an item to the list */ - virtual void addNewItem(LLViewerInventoryItem* item, bool rearrange = true); + void addNewItem(LLViewerInventoryItem* item); private: uuid_vec_t mIDs; // IDs of items that were added in refreshList(). // Will be used in refresh() to determine added and removed ids bool mNeedsRefresh; - - bool mForceRefresh; - - commit_signal_t mRefreshCompleteSignal; }; #endif //LL_LLINVENTORYITEMSLIST_H |