From 32dccaf3d89b40b711d69088a3e390119c7efc7f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 17 Nov 2009 10:36:11 -0500 Subject: Sidepanel Appearance refactoring. Work in progress. 1. Changed sidepanel names to have "sidepanel" (e.g. panel_appearance -> sidepanel_appearance) 2. Changed some "Looks" names to "Outfits" 3. Changed LLPanelLooks to LLPanelOutfitsInventory (to match other inventory panel naming) 4. Took out tab from sidepanel_appearance. --HG-- branch : avatar-pipeline --- indra/newview/llpaneloutfitsinventory.h | 76 +++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 indra/newview/llpaneloutfitsinventory.h (limited to 'indra/newview/llpaneloutfitsinventory.h') diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h new file mode 100644 index 0000000000..3f837d3635 --- /dev/null +++ b/indra/newview/llpaneloutfitsinventory.h @@ -0,0 +1,76 @@ +/** + * @file llpaneloutfitsinventory.h + * @brief Outfits inventory panel + * class definition + * + * $LicenseInfo:firstyear=2009&license=viewergpl$ + * + * Copyright (c) 2001-2009, Linden Research, Inc. + * + * Second Life Viewer Source Code + * 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$ + */ + +#ifndef LL_LLPANELOUTFITSINVENTORY_H +#define LL_LLPANELOUTFITSINVENTORY_H + +#include "llpanel.h" +#include "llinventoryobserver.h" + +class LLFolderView; +class LLFolderViewItem; +class LLFolderViewEventListener; +class LLInventoryPanel; +class LLSaveFolderState; +class LLButton; + +class LLPanelOutfitsInventory : public LLPanel +{ +public: + LLPanelOutfitsInventory(); + virtual ~LLPanelOutfitsInventory(); + + /*virtual*/ BOOL postBuild(); + + void onSearchEdit(const std::string& string); + void onWear(); + void onEdit(); + void onNew(); + void updateVerbs(); + + void onSelectionChange(const std::deque &items, BOOL user_action); + void onSelectorButtonClicked(); + + LLFolderView* getRootFolder(); + +private: + bool getIsCorrectType(const LLFolderViewEventListener *listenerp) const; + LLInventoryPanel* mInventoryPanel; + LLSaveFolderState* mSavedFolderState; + + LLButton* mActionBtn; + LLButton* mWearBtn; + LLButton* mEditBtn; + +}; + +#endif //LL_LLPANELOUTFITSINVENTORY_H -- cgit v1.2.3 From 53beee9e0837865163ff700df4b8d452135da9eb Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 17 Nov 2009 13:00:26 -0500 Subject: EXT-2569 : Separate out LLPanelOutfitsInventory so it's more modular versus being coupled with LLSidepanelAppearance EXT-2561 : Add standard bottom panel (gear menu, add button, trash icon) Added gear menu and standardized the code. (someday, will create a subclass to share the functionality across panels) Make LLPanelOutfitsInventory more modular, e.g. it no longer knows about the Wear/Edit buttons. --HG-- branch : avatar-pipeline --- indra/newview/llpaneloutfitsinventory.h | 36 ++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpaneloutfitsinventory.h') diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h index 3f837d3635..4d903a389b 100644 --- a/indra/newview/llpaneloutfitsinventory.h +++ b/indra/newview/llpaneloutfitsinventory.h @@ -42,6 +42,8 @@ class LLFolderViewEventListener; class LLInventoryPanel; class LLSaveFolderState; class LLButton; +class LLMenuGL; +class LLSidepanelAppearance; class LLPanelOutfitsInventory : public LLPanel { @@ -55,22 +57,46 @@ public: void onWear(); void onEdit(); void onNew(); - void updateVerbs(); void onSelectionChange(const std::deque &items, BOOL user_action); void onSelectorButtonClicked(); + LLInventoryPanel* getActivePanel() { return mInventoryPanel; } + + // If a compatible listener type is selected, then return a pointer to that. + // Otherwise, return NULL. + LLFolderViewEventListener* getCorrectListenerForAction(); + void setParent(LLSidepanelAppearance *parent); +protected: + void updateParent(); + bool getIsCorrectType(const LLFolderViewEventListener *listenerp) const; LLFolderView* getRootFolder(); private: - bool getIsCorrectType(const LLFolderViewEventListener *listenerp) const; + LLSidepanelAppearance* mParent; LLInventoryPanel* mInventoryPanel; LLSaveFolderState* mSavedFolderState; - LLButton* mActionBtn; - LLButton* mWearBtn; - LLButton* mEditBtn; + ////////////////////////////////////////////////////////////////////////////////// + // List Commands // +protected: + void initListCommandsHandlers(); + void updateListCommands(); + void onGearButtonClick(); + void onAddButtonClick(); + void showActionMenu(LLMenuGL* menu, std::string spawning_view_name); + void onTrashButtonClick(); + void onClipboardAction(const LLSD& userdata); + BOOL isActionEnabled(const LLSD& command_name); + void onCustomAction(const LLSD& command_name); + bool handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, EAcceptance* accept); +private: + LLPanel* mListCommands; + LLMenuGL* mMenuGearDefault; + LLMenuGL* mMenuAdd; + // // + //////////////////////////////////////////////////////////////////////////////// }; #endif //LL_LLPANELOUTFITSINVENTORY_H -- cgit v1.2.3