DD-17, DD-40 : Style active listings in bold, implement a working initialization indicator

5 files changed, 45 insertions, 17 deletions

diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp
index d9bc3a1ce0..281e9124e7 100755
--- a/indra/newview/llfloateroutbox.cpp
+++ b/indra/newview/llfloateroutbox.cpp
@@ -661,6 +661,8 @@ LLFloaterMarketplaceListings::LLFloaterMarketplaceListings(const LLSD& key)
 , mCategoriesObserver(NULL)
 , mCategoryAddedObserver(NULL)
 , mRootFolderId(LLUUID::null)
+, mInventoryStatus(NULL)
+, mInventoryInitializationInProgress(NULL)
 , mInventoryPlaceholder(NULL)
 , mInventoryText(NULL)
 , mInventoryTitle(NULL)
@@ -685,6 +687,8 @@ LLFloaterMarketplaceListings::~LLFloaterMarketplaceListings()
 
 BOOL LLFloaterMarketplaceListings::postBuild()
 {
+	mInventoryStatus = getChild<LLTextBox>("marketplace_status");
+	mInventoryInitializationInProgress = getChild<LLView>("initialization_progress_indicator");
 	mInventoryPlaceholder = getChild<LLView>("marketplace_listings_inventory_placeholder_panel");
 	mInventoryText = mInventoryPlaceholder->getChild<LLTextBox>("marketplace_listings_inventory_placeholder_text");
 	mInventoryTitle = mInventoryPlaceholder->getChild<LLTextBox>("marketplace_listings_inventory_placeholder_title");
@@ -883,6 +887,11 @@ S32 LLFloaterMarketplaceListings::getFolderCount()
     }
 }
 
+void LLFloaterMarketplaceListings::setStatusString(const std::string& statusString)
+{
+	mInventoryStatus->setText(statusString);
+}
+
 void LLFloaterMarketplaceListings::updateView()
 {
 	LLInventoryPanel* panel = mInventoryPanel.get();
@@ -1048,28 +1057,17 @@ void LLFloaterMarketplaceListings::importStatusChanged(bool inProgress)
 	{
 		setup();
 	}
-	/*
+
 	if (inProgress)
 	{
-		if (mImportBusy)
-		{
-			setStatusString(getString("OutboxImporting"));
-		}
-		else
-		{
-			setStatusString(getString("OutboxInitializing"));
-		}
-		
-		mImportBusy = true;
-		mInventoryImportInProgress->setVisible(true);
+        setStatusString(getString("MarketplaceListingsInitializing"));
+		mInventoryInitializationInProgress->setVisible(true);
 	}
 	else
 	{
 		setStatusString("");
-		mImportBusy = false;
-		mInventoryImportInProgress->setVisible(false);
+		mInventoryInitializationInProgress->setVisible(false);
 	}
-    */
 	
 	updateView();
 }
diff --git a/indra/newview/llfloateroutbox.h b/indra/newview/llfloateroutbox.h
index e28fb320ea..04a9f91f51 100755
--- a/indra/newview/llfloateroutbox.h
+++ b/indra/newview/llfloateroutbox.h
@@ -147,6 +147,7 @@ protected:
 	void importReportResults(U32 status, const LLSD& content);
 	void importStatusChanged(bool inProgress);
 	void initializationReportError(U32 status, const LLSD& content);
+	void setStatusString(const std::string& statusString);
 
 	void onClose(bool app_quitting);
 	void onOpen(const LLSD& key);
@@ -163,6 +164,8 @@ private:
 	LLInventoryCategoriesObserver *		mCategoriesObserver;
 	LLInventoryCategoryAddedObserver *	mCategoryAddedObserver;
 		
+	LLTextBox *		mInventoryStatus;
+	LLView *		mInventoryInitializationInProgress;
 	LLView *		mInventoryPlaceholder;
 	LLTextBox *		mInventoryText;
 	LLTextBox *		mInventoryTitle;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 38dcb24477..3d418105e3 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1945,8 +1945,8 @@ void LLFolderBridge::buildDisplayName() const
 
 std::string LLFolderBridge::getLabelSuffix() const
 {
+    // *TODO : We need to display some suffix also for the version folder!
     /*
-     
      LLInventoryCategory* cat = gInventory.getCategory(getUUID());
      if(cat)
      {
@@ -1983,6 +1983,18 @@ std::string LLFolderBridge::getLabelSuffix() const
 	}
 }
 
+LLFontGL::StyleFlags LLFolderBridge::getLabelStyle() const
+{
+	if (isMarketplaceListingsFolder() && LLMarketplaceData::instance().getActivationState(getUUID()))
+	{
+		return LLFontGL::BOLD;
+	}
+	else
+	{
+		return LLFontGL::NORMAL;
+	}
+}
+
 
 void LLFolderBridge::update()
 {
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index d9533b537c..26c48fdc57 100755
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -276,6 +276,7 @@ public:
 	virtual LLUIImagePtr getIconOpen() const;
 	virtual LLUIImagePtr getIconOverlay() const;
 	virtual std::string getLabelSuffix() const;
+	virtual LLFontGL::StyleFlags getLabelStyle() const;
 	static LLUIImagePtr getIcon(LLFolderType::EType preferred_type);
 
 	virtual BOOL renameItem(const std::string& new_name);
diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
index 94a9466c16..b212518f85 100755
--- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
@@ -13,6 +13,7 @@
     reuse_instance="true"
     title="MARKETPLACE LISTINGS"
     width="333">
+    <string name="MarketplaceListingsInitializing">Initializing...</string>
   <panel
       follows="all"
       layout="topleft"
@@ -98,8 +99,21 @@
           Drag items you want to sell
         </text>
       </panel>
+        <text
+        name="marketplace_status"
+        type="string"
+        follows="all"
+        layout="topleft"
+        top="40"
+        left="5"
+        width="150"
+        height="20"
+        wrap="true"
+        halign="left"
+        valign="center"
+        font="SansSerif"/>
     </panel>
-    <layout_stack name="import_progress_indicator" orientation="vertical" left="0" height="440" top="0" width="333" follows="all" visible="false">
+    <layout_stack name="initialization_progress_indicator" orientation="vertical" left="0" height="440" top="0" width="333" follows="all" visible="false">
       <layout_panel />
       <layout_panel height="24" auto_resize="false">
         <layout_stack orientation="horizontal" left="0" height="24" top="0" width="333" follows="all">