From 512e77fbbd94838cc3794b64f522b7de13200958 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 8 Nov 2008 18:05:22 -0600 Subject: Added XUI for the Quick Filter combo box. --- .../skins/default/xui/en-us/floater_inventory.xml | 59 ++++++++++++++++++++-- 1 file changed, 54 insertions(+), 5 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml index 1cb1da0..7d0f086 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml @@ -5,18 +5,67 @@ title="Inventory" width="467"> - + + + Quick Filter: + + + + + Show All Items + + + + Animations + + + Calling Cards + + + Clothing + + + Gestures + + + Landmarks + + + Notecards + + + Objects + + + Scripts + + + Sounds + + + Textures + + + Snapshots + + + + + + setSearchCallback(onSearchEdit, this); } + mQuickFilterCombo = getChild("Quick Filter"); + if (mQuickFilterCombo) + { + mQuickFilterCombo->setCommitCallback(onQuickFilterCommit); + } + sActiveViews.put(this); gInventory.addObserver(this); @@ -981,6 +988,15 @@ void LLInventoryView::onSearchEdit(const std::string& search_string, void* user_ } +//static +void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data) +{ + LLComboBox* quickfilter = (LLComboBox*)ctrl; + + llinfos << "Quick Filter: " << quickfilter->getSimple() << llendl; +} + + // static // BOOL LLInventoryView::incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward) // { diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h index a37d370..ec621ec 100644 --- a/linden/indra/newview/llinventoryview.h +++ b/linden/indra/newview/llinventoryview.h @@ -58,6 +58,7 @@ class LLCheckBoxCtrl; class LLSpinCtrl; class LLScrollableContainerView; class LLTextBox; +class LLComboBox; class LLIconCtrl; class LLSaveFolderState; class LLSearchEditor; @@ -239,6 +240,7 @@ public: static void onFoldersByName(void *user_data); static BOOL checkFoldersByName(void *user_data); static void onSearchEdit(const std::string& search_string, void* user_data ); + static void onQuickFilterCommit(LLUICtrl* ctrl, void* user_data); static void onFilterSelected(void* userdata, bool from_click); static void onSelectionChange(const std::deque &items, BOOL user_action, void* data); @@ -259,6 +261,7 @@ protected: protected: LLSearchEditor* mSearchEditor; + LLComboBox* mQuickFilterCombo; LLTabContainer* mFilterTabs; LLHandle mFinderHandle; LLInventoryPanel* mActivePanel; -- cgit v1.1 From ff0244c3120757f7074fd5162f370ad8f6646ed2 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 8 Nov 2008 22:10:34 -0600 Subject: Quick Filter works, but is a bit rough. It doesn't refresh its display when you change tabs, and the Show Filters window doesn't refresh either. --- linden/indra/newview/llinventoryview.cpp | 77 +++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index edc1ca7..e0061ba 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp @@ -991,9 +991,84 @@ void LLInventoryView::onSearchEdit(const std::string& search_string, void* user_ //static void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data) { + LLComboBox* quickfilter = (LLComboBox*)ctrl; - llinfos << "Quick Filter: " << quickfilter->getSimple() << llendl; + + LLInventoryView* view = (LLInventoryView*)(quickfilter->getParent()); + if (!view->mActivePanel) + { + return; + } + + + std::string item_type = quickfilter->getSimple(); + U32 filter_type; + + if ("Animations" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_ANIMATION; + } + + else if ("Calling Cards" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_CALLINGCARD; + } + + else if ("Clothing" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_WEARABLE; + } + + else if ("Gestures" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_GESTURE; + } + + else if ("Landmarks" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_LANDMARK; + } + + else if ("Notecards" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_NOTECARD; + } + + else if ("Objects" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_OBJECT; + } + + else if ("Scripts" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_LSL; + } + + else if ("Sounds" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_SOUND; + } + + else if ("Textures" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_TEXTURE; + } + + else if ("Snapshots" == item_type) + { + filter_type = 0x1 << LLInventoryType::IT_SNAPSHOT; + } + + else + { + // Show all types + filter_type = 0xffffffff; + } + + view->mActivePanel->setFilterTypes( filter_type ); + + llinfos << "Quick Filter: " << item_type << llendl; } -- cgit v1.1 From 0cb6f6fcdc6b8b58e777b5819a4283da0e5d4620 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 8 Nov 2008 22:37:38 -0600 Subject: Added 'Custom' filter option (opens filters window). --- linden/indra/newview/llinventoryview.cpp | 10 ++++++++++ .../newview/skins/default/xui/en-us/floater_inventory.xml | 3 +++ 2 files changed, 13 insertions(+) (limited to 'linden') diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index e0061ba..6d5bf4d 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp @@ -1060,6 +1060,16 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data) filter_type = 0x1 << LLInventoryType::IT_SNAPSHOT; } + else if ("Custom..." == item_type) + { + // When they select custom, show the floater then return + if( !(view->filtersVisible(view)) ) + { + view->toggleFindOptions(); + } + return; + } + else { // Show all types diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml index 7d0f086..9cda2a9 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml @@ -50,6 +50,9 @@ Snapshots + + Custom... + mActivePanel->setFilterTypes( filter_type ); + + // Force the filters window to update itself, if it's open. + LLInventoryViewFinder* finder = view->getFinder(); + if( finder ) + { + finder->updateElementsFromFilter(); + } + + llinfos << "Quick Filter: " << item_type << llendl; } -- cgit v1.1 From 7420e9f3599b8974cc86758af88eebc966e57214 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 22 Nov 2008 01:21:22 -0600 Subject: Quick Filter combo box refreshes properly. --- linden/indra/newview/llinventoryview.cpp | 128 +++++++++++++++++++++++++++++++ linden/indra/newview/llinventoryview.h | 1 + 2 files changed, 129 insertions(+) (limited to 'linden') diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index 07b5115..97f4644 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp @@ -624,6 +624,11 @@ void LLInventoryView::draw() { mSearchEditor->setText(mActivePanel->getFilterSubString()); } + if (mActivePanel && mQuickFilterCombo) + { + refreshQuickFilter( mQuickFilterCombo ); + } + LLFloater::draw(); } @@ -1091,6 +1096,129 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data) } + +//static +void LLInventoryView::refreshQuickFilter(LLUICtrl* ctrl) +{ + + LLInventoryView* view = (LLInventoryView*)(ctrl->getParent()); + if (!view->mActivePanel) + { + return; + } + + LLComboBox* quickfilter = view->getChild("Quick Filter"); + if (!quickfilter) + { + return; + } + + + U32 filter_type = view->mActivePanel->getFilterTypes(); + + + // Mask to extract only the bit fields we care about. + // *TODO: There's probably a cleaner way to construct this mask. + U32 filter_mask = 0; + filter_mask |= (0x1 << LLInventoryType::IT_ANIMATION); + filter_mask |= (0x1 << LLInventoryType::IT_CALLINGCARD); + filter_mask |= (0x1 << LLInventoryType::IT_WEARABLE); + filter_mask |= (0x1 << LLInventoryType::IT_GESTURE); + filter_mask |= (0x1 << LLInventoryType::IT_LANDMARK); + filter_mask |= (0x1 << LLInventoryType::IT_NOTECARD); + filter_mask |= (0x1 << LLInventoryType::IT_OBJECT); + filter_mask |= (0x1 << LLInventoryType::IT_LSL); + filter_mask |= (0x1 << LLInventoryType::IT_SOUND); + filter_mask |= (0x1 << LLInventoryType::IT_TEXTURE); + filter_mask |= (0x1 << LLInventoryType::IT_SNAPSHOT); + + + filter_type &= filter_mask; + + + //llinfos << "filter_type: " << filter_type << llendl; + + std::string selection; + + + if (filter_type == filter_mask) + { + selection = "Show All Items"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_ANIMATION)) + { + selection = "Animations"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_CALLINGCARD)) + { + selection = "Calling Cards"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_WEARABLE)) + { + selection = "Clothing"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_GESTURE)) + { + selection = "Gestures"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_LANDMARK)) + { + selection = "Landmarks"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_NOTECARD)) + { + selection = "Notecards"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_OBJECT)) + { + selection = "Objects"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_LSL)) + { + selection = "Scripts"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_SOUND)) + { + selection = "Sounds"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_TEXTURE)) + { + selection = "Textures"; + } + + else if (filter_type == (0x1 << LLInventoryType::IT_SNAPSHOT)) + { + selection = "Snapshots"; + } + + else + { + selection = "Custom..."; + } + + + // Select the chosen item by label text + BOOL result = quickfilter->setSimple( (selection) ); + + if( !result ) + { + llinfos << "The item didn't exist: " << selection << llendl; + } + +} + + + // static // BOOL LLInventoryView::incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward) // { diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h index ec621ec..cce30aa 100644 --- a/linden/indra/newview/llinventoryview.h +++ b/linden/indra/newview/llinventoryview.h @@ -241,6 +241,7 @@ public: static BOOL checkFoldersByName(void *user_data); static void onSearchEdit(const std::string& search_string, void* user_data ); static void onQuickFilterCommit(LLUICtrl* ctrl, void* user_data); + static void refreshQuickFilter(LLUICtrl* ctrl); static void onFilterSelected(void* userdata, bool from_click); static void onSelectionChange(const std::deque &items, BOOL user_action, void* data); -- cgit v1.1 From be1e46e95368920ecbee59c1fef7d0e54fa6d4d0 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 22 Nov 2008 01:39:02 -0600 Subject: Disabled testing output when changing quick filter. --- linden/indra/newview/llinventoryview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index 97f4644..5470e30 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp @@ -1091,8 +1091,8 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data) finder->updateElementsFromFilter(); } + // llinfos << "Quick Filter: " << item_type << llendl; - llinfos << "Quick Filter: " << item_type << llendl; } -- cgit v1.1 From dd541253e46f56b5fae76262c4f20396d7a21c57 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 22 Nov 2008 01:51:58 -0600 Subject: Bogus quick filter strings should be ignored. --- linden/indra/newview/llinventoryview.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index 5470e30..743c068 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp @@ -1075,12 +1075,18 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data) return; } - else + else if ("Show All Items" == item_type) { // Show all types filter_type = 0xffffffff; } + else + { + llwarns << "Ignoring unknown filter: " << item_type << llendl; + return; + } + view->mActivePanel->setFilterTypes( filter_type ); -- cgit v1.1 From fd776f1de80fd8b1dc19be5587ee165af2c18162 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 22 Nov 2008 01:59:58 -0600 Subject: Renamed "Show All Items" filter to "All Types". --- linden/indra/newview/llinventoryview.cpp | 4 ++-- linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index 743c068..e9544af 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp @@ -1075,7 +1075,7 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data) return; } - else if ("Show All Items" == item_type) + else if ("All Types" == item_type) { // Show all types filter_type = 0xffffffff; @@ -1149,7 +1149,7 @@ void LLInventoryView::refreshQuickFilter(LLUICtrl* ctrl) if (filter_type == filter_mask) { - selection = "Show All Items"; + selection = "All Types"; } else if (filter_type == (0x1 << LLInventoryType::IT_ANIMATION)) diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml index 9cda2a9..6e9eb86 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml @@ -14,7 +14,7 @@ - Show All Items + All Types -- cgit v1.1 From a00ab3da77a672f2138142db2c78229f95f69687 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 22 Nov 2008 02:18:13 -0600 Subject: Renamed "Clothing" filter to "Clothing / Body Parts". --- linden/indra/newview/llinventoryview.cpp | 4 ++-- .../newview/skins/default/xui/en-us/floater_inventory.xml | 10 +++++++--- .../skins/default/xui/en-us/floater_inventory_view_finder.xml | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index e9544af..de8dacb 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp @@ -1020,7 +1020,7 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data) filter_type = 0x1 << LLInventoryType::IT_CALLINGCARD; } - else if ("Clothing" == item_type) + else if ("Clothing / Body Parts" == item_type) { filter_type = 0x1 << LLInventoryType::IT_WEARABLE; } @@ -1164,7 +1164,7 @@ void LLInventoryView::refreshQuickFilter(LLUICtrl* ctrl) else if (filter_type == (0x1 << LLInventoryType::IT_WEARABLE)) { - selection = "Clothing"; + selection = "Clothing / Body Parts"; } else if (filter_type == (0x1 << LLInventoryType::IT_GESTURE)) diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml index 6e9eb86..3cb586f 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml @@ -12,7 +12,11 @@ + height="20" left="80" width="150" bottom_delta="0"> + + + All Types @@ -23,8 +27,8 @@ Calling Cards - - Clothing + + Clothing / Body Parts Gestures diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml index 9a9b8db..728ae1c 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml @@ -1,8 +1,8 @@ + left="457" min_height="408" min_width="170" mouse_opaque="true" + name="Inventory Finder" title="inventory_recent_items" width="170"> @@ -20,7 +20,7 @@ image_name="inv_item_shirt.tga" left="8" mouse_opaque="true" name="icon_clothing" width="16" /> add(label, LLSD(value) ); } + + else if (child->hasName("separator")) + { + combo_box->addSeparator(); + } } } -- cgit v1.1 From 5db0461139ec6f097786483b979f5e6d3e059579 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 22 Nov 2008 02:45:14 -0600 Subject: Added separators to Quick Filter. --- linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml index 3cb586f..653713b 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml @@ -20,7 +20,9 @@ All Types - + + + Animations @@ -54,6 +56,9 @@ Snapshots + + + Custom... -- cgit v1.1 From c595f2d4e8a3f2b74882be1dbb8e00a6ac3df428 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 22 Nov 2008 03:37:36 -0600 Subject: Cleaned up Show Filters floater XML. --- .../xui/en-us/floater_inventory_view_finder.xml | 220 ++++++++++++--------- 1 file changed, 122 insertions(+), 98 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml index 728ae1c..befcc96 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml @@ -1,102 +1,126 @@ - - - - - - - - - - - - - - - - - - - - - - - -