DD-50 : WIP : Add tabs to the marketplace listing UI

2 files changed, 132 insertions, 40 deletions

diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp
index a1661a2a94..92c120a0b6 100755
--- a/indra/newview/llfloateroutbox.cpp
+++ b/indra/newview/llfloateroutbox.cpp
@@ -831,13 +831,16 @@ void LLFloaterMarketplaceListings::setup()
 	llassert(mCategoriesObserver);
 	
 	// Set up the marketplace listings inventory view
-	LLInventoryPanel* inventory_panel = mInventoryPanel.get();
-    if (inventory_panel)
-    {
-        delete inventory_panel;
-    }
-    inventory_panel = LLUICtrlFactory::createFromFile<LLInventoryPanel>("panel_marketplace_listings_inventory.xml", mInventoryPlaceholder->getParent(), LLInventoryPanel::child_registry_t::instance());
-    mInventoryPanel = inventory_panel->getInventoryPanelHandle();
+//	LLInventoryPanel* inventory_panel = mInventoryPanel.get();
+//    if (inventory_panel)
+//    {
+//        delete inventory_panel;
+//    }
+//    inventory_panel = LLUICtrlFactory::createFromFile<LLInventoryPanel>("panel_marketplace_listings_inventory.xml", mInventoryPlaceholder->getParent(), LLInventoryPanel::child_registry_t::instance());
+//    mInventoryPanel = inventory_panel->getInventoryPanelHandle();
+    LLPanel* inventory_panel = LLUICtrlFactory::createFromFile<LLPanel>("panel_marketplace_listings_inventory.xml", mInventoryPlaceholder->getParent(), LLInventoryPanel::child_registry_t::instance());
+	LLInventoryPanel* all_items_panel = inventory_panel->getChild<LLInventoryPanel>("All Items");
+    mInventoryPanel = all_items_panel->getInventoryPanelHandle();
 	llassert(mInventoryPanel.get() != NULL);
 	
 	// Reshape the inventory to the proper size
@@ -845,8 +848,8 @@ void LLFloaterMarketplaceListings::setup()
 	inventory_panel->setShape(inventory_placeholder_rect);
 	
 	// Set the sort order newest to oldest
-	inventory_panel->getFolderViewModel()->setSorter(LLInventoryFilter::SO_FOLDERS_BY_NAME);
-	inventory_panel->getFilter().markDefault();
+	all_items_panel->getFolderViewModel()->setSorter(LLInventoryFilter::SO_FOLDERS_BY_NAME);
+	all_items_panel->getFilter().markDefault();
     
 	// Get the content of the marketplace listings folder
 	fetchContents();
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
index dcb634fe59..33ac08d87f 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
@@ -1,32 +1,121 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<inventory_panel
-    name="inventory_marketplace_listings"
-    start_folder.name="Marketplace listings"
-    show_empty_message="false"
-    show_load_status="false"
-    start_folder.type="merchant"
-    follows="all" layout="topleft"
-    top="0" left="0" height="165" width="308"
-    top_pad="0"
-    bg_opaque_color="DkGray2"
-    bg_alpha_color="DkGray2"
-    background_visible="true"
-    border="false"
-    bevel_style="none"
-    show_item_link_overlays="true"
-    tool_tip="Drag and drop items here to sell them"
-    scroll.reserve_scroll_corner="false">
-      <folder folder_arrow_image="Folder_Arrow"
-              folder_indentation="8"
-              item_height="20"
-              item_top_pad="4"
-              selection_image="Rounded_Square"
-              left_pad="5"
-              icon_pad="2"
-              icon_width="16"
-              text_pad="1"
-              text_pad_right="4"
-              arrow_size="12"
-              max_folder_item_overlap="2"/>
-      <item allow_open="false"/>
-</inventory_panel>
+<panel
+    default_tab_group="1"
+    follows="all"
+    label="Marketplace"
+    layout="topleft"
+    height="370"
+    width="308"
+    name="main marketplace panel">
+    <tab_container
+        follows="all"
+        halign="center"
+        height="370"
+        layout="topleft"
+        top="0"
+        left="0"
+        name="inventory filter tabs"
+        tab_height="30"
+        tab_group="1"
+        tab_position="top"
+        tab_min_width="100"
+        top_pad="0"
+        width="308">
+        <inventory_panel
+        label="ALL"
+        name="All Items"
+        start_folder.name="Marketplace listings"
+        show_empty_message="false"
+        show_load_status="false"
+        start_folder.type="merchant"
+        tool_tip="Drag and drop items here to sell them"
+        bg_opaque_color="DkGray2"
+        bg_alpha_color="DkGray2"
+        background_visible="true"
+        border="false"
+        bevel_style="none"
+        follows="all"
+        height="340"
+        help_topic="marketplace_tab"
+        layout="topleft"
+        left="0"
+        sort_order_setting="InventorySortOrder"
+        show_item_link_overlays="true"
+        top="16"
+        width="308">
+            <folder folder_arrow_image="Folder_Arrow"
+            folder_indentation="8"
+            item_height="20"
+            item_top_pad="4"
+            selection_image="Rounded_Square"
+            left_pad="5"
+            icon_pad="2"
+            icon_width="16"
+            text_pad="1"
+            text_pad_right="4"
+            arrow_size="12"
+            max_folder_item_overlap="2"/>
+            <item allow_open="false"/>
+        </inventory_panel>
+        <inventory_panel
+        label="ACTIVE"
+        name="Active Items"
+        start_folder.name="Marketplace listings"
+        show_empty_message="false"
+        show_load_status="false"
+        start_folder.type="merchant"
+        bg_opaque_color="DkGray2"
+        bg_alpha_color="DkGray2"
+        background_visible="true"
+        border="false"
+        bevel_style="none"
+        follows="all"
+        height="340"
+        help_topic="marketplace_tab"
+        layout="topleft"
+        left_delta="0"
+        show_item_link_overlays="true"
+        width="308">
+        </inventory_panel>
+        <inventory_panel
+            label="INACTIVE"
+            name="Inactive Items"
+            start_folder.name="Marketplace listings"
+            show_empty_message="false"
+            show_load_status="false"
+            start_folder.type="merchant"
+            bg_opaque_color="DkGray2"
+            bg_alpha_color="DkGray2"
+            background_visible="true"
+            border="false"
+            bevel_style="none"
+            follows="all"
+            height="340"
+            help_topic="marketplace_tab"
+            layout="topleft"
+            left_delta="0"
+            show_item_link_overlays="true"
+            width="308">
+        </inventory_panel>
+        <inventory_panel
+            label="UNASSOCIATED"
+            name="Unassociated Items"
+            start_folder.name="Marketplace listings"
+            show_empty_message="false"
+            show_load_status="false"
+            start_folder.type="merchant"
+            bg_opaque_color="DkGray2"
+            bg_alpha_color="DkGray2"
+            background_visible="true"
+            border="false"
+            bevel_style="none"
+            follows="all"
+            height="340"
+            help_topic="marketplace_tab"
+            layout="topleft"
+            left_delta="0"
+            show_item_link_overlays="true"
+            width="308">
+        </inventory_panel>
+    </tab_container>
+</panel>
\ No newline at end of file