From ac3f1b54ec6484442ea302570c14707e8bb263d2 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 1 Feb 2023 18:44:26 +0200 Subject: SL-19104 Clean up inventory UI to prepare for thumbnails (#66) --- indra/newview/llpanelmaininventory.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 257bce930c..1f07d381ba 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -158,22 +158,21 @@ protected: void updateListCommands(); void onAddButtonClick(); void showActionMenu(LLMenuGL* menu, std::string spawning_view_name); - void onTrashButtonClick(); void onClipboardAction(const LLSD& userdata); BOOL isActionEnabled(const LLSD& command_name); BOOL isActionChecked(const LLSD& userdata); void onCustomAction(const LLSD& command_name); - bool handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, EAcceptance* accept); static bool hasSettingsInventory(); /** * Set upload cost in "Upload" sub menu. */ void setUploadCostIfNeeded(); private: - LLDragAndDropButton* mTrashButton; LLToggleableMenu* mMenuGearDefault; + LLToggleableMenu* mMenuViewDefault; LLToggleableMenu* mMenuVisibility; LLMenuButton* mGearMenuButton; + LLMenuButton* mViewMenuButton; LLMenuButton* mVisibilityMenuButton; LLHandle mMenuAddHandle; -- cgit v1.2.3 From 734b1b5d421254c45b3eb0fe0a5bbc8159e489fc Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Fri, 17 Feb 2023 15:47:03 +0200 Subject: SL-19105 WIP Single-folder inventory view --- indra/newview/llpanelmaininventory.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 1f07d381ba..923ebba98b 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -30,6 +30,7 @@ #include "llpanel.h" #include "llinventoryobserver.h" +#include "llinventorypanel.h" #include "lldndbutton.h" #include "llfolderview.h" @@ -92,10 +93,16 @@ public: void setFocusFilterEditor(); static void newWindow(); + static void newFolderWindow(const LLUUID& folder_id); void toggleFindOptions(); void resetFilters(); + void onViewModeClick(); + void onUpFolderClicked(); + void onBackFolderClicked(); + void onForwardFolderClicked(); + void setSingleFolderViewRoot(const LLUUID& folder_id); protected: // @@ -149,7 +156,10 @@ private: std::string mCategoryCountString; LLComboBox* mSearchTypeCombo; + bool mSingleFolderMode; + LLInventorySingleFolderPanel* mSingleFolderPanelInventory; + boost::signals2::connection mFolderRootChangedConnection; ////////////////////////////////////////////////////////////////////////////////// // List Commands // @@ -162,7 +172,9 @@ protected: BOOL isActionEnabled(const LLSD& command_name); BOOL isActionChecked(const LLSD& userdata); void onCustomAction(const LLSD& command_name); + bool isActionVisible(const LLSD& userdata); static bool hasSettingsInventory(); + void updateTitle(); /** * Set upload cost in "Upload" sub menu. */ -- cgit v1.2.3 From d6f1ba31da4a40d62fe781419cdd7db9843f6a30 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 21 Feb 2023 14:44:45 +0200 Subject: SL-19105 Updated icons, menus and Received items panel visibility in single-folder mode --- indra/newview/llpanelmaininventory.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 923ebba98b..e5262540cf 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -44,6 +44,7 @@ class LLTabContainer; class LLFloaterInventoryFinder; class LLMenuButton; class LLMenuGL; +class LLSidepanelInventory; class LLToggleableMenu; class LLFloater; @@ -103,6 +104,7 @@ public: void onBackFolderClicked(); void onForwardFolderClicked(); void setSingleFolderViewRoot(const LLUUID& folder_id); + bool isSingleFolderMode() { return mSingleFolderMode; } protected: // @@ -137,6 +139,8 @@ protected: void onSelectSearchType(); void updateSearchTypeCombo(); + LLSidepanelInventory* getParentSidepanelInventory(); + private: LLFloaterInventoryFinder* getFinder(); -- cgit v1.2.3 From 49da5288bd0425241823186bfd56a159fe2f9a60 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Fri, 24 Feb 2023 03:05:30 +0200 Subject: SL-19234 add Inventory settings floater --- indra/newview/llpanelmaininventory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index e5262540cf..85373d7de3 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -94,7 +94,7 @@ public: void setFocusFilterEditor(); static void newWindow(); - static void newFolderWindow(const LLUUID& folder_id); + static void newFolderWindow(LLUUID folder_id = LLUUID(), LLUUID item_to_select = LLUUID()); void toggleFindOptions(); -- cgit v1.2.3 From f377e27f0b8ddabf755c6efe71d6bc0e53e751c1 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Mon, 27 Feb 2023 20:27:11 +0200 Subject: SL-19274 Add new double-click option to Inventory settings --- indra/newview/llpanelmaininventory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 85373d7de3..6382f44bc9 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -103,7 +103,7 @@ public: void onUpFolderClicked(); void onBackFolderClicked(); void onForwardFolderClicked(); - void setSingleFolderViewRoot(const LLUUID& folder_id); + void setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history = true); bool isSingleFolderMode() { return mSingleFolderMode; } protected: -- cgit v1.2.3 From c74658b19b1ac28d5bf240e940a7ad97ff034e3c Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Thu, 2 Mar 2023 20:54:33 +0200 Subject: SL-19310 Update navigation buttons in single-folder view --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 6382f44bc9..7edaf7db96 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -179,6 +179,7 @@ protected: bool isActionVisible(const LLSD& userdata); static bool hasSettingsInventory(); void updateTitle(); + void updateNavButtons(); /** * Set upload cost in "Upload" sub menu. */ -- cgit v1.2.3 From ea94cda5f5bb9a426782ee7c7aebb1095ba444c1 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 7 Mar 2023 19:30:30 +0200 Subject: =?UTF-8?q?SL-19356=20bring=20SFV=20to=20the=20top=20instead=20of?= =?UTF-8?q?=20opening=20a=20new=20window=20if=20there=E2=80=99s=20already?= =?UTF-8?q?=20one=20open=20for=20that=20folder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 7edaf7db96..b0f520ac5e 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -104,6 +104,7 @@ public: void onBackFolderClicked(); void onForwardFolderClicked(); void setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history = true); + LLUUID getSingleFolderViewRoot(); bool isSingleFolderMode() { return mSingleFolderMode; } protected: -- cgit v1.2.3 From e364b90d61b7711c088d9bca7307e3760f28c59d Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Fri, 10 Mar 2023 17:39:24 +0200 Subject: SL-19335 Switching view (using the switch button) should select appropriate folder --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index b0f520ac5e..5f488539dd 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -100,6 +100,7 @@ public: void resetFilters(); void onViewModeClick(); + void toggleViewMode(); void onUpFolderClicked(); void onBackFolderClicked(); void onForwardFolderClicked(); -- cgit v1.2.3 From 1eab3247111e66a3b81153173d1624a5c1c9fb72 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 21 Mar 2023 17:47:26 +0200 Subject: SL-19379 WIP Gallery view Inventory: first pass --- indra/newview/llpanelmaininventory.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 5f488539dd..51c4ace874 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -38,6 +38,7 @@ class LLComboBox; class LLFolderViewItem; class LLInventoryPanel; +class LLInventoryGallery; class LLSaveFolderState; class LLFilterEditor; class LLTabContainer; @@ -65,6 +66,13 @@ public: BOOL postBuild(); + enum EViewModeType + { + VIEW_LIST, + VIEW_GALLERY, + VIEW_COMBINATION + }; + virtual BOOL handleKeyHere(KEY key, MASK mask); // Inherited functionality @@ -108,6 +116,11 @@ public: LLUUID getSingleFolderViewRoot(); bool isSingleFolderMode() { return mSingleFolderMode; } + void setViewMode(EViewModeType mode); + bool isListViewMode() { return (mViewMode == VIEW_LIST); } + bool isGalleryViewMode() { return (mViewMode == VIEW_GALLERY); } + LLUUID getCurrentSFVRoot(); + protected: // // Misc functions @@ -163,9 +176,12 @@ private: LLComboBox* mSearchTypeCombo; bool mSingleFolderMode; + EViewModeType mViewMode; LLInventorySingleFolderPanel* mSingleFolderPanelInventory; + LLInventoryGallery* mInventoryGalleryPanel; - boost::signals2::connection mFolderRootChangedConnection; + boost::signals2::connection mListViewRootUpdatedConnection; + boost::signals2::connection mGalleryRootUpdatedConnection; ////////////////////////////////////////////////////////////////////////////////// // List Commands // -- cgit v1.2.3 From 19e9b5d488e5478d6c5ecbb85000e6da3e6124bb Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 21 Mar 2023 19:19:58 +0200 Subject: SL-19379 build fix --- indra/newview/llpanelmaininventory.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 51c4ace874..c30f894118 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -68,9 +68,9 @@ public: enum EViewModeType { - VIEW_LIST, - VIEW_GALLERY, - VIEW_COMBINATION + MODE_LIST, + MODE_GALLERY, + MODE_COMBINATION }; virtual BOOL handleKeyHere(KEY key, MASK mask); @@ -117,8 +117,8 @@ public: bool isSingleFolderMode() { return mSingleFolderMode; } void setViewMode(EViewModeType mode); - bool isListViewMode() { return (mViewMode == VIEW_LIST); } - bool isGalleryViewMode() { return (mViewMode == VIEW_GALLERY); } + bool isListViewMode() { return (mViewMode == MODE_LIST); } + bool isGalleryViewMode() { return (mViewMode == MODE_GALLERY); } LLUUID getCurrentSFVRoot(); protected: -- cgit v1.2.3 From 6172945775790757af827dfb88251875b0dd446f Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Thu, 23 Mar 2023 13:56:42 +0200 Subject: SL-19391 FIXED SFV floater title displays unlocalised name for system folders --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index c30f894118..ac97cc4052 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -120,6 +120,7 @@ public: bool isListViewMode() { return (mViewMode == MODE_LIST); } bool isGalleryViewMode() { return (mViewMode == MODE_GALLERY); } LLUUID getCurrentSFVRoot(); + std::string getLocalizedRootName(); protected: // -- cgit v1.2.3 From c10eed08189161bab67cfc296b1891a989d5748d Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 29 Mar 2023 18:02:04 +0300 Subject: SL-19379 WIP allow change search type for Gallery --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index ac97cc4052..974b4ebd26 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -154,6 +154,7 @@ protected: void onFocusReceived(); void onSelectSearchType(); void updateSearchTypeCombo(); + void setSearchType(LLInventoryFilter::ESearchType type); LLSidepanelInventory* getParentSidepanelInventory(); -- cgit v1.2.3 From ae3e3662159ca26db5b2efe36d91a9ccdfcec256 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Thu, 30 Mar 2023 21:39:43 +0300 Subject: SL-19379 WIP update gear menu with Gallery items --- indra/newview/llpanelmaininventory.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index d41b0a094a..bd51830ebb 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -48,6 +48,7 @@ class LLMenuGL; class LLSidepanelInventory; class LLToggleableMenu; class LLFloater; +class LLFloaterSidePanelContainer; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLPanelMainInventory @@ -101,7 +102,7 @@ public: void setFocusFilterEditor(); - static void newWindow(); + static LLFloaterSidePanelContainer* newWindow(); static void newFolderWindow(LLUUID folder_id = LLUUID(), LLUUID item_to_select = LLUUID()); void toggleFindOptions(); @@ -109,6 +110,8 @@ public: void resetFilters(); void resetAllItemsFilters(); + void findLinks(const LLUUID& item_id, const std::string& item_name); + void onViewModeClick(); void toggleViewMode(); void onUpFolderClicked(); -- cgit v1.2.3 From bc285ed41e86e685df07f4039c64c0402833b047 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Mon, 3 Apr 2023 21:34:37 +0300 Subject: SL-19521 Inventory filters floater should affect Inventory Gallery --- indra/newview/llpanelmaininventory.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index bd51830ebb..1f0dfc82d2 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -127,6 +127,8 @@ public: LLUUID getCurrentSFVRoot(); std::string getLocalizedRootName(); + LLInventoryFilter& getCurrentFilter(); + protected: // // Misc functions -- cgit v1.2.3 From 7ccfbd7c285cc2ab0bbf569912f8e9e2d5c1df72 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 4 Apr 2023 15:14:02 +0300 Subject: SL-19379 Don't switch focus to other Inventory floater when creating an item in Gallery --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 1f0dfc82d2..1e171d5066 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -118,6 +118,7 @@ public: void onBackFolderClicked(); void onForwardFolderClicked(); void setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history = true); + void setGallerySelection(const LLUUID& item_id); LLUUID getSingleFolderViewRoot(); bool isSingleFolderMode() { return mSingleFolderMode; } -- cgit v1.2.3 From cc39c1e852b1b8ad0e6dc2bb7907b8116c716c1d Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Thu, 6 Apr 2023 19:51:08 +0300 Subject: SL-19544 preparation for Combination view --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 1e171d5066..4a27bbca4e 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -125,6 +125,7 @@ public: void setViewMode(EViewModeType mode); bool isListViewMode() { return (mViewMode == MODE_LIST); } bool isGalleryViewMode() { return (mViewMode == MODE_GALLERY); } + bool isCombinationViewMode() { return (mViewMode == MODE_COMBINATION); } LLUUID getCurrentSFVRoot(); std::string getLocalizedRootName(); -- cgit v1.2.3 From d5a949d97a67c8b9e551fc4b22d4c901eaf1d91a Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Fri, 7 Apr 2023 15:13:47 +0300 Subject: SL-19544 WIP Combination view first pass --- indra/newview/llpanelmaininventory.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 4a27bbca4e..bc7ed51465 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -160,6 +160,8 @@ protected: bool isSaveTextureEnabled(const LLSD& userdata); void updateItemcountText(); + void updateCombinationVisibility(); + void onFocusReceived(); void onSelectSearchType(); void updateSearchTypeCombo(); @@ -190,6 +192,8 @@ private: EViewModeType mViewMode; LLInventorySingleFolderPanel* mSingleFolderPanelInventory; LLInventoryGallery* mInventoryGalleryPanel; + LLInventorySingleFolderPanel* mCombinationPanelInventory; + LLInventoryGallery* mCombinationGalleryPanel; boost::signals2::connection mListViewRootUpdatedConnection; boost::signals2::connection mGalleryRootUpdatedConnection; @@ -209,6 +213,8 @@ protected: static bool hasSettingsInventory(); void updateTitle(); void updateNavButtons(); + + void onCombinationRootChanged(bool gallery_clicked); /** * Set upload cost in "Upload" sub menu. */ -- cgit v1.2.3 From 6e5b94071b62113f2bd52dd6985498990926a9f6 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 11 Apr 2023 21:39:23 +0300 Subject: SL-19544 WIP combination view filtering; hidden items should be correctly removed when root is changed --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index bc7ed51465..1067892959 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -91,6 +91,7 @@ public: LLInventoryPanel* getAllItemsPanel(); void selectAllItemsPanel(); const LLInventoryPanel* getActivePanel() const { return mActivePanel; } + void setActivePanel(); bool isRecentItemsPanelSelected(); -- cgit v1.2.3 From 842bc87941d4574fe1ce34186872e43ecef881c3 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 12 Apr 2023 12:56:56 +0300 Subject: SL-19544 WIP update combination gallery visibility after changing filter --- indra/newview/llpanelmaininventory.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 1067892959..8bc8f4e2e6 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -193,7 +193,8 @@ private: EViewModeType mViewMode; LLInventorySingleFolderPanel* mSingleFolderPanelInventory; LLInventoryGallery* mInventoryGalleryPanel; - LLInventorySingleFolderPanel* mCombinationPanelInventory; + + LLInventorySingleFolderPanel* mCombinationInventoryPanel; LLInventoryGallery* mCombinationGalleryPanel; boost::signals2::connection mListViewRootUpdatedConnection; -- cgit v1.2.3 From 1e4ebffa0c801b41990ab38c85ef95eb6f948cd5 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 19 Apr 2023 17:09:39 +0300 Subject: SL-19604 show layout panel before creating new item in combination mode, if there are no items in inventory panel --- indra/newview/llpanelmaininventory.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 8bc8f4e2e6..e5b9ba929d 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -231,6 +231,8 @@ private: LLHandle mMenuAddHandle; bool mNeedUploadCost; + + bool mForceShowInvLayout; // List Commands // //////////////////////////////////////////////////////////////////////////////// }; -- cgit v1.2.3 From 0091fa0cbaba034da09d42d49f68c63f2cc7df14 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 26 Apr 2023 03:53:05 +0300 Subject: SL-19583 Uniform risizing for combination inventory view --- indra/newview/llpanelmaininventory.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index e5b9ba929d..8e7ad776b0 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -143,8 +143,6 @@ protected: static BOOL filtersVisible(void* user_data); void onClearSearch(); - static void onFoldersByName(void *user_data); - static BOOL checkFoldersByName(void *user_data); static BOOL incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward); void onFilterSelected(); @@ -196,6 +194,7 @@ private: LLInventorySingleFolderPanel* mCombinationInventoryPanel; LLInventoryGallery* mCombinationGalleryPanel; + LLView* mCombinationScroller; boost::signals2::connection mListViewRootUpdatedConnection; boost::signals2::connection mGalleryRootUpdatedConnection; -- cgit v1.2.3 From 171b8dbeb32e49d43f40189ae55df05693804fbf Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 2 May 2023 23:07:46 +0300 Subject: SL-19583 Fix rename's width and update frequency This way of calculating scroll turns out to be one large hack. Probably needs a proper combination view instead of combining two different views that have own scrolls or those views need to support not having personal scroll. --- indra/newview/llpanelmaininventory.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 8e7ad776b0..4f792878a5 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -83,8 +83,9 @@ public: EAcceptance* accept, std::string& tooltip_msg); /*virtual*/ void changed(U32); + /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); /*virtual*/ void draw(); - /*virtual*/ void onVisibilityChange ( BOOL new_visibility ); + /*virtual*/ void onVisibilityChange ( BOOL new_visibility ); LLInventoryPanel* getPanel() { return mActivePanel; } LLInventoryPanel* getActivePanel() { return mActivePanel; } @@ -192,6 +193,7 @@ private: LLInventorySingleFolderPanel* mSingleFolderPanelInventory; LLInventoryGallery* mInventoryGalleryPanel; + LLUICtrl* mCombinationScrollPanel; LLInventorySingleFolderPanel* mCombinationInventoryPanel; LLInventoryGallery* mCombinationGalleryPanel; LLView* mCombinationScroller; @@ -232,6 +234,7 @@ private: bool mNeedUploadCost; bool mForceShowInvLayout; + bool mCombinationShapeDirty; // List Commands // //////////////////////////////////////////////////////////////////////////////// }; -- cgit v1.2.3 From 25277a773db9311ecddb80febe623240769c0636 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Thu, 4 May 2023 19:19:32 +0300 Subject: SL-19683 Add menu items should be disabled for some folders in single-folder view --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 4f792878a5..21e08bbac8 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -222,6 +222,7 @@ protected: * Set upload cost in "Upload" sub menu. */ void setUploadCostIfNeeded(); + void disableAddIfNeeded(); private: LLToggleableMenu* mMenuGearDefault; LLToggleableMenu* mMenuViewDefault; -- cgit v1.2.3 From 61818417d619c8d17cf861f0d72b314a14269e2f Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Fri, 5 May 2023 18:17:00 +0300 Subject: SL-19641 FIXED Gallery item is not selected after using 'Find original' --- indra/newview/llpanelmaininventory.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 21e08bbac8..44beba6b4f 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -120,10 +120,13 @@ public: void onBackFolderClicked(); void onForwardFolderClicked(); void setSingleFolderViewRoot(const LLUUID& folder_id, bool clear_nav_history = true); - void setGallerySelection(const LLUUID& item_id); + void setGallerySelection(const LLUUID& item_id, bool new_window = false); LLUUID getSingleFolderViewRoot(); bool isSingleFolderMode() { return mSingleFolderMode; } + void scrollToGallerySelection(); + void scrollToInvPanelSelection(); + void setViewMode(EViewModeType mode); bool isListViewMode() { return (mViewMode == MODE_LIST); } bool isGalleryViewMode() { return (mViewMode == MODE_GALLERY); } @@ -236,6 +239,8 @@ private: bool mForceShowInvLayout; bool mCombinationShapeDirty; + bool mDelayedCombGalleryScroll; + bool mDelayedCombInvPanelScroll; // List Commands // //////////////////////////////////////////////////////////////////////////////// }; -- cgit v1.2.3 From 8a1cb8c00cf75ff1e09c72c2fb487728ec77c66b Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 10 May 2023 12:51:08 +0300 Subject: SL-19697 FIXED Clicking on inventory item in list view does not unselect item in gallery view --- indra/newview/llpanelmaininventory.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 44beba6b4f..bc010ff37f 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -221,6 +221,8 @@ protected: void updateNavButtons(); void onCombinationRootChanged(bool gallery_clicked); + void onCombinationGallerySelectionChanged(const LLUUID& category_id); + void onCombinationInventorySelectionChanged(const std::deque& items, BOOL user_action); /** * Set upload cost in "Upload" sub menu. */ -- cgit v1.2.3 From 572e8269bcd5320daa66f4074e927c79869bf7de Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 24 May 2023 22:51:02 +0300 Subject: SL-19604 Creating new folders in combination views does not highlight created item --- indra/newview/llpanelmaininventory.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index bc010ff37f..2c3379996f 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -36,19 +36,20 @@ #include "llfolderview.h" class LLComboBox; -class LLFolderViewItem; class LLInventoryPanel; class LLInventoryGallery; -class LLSaveFolderState; class LLFilterEditor; -class LLTabContainer; +class LLFloater; class LLFloaterInventoryFinder; +class LLFloaterSidePanelContainer; +class LLFolderViewItem; class LLMenuButton; class LLMenuGL; +class LLSaveFolderState; +class LLScrollContainer; class LLSidepanelInventory; +class LLTabContainer; class LLToggleableMenu; -class LLFloater; -class LLFloaterSidePanelContainer; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLPanelMainInventory @@ -196,7 +197,7 @@ private: LLInventorySingleFolderPanel* mSingleFolderPanelInventory; LLInventoryGallery* mInventoryGalleryPanel; - LLUICtrl* mCombinationScrollPanel; + LLScrollContainer* mCombinationScrollPanel; LLInventorySingleFolderPanel* mCombinationInventoryPanel; LLInventoryGallery* mCombinationGalleryPanel; LLView* mCombinationScroller; -- cgit v1.2.3 From c3e200cef41a602c13d3115cfec777eff63d5028 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 31 May 2023 17:03:19 +0300 Subject: SL-19686 don't search views every time --- indra/newview/llpanelmaininventory.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 2c3379996f..056b26b6ec 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -192,6 +192,16 @@ private: std::string mCategoryCountString; LLComboBox* mSearchTypeCombo; + LLButton* mBackBtn; + LLButton* mForwardBtn; + LLButton* mUpBtn; + LLButton* mViewModeBtn; + LLLayoutPanel* mNavigationBtnsPanel; + + LLPanel* mListViewPanel; + LLPanel* mGalleryViewPanel; + LLPanel* mDefaultViewPanel; + bool mSingleFolderMode; EViewModeType mViewMode; LLInventorySingleFolderPanel* mSingleFolderPanelInventory; -- cgit v1.2.3 From 23311903106293f29e22d21314bdab03bbd499f7 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 31 May 2023 19:28:48 +0300 Subject: Revert "SL-19795 Unified scroll" --- indra/newview/llpanelmaininventory.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 056b26b6ec..cc36385e90 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -36,20 +36,19 @@ #include "llfolderview.h" class LLComboBox; +class LLFolderViewItem; class LLInventoryPanel; class LLInventoryGallery; +class LLSaveFolderState; class LLFilterEditor; -class LLFloater; +class LLTabContainer; class LLFloaterInventoryFinder; -class LLFloaterSidePanelContainer; -class LLFolderViewItem; class LLMenuButton; class LLMenuGL; -class LLSaveFolderState; -class LLScrollContainer; class LLSidepanelInventory; -class LLTabContainer; class LLToggleableMenu; +class LLFloater; +class LLFloaterSidePanelContainer; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLPanelMainInventory @@ -84,9 +83,8 @@ public: EAcceptance* accept, std::string& tooltip_msg); /*virtual*/ void changed(U32); - /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); /*virtual*/ void draw(); - /*virtual*/ void onVisibilityChange ( BOOL new_visibility ); + /*virtual*/ void onVisibilityChange ( BOOL new_visibility ); LLInventoryPanel* getPanel() { return mActivePanel; } LLInventoryPanel* getActivePanel() { return mActivePanel; } @@ -148,6 +146,8 @@ protected: static BOOL filtersVisible(void* user_data); void onClearSearch(); + static void onFoldersByName(void *user_data); + static BOOL checkFoldersByName(void *user_data); static BOOL incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward); void onFilterSelected(); @@ -207,10 +207,9 @@ private: LLInventorySingleFolderPanel* mSingleFolderPanelInventory; LLInventoryGallery* mInventoryGalleryPanel; - LLScrollContainer* mCombinationScrollPanel; LLInventorySingleFolderPanel* mCombinationInventoryPanel; LLInventoryGallery* mCombinationGalleryPanel; - LLView* mCombinationScroller; + LLPanel* mCombinationViewPanel; boost::signals2::connection mListViewRootUpdatedConnection; boost::signals2::connection mGalleryRootUpdatedConnection; @@ -251,7 +250,6 @@ private: bool mNeedUploadCost; bool mForceShowInvLayout; - bool mCombinationShapeDirty; bool mDelayedCombGalleryScroll; bool mDelayedCombInvPanelScroll; // List Commands // -- cgit v1.2.3 From 49b817d5062dbffb915facc3cda7e31dd2322e6e Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 31 May 2023 22:31:24 +0300 Subject: SL-19795 fix inventory list offset --- indra/newview/llpanelmaininventory.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index cc36385e90..daf7cf5ad3 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -210,6 +210,8 @@ private: LLInventorySingleFolderPanel* mCombinationInventoryPanel; LLInventoryGallery* mCombinationGalleryPanel; LLPanel* mCombinationViewPanel; + LLPanel* mCombinationGalleryLayoutPanel; + LLPanel* mCombinationListLayoutPanel; boost::signals2::connection mListViewRootUpdatedConnection; boost::signals2::connection mGalleryRootUpdatedConnection; -- cgit v1.2.3 From c6eeb65d18861ea346cf199faba7bf3f493fdabe Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 1 Jun 2023 00:14:06 +0300 Subject: SL-19795 Smarter combination inventory resizing --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index daf7cf5ad3..a02c13ddde 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -252,6 +252,7 @@ private: bool mNeedUploadCost; bool mForceShowInvLayout; + bool mReshapeInvLayout; bool mDelayedCombGalleryScroll; bool mDelayedCombInvPanelScroll; // List Commands // -- cgit v1.2.3 From 87d24252df91284eb0cd9ab2f08b376ded05554c Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 2 Jun 2023 01:58:30 +0300 Subject: SL-19795 Remove extra panels, reuse combination ones instead --- indra/newview/llpanelmaininventory.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index a02c13ddde..61ccfc02a1 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -164,6 +164,7 @@ protected: bool isSaveTextureEnabled(const LLSD& userdata); void updateItemcountText(); + void updatePanelVisibility(); void updateCombinationVisibility(); void onFocusReceived(); @@ -198,18 +199,14 @@ private: LLButton* mViewModeBtn; LLLayoutPanel* mNavigationBtnsPanel; - LLPanel* mListViewPanel; - LLPanel* mGalleryViewPanel; LLPanel* mDefaultViewPanel; + LLPanel* mCombinationViewPanel; bool mSingleFolderMode; EViewModeType mViewMode; - LLInventorySingleFolderPanel* mSingleFolderPanelInventory; - LLInventoryGallery* mInventoryGalleryPanel; LLInventorySingleFolderPanel* mCombinationInventoryPanel; LLInventoryGallery* mCombinationGalleryPanel; - LLPanel* mCombinationViewPanel; LLPanel* mCombinationGalleryLayoutPanel; LLPanel* mCombinationListLayoutPanel; -- cgit v1.2.3 From 959829bb7ef737bd5d9748dd27e074d23974e654 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 2 Jun 2023 02:58:56 +0300 Subject: SL-19796 Small cleanup --- indra/newview/llpanelmaininventory.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 61ccfc02a1..ae2e07da11 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -250,8 +250,6 @@ private: bool mForceShowInvLayout; bool mReshapeInvLayout; - bool mDelayedCombGalleryScroll; - bool mDelayedCombInvPanelScroll; // List Commands // //////////////////////////////////////////////////////////////////////////////// }; -- cgit v1.2.3 From d5c1d6c24559ce44c7ab6e1249c50bcb04105e5f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 6 Jun 2023 21:44:46 +0300 Subject: SL-19823 Edit not always active when adding items and folders in single folder view --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index ae2e07da11..6d749f269c 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -250,6 +250,7 @@ private: bool mForceShowInvLayout; bool mReshapeInvLayout; + LLUUID mCombInvUUIDNeedsRename; // List Commands // //////////////////////////////////////////////////////////////////////////////// }; -- cgit v1.2.3 From 480aa58d159f7874bf3b388b7ea836debc23ceb1 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 7 Jun 2023 19:25:09 +0300 Subject: SL-19686 don't build inventory root views on init by default --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 6d749f269c..ee314d1cf3 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -115,6 +115,7 @@ public: void onViewModeClick(); void toggleViewMode(); + void initSingleFolderRoot(const LLUUID& start_folder_id = LLUUID::null); void onUpFolderClicked(); void onBackFolderClicked(); void onForwardFolderClicked(); -- cgit v1.2.3 From 71534d8fa7083355271eba69a7b6045f0c34463f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 14 Jun 2023 02:03:38 +0300 Subject: SL-19686 WIP Switching single folder view for large inventories causes stalls --- indra/newview/llpanelmaininventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index ee314d1cf3..bdc62fd8f7 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -116,6 +116,7 @@ public: void onViewModeClick(); void toggleViewMode(); void initSingleFolderRoot(const LLUUID& start_folder_id = LLUUID::null); + void initInventoryViews(); void onUpFolderClicked(); void onBackFolderClicked(); void onForwardFolderClicked(); -- cgit v1.2.3 From 65fe37a93029e17f45e488619a5e589a2983757f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Sat, 24 Jun 2023 01:49:27 +0300 Subject: SL-19604 Fix gallery view having huge ident at the bottom --- indra/newview/llpanelmaininventory.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelmaininventory.h') diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index bdc62fd8f7..79501e63bc 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -210,7 +210,8 @@ private: LLInventorySingleFolderPanel* mCombinationInventoryPanel; LLInventoryGallery* mCombinationGalleryPanel; LLPanel* mCombinationGalleryLayoutPanel; - LLPanel* mCombinationListLayoutPanel; + LLLayoutPanel* mCombinationListLayoutPanel; + LLLayoutStack* mCombinationLayoutStack; boost::signals2::connection mListViewRootUpdatedConnection; boost::signals2::connection mGalleryRootUpdatedConnection; -- cgit v1.2.3