From 59f61e2ff2f6cedb480d691f130a8d5e6b16c302 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 22 Feb 2021 21:34:17 +0200 Subject: SL-14842 Apply toolstrip layout to Places floater Part #1 Menus --- indra/newview/llpanelplacestab.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/llpanelplacestab.h') diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h index 367ce46e2e..6c9a6e9da7 100644 --- a/indra/newview/llpanelplacestab.h +++ b/indra/newview/llpanelplacestab.h @@ -30,6 +30,7 @@ #include "llpanel.h" class LLPanelPlaces; +class LLToggleableMenu; class LLPanelPlacesTab : public LLPanel { @@ -42,8 +43,19 @@ public: virtual void onShowOnMap() = 0; virtual void onShowProfile() = 0; virtual void onTeleport() = 0; + virtual void onRemoveSelected() = 0; virtual bool isSingleItemSelected() = 0; + // returns menu for current selection + virtual LLToggleableMenu* getSelectionMenu() = 0; + virtual LLToggleableMenu* getSortingMenu() = 0; + virtual LLToggleableMenu* getCreateMenu() = 0; + + /** + * Processes drag-n-drop of the Landmarks and folders into trash button. + */ + virtual bool handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept) = 0; + bool isTabVisible(); // Check if parent TabContainer is visible. void setPanelPlacesButtons(LLPanelPlaces* panel); -- cgit v1.2.3 From 554ccd718131d469a7cde1e188d9ef0f712a6ed9 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 24 Feb 2021 22:41:42 +0200 Subject: SL-14842 Apply toolstrip layout to Places floater Part #3 Removed unused buttons, moved some UI elements to be more in line with each other --- indra/newview/llpanelplacestab.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/newview/llpanelplacestab.h') diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h index 6c9a6e9da7..886f4ce9c0 100644 --- a/indra/newview/llpanelplacestab.h +++ b/indra/newview/llpanelplacestab.h @@ -58,7 +58,6 @@ public: bool isTabVisible(); // Check if parent TabContainer is visible. - void setPanelPlacesButtons(LLPanelPlaces* panel); void onRegionResponse(const LLVector3d& landmark_global_pos, U64 region_handle, const std::string& url, @@ -69,10 +68,6 @@ public: void setFilterSubString(const std::string& string) { sFilterSubString = string; } protected: - LLButton* mTeleportBtn; - LLButton* mShowOnMapBtn; - LLButton* mShowProfile; - // Search string for filtering landmarks and teleport history locations static std::string sFilterSubString; }; -- cgit v1.2.3 From 70bc98c4b0484a69ebb42717755b623bf9895e9f Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Fri, 23 Apr 2021 14:56:01 +0300 Subject: SL-15144 FIXED The "Remove" button is enabled with no selection --- indra/newview/llpanelplacestab.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llpanelplacestab.h') diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h index 886f4ce9c0..aab1c130c1 100644 --- a/indra/newview/llpanelplacestab.h +++ b/indra/newview/llpanelplacestab.h @@ -67,9 +67,12 @@ public: const std::string& getFilterSubString() { return sFilterSubString; } void setFilterSubString(const std::string& string) { sFilterSubString = string; } + void setRemoveBtn(LLButton* trash_btn) { sRemoveBtn = trash_btn; } + protected: // Search string for filtering landmarks and teleport history locations static std::string sFilterSubString; + static LLButton* sRemoveBtn; }; #endif //LL_LLPANELPLACESTAB_H -- cgit v1.2.3