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