Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[VMM] Empty Lookup Message

Browse Source 
Even though it doesn't seem to show for some reason
This commit is contained in:
Lirusaito
2019-03-09 15:37:53 -05:00
parent c2eeea8b70
commit e55c8e20e5
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloatermarketplacelistings.cpp
View File

@@ -106,22 +106,22 @@ void LLPanelMarketplaceListings::buildAllPanels()
// Build the All panel first // Build the All panel first
LLInventoryPanel* panel_all_items; LLInventoryPanel* panel_all_items;
panel_all_items = buildInventoryPanel("All Items", "panel_marketplace_listings_inventory.xml"); panel_all_items = buildInventoryPanel("All Items", "panel_marketplace_listings_inventory.xml");
//panel_all_items->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems"); panel_all_items->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems");
panel_all_items->getFilter().markDefault(); panel_all_items->getFilter().markDefault();
// Build the other panels // Build the other panels
LLInventoryPanel* panel; LLInventoryPanel* panel;
panel = buildInventoryPanel("Active Items", "panel_marketplace_listings_listed.xml"); panel = buildInventoryPanel("Active Items", "panel_marketplace_listings_listed.xml");
panel->getFilter().setFilterMarketplaceActiveFolders(); panel->getFilter().setFilterMarketplaceActiveFolders();
//panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems"); panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems");
panel->getFilter().markDefault(); panel->getFilter().markDefault();
panel = buildInventoryPanel("Inactive Items", "panel_marketplace_listings_unlisted.xml"); panel = buildInventoryPanel("Inactive Items", "panel_marketplace_listings_unlisted.xml");
panel->getFilter().setFilterMarketplaceInactiveFolders(); panel->getFilter().setFilterMarketplaceInactiveFolders();
//panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems"); panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems");
panel->getFilter().markDefault(); panel->getFilter().markDefault();
panel = buildInventoryPanel("Unassociated Items", "panel_marketplace_listings_unassociated.xml"); panel = buildInventoryPanel("Unassociated Items", "panel_marketplace_listings_unassociated.xml");
panel->getFilter().setFilterMarketplaceUnassociatedFolders(); panel->getFilter().setFilterMarketplaceUnassociatedFolders();
//panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems"); panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems");
panel->getFilter().markDefault(); panel->getFilter().markDefault();
// Set the tab panel // Set the tab panel

2
indra/newview/llfolderview.cpp
View File

@@ -957,7 +957,7 @@ void LLFolderView::draw()
} }
else else
{ {
mStatusText = LLTrans::getString("InventoryNoMatchingItems"); //, args); mStatusText = getFilter().getEmptyLookupMessage();
} }
mStatusTextBox->setWrappedText(mStatusText); mStatusTextBox->setWrappedText(mStatusText);
mStatusTextBox->setVisible( TRUE ); mStatusTextBox->setVisible( TRUE );

15
indra/newview/llinventoryfilter.cpp
View File

@@ -73,6 +73,7 @@ LLInventoryFilter::LLInventoryFilter(const Params& p)
mFilterSubString(p.substring), mFilterSubString(p.substring),
mName(p.name), mName(p.name),
mFilterModified(FILTER_NONE), mFilterModified(FILTER_NONE),
mEmptyLookupMessage("InventoryNoMatchingItems"),
mCurrentGeneration(0), mCurrentGeneration(0),
mFirstRequiredGeneration(0), mFirstRequiredGeneration(0),
mFirstSuccessGeneration(0) mFirstSuccessGeneration(0)
@@ -1290,6 +1291,20 @@ S32 LLInventoryFilter::getFirstRequiredGeneration() const
return mFirstRequiredGeneration; return mFirstRequiredGeneration;
} }
void LLInventoryFilter::setEmptyLookupMessage(const std::string& message)
{
mEmptyLookupMessage = message;
}
std::string LLInventoryFilter::getEmptyLookupMessage() const
{
LLStringUtil::format_map_t args;
args["[SEARCH_TERM]"] = LLURI::escape(getFilterSubStringOrig());
return LLTrans::getString(mEmptyLookupMessage, args);
}
bool LLInventoryFilter::areDateLimitsSet() bool LLInventoryFilter::areDateLimitsSet()
{ {
return mFilterOps.mMinDate != time_min() return mFilterOps.mMinDate != time_min()

3
indra/newview/llinventoryfilter.h
View File

@@ -240,6 +240,9 @@ public:
void setShowFolderState( EFolderShow state); void setShowFolderState( EFolderShow state);
EFolderShow getShowFolderState() const; EFolderShow getShowFolderState() const;
void setEmptyLookupMessage(const std::string& message);
std::string getEmptyLookupMessage() const;
void setSortOrder(U32 order); void setSortOrder(U32 order);
U32 getSortOrder() const; U32 getSortOrder() const;