From a030b30d34ef3152791b123c4f52d4086f3eb549 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 6 Mar 2014 18:15:51 -0800
Subject: DD-4, DD-5, DD-6, DD-7, DD-8: WIP : Add Merchant Items panel and make
 it somewhat work, in a clunky sort of way

---
 .../default/xui/en/floater_merchant_items.xml      | 121 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |   7 ++
 .../xui/en/panel_merchant_items_inventory.xml      |  32 ++++++
 indra/newview/skins/default/xui/en/strings.xml     |   5 +
 4 files changed, 165 insertions(+)
 create mode 100755 indra/newview/skins/default/xui/en/floater_merchant_items.xml
 create mode 100755 indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_merchant_items.xml b/indra/newview/skins/default/xui/en/floater_merchant_items.xml
new file mode 100755
index 0000000000..2e54ed2ce3
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_merchant_items.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+    positioning="cascading"
+    can_close="true"
+    can_resize="true"
+    height="440"
+    help_topic="floater_merchant_items"
+    min_width="300"
+    min_height="200"
+    name="floater_merchant_items"
+    save_rect="true"
+    save_visibility="false"
+    reuse_instance="true"
+    title="MERCHANT ITEMS"
+    width="333">
+  <panel
+      follows="all"
+      layout="topleft"
+      left="0"
+      top="0"
+      label=""
+      height="440"
+      width="333">
+    <panel
+        follows="all"
+        left="10"
+        bottom="370"
+        width="313"
+        top="0"
+        bg_opaque_color="InventoryBackgroundColor">
+        <panel
+            name="merchant_items_inventory_placeholder_panel"
+            follows="all"
+            layout="topleft"
+            top="0"
+            left="0"
+            width="308"
+            height="370"
+            bg_opaque_color="InventoryBackgroundColor">
+            <text
+                name="merchant_items_inventory_placeholder_title"
+                type="string"
+                follows="top|left|right"
+                layout="topleft"
+                top="10"
+                left="0"
+                width="308"
+                height="25"
+                wrap="true"
+                halign="center"
+                font="SansSerifBold">
+                Loading...
+            </text>
+            <text
+            name="merchant_items_inventory_placeholder_text"
+            type="string"
+            follows="top|left|right"
+            layout="topleft"
+            top="35"
+            left="0"
+            width="308"
+            height="130"
+            wrap="true"
+            halign="left" />
+        </panel>
+    </panel>
+    <panel
+        follows="bottom|left|right"
+        left="10"
+        bottom="435"
+        width="313"
+        top="370">
+      <panel
+          name="merchant_items_generic_drag_target"
+          mouse_opaque="false"
+          follows="all"
+          top="5"
+          left="5"
+          width="303"
+          height="25"
+          background_visible="false"
+          bg_alpha_color="EmphasisColor_35"
+          border="true"
+          bevel_style="in"
+          visible="true">
+        <text
+            type="string"
+            follows="all"
+            layout="topleft"
+            top="6"
+            height="20"
+            left="5"
+            width="293"
+            halign="center"
+            font="SansSerifMedium"
+            font_shadow="hard"
+            valign="top">
+          Drag items you want to sell
+        </text>
+      </panel>
+    </panel>
+    <layout_stack name="import_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">
+          <layout_panel width="0" />
+          <layout_panel width="24" auto_resize="false">
+            <loading_indicator
+                height="24"
+                layout="topleft"
+                left="0"
+                top="0"
+                width="24" />
+          </layout_panel>
+          <layout_panel width="0" />
+        </layout_stack>
+      </layout_panel>
+      <layout_panel />
+    </layout_stack>
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 64de010eb5..2dc974eff1 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -181,6 +181,13 @@
          function="Floater.ToggleOrBringToFront"
          parameter="outbox" />
       </menu_item_call>
+        <menu_item_call
+            label="Merchant Items..."
+            name="MerchantItems">
+            <menu_item_call.on_click
+            function="Floater.ToggleOrBringToFront"
+            parameter="merchant_items" />
+        </menu_item_call>
       <menu_item_call
            label="Account dashboard..."
            name="Manage My Account">
diff --git a/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml b/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml
new file mode 100755
index 0000000000..a013516267
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    name="inventory_merchant_items"
+    start_folder.name="Merchant items"
+    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>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9300652eaa..515e912ee5 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2219,6 +2219,11 @@ We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace
 	<string name="InventoryOutboxError">
 The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	</string>
+	<string name="InventoryMerchantItemsNoItemsTitle">Your Merchant Items folder is empty.</string>
+	<string name="InventoryMerchantItemsNoItemsTooltip"></string>
+	<string name="InventoryMerchantItemsNoItems">
+        Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
+	</string>
 
 	<string name="Marketplace Error None">No errors</string>
 	<string name="Marketplace Error Not Merchant">Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
-- 
cgit v1.2.3