From 734b1b5d421254c45b3eb0fe0a5bbc8159e489fc Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 17 Feb 2023 15:47:03 +0200
Subject: SL-19105 WIP Single-folder inventory view

---
 .../skins/default/xui/en/floater_my_inventory.xml  |   4 +-
 .../skins/default/xui/en/menu_inventory.xml        |  14 +
 .../default/xui/en/menu_inventory_gear_default.xml |  37 +-
 .../default/xui/en/menu_inventory_view_default.xml |   3 +
 indra/newview/skins/default/xui/en/menu_viewer.xml |   9 +
 .../skins/default/xui/en/panel_main_inventory.xml  | 394 +++++++++++++--------
 .../skins/default/xui/en/sidepanel_inventory.xml   |   8 +-
 7 files changed, 318 insertions(+), 151 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index f182d27da8..1b4f323d04 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -5,14 +5,14 @@
  can_resize="true"
  height="570"
  help_topic="sidebar_inventory"
- min_width="333"
+ min_width="363"
  min_height="590"
  name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
  reuse_instance="true"
  title="INVENTORY"
- width="333" >
+ width="363" >
    <panel
     class="sidepanel_inventory"
     name="main_panel"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index aa3d0ae071..5fe53526c7 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -401,6 +401,20 @@
          parameter="model" />
       </menu_item_call>
     </menu>
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+      <menu_item_call.on_click
+       function="Inventory.OpenSelectedFolder"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+      <menu_item_call.on_click
+       function="Inventory.OpenNewFolderWindow"/>
+    </menu_item_call>
     <menu
      label="Change Type"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 3fb2e01e5b..027dd40d08 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -6,15 +6,39 @@
  mouse_opaque="false"
  name="menu_gear_default"
  visible="false">
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+       <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="open_in_current_window" />
+       <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="open_folder" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="open_in_new_window" />
+        <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="open_folder" />
+    </menu_item_call>
     <menu_item_call
      label="New Folder Window"
      layout="topleft"
      shortcut="control|shift|J"
-     enabled="false"
      name="new_single_folder">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="new_window" />
+         parameter="new_single_folder_window" />
     </menu_item_call>
     <menu_item_call
      label="New Inventory Window"
@@ -32,6 +56,9 @@
         <on_click
          function="Inventory.GearDefault.Custom.Action"
          parameter="close_folders" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
@@ -115,6 +142,9 @@
         <on_enable
          function="Inventory.GearDefault.Enable"
          parameter="empty_lostnfound" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_call>
     <menu_item_call
      label="Empty Trash"
@@ -126,5 +156,8 @@
         <on_enable
          function="Inventory.GearDefault.Enable"
          parameter="empty_trash" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index 6e3cfd9cee..0fcdb1cda0 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -49,5 +49,8 @@
         <on_check
          function="Inventory.GearDefault.Check"
          parameter="sort_system_folders_to_top" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 58584345a9..de11a2c0e9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -36,6 +36,15 @@
          function="Inventory.NewWindow"
          parameter="" />
       </menu_item_call>
+      <menu_item_call
+       label="New Folder Window"
+       name="new_single_folder"
+       shortcut="control|shift|J"
+       visible="false">
+        <menu_item_call.on_click
+         function="Inventory.NewFolderWindow"
+         parameter="" />
+      </menu_item_call>
       <menu_item_call
        label="Places..."
        name="Places"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d437f98e91..606c2175d8 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -23,6 +23,9 @@
    name="ItemcountUnknown">
     Fetched [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER]
   </panel.string>
+  <panel.string name="inventory_title">INVENTORY</panel.string>
+  <panel.string name="default_mode_btn">Command_AboutLand_Icon</panel.string>
+  <panel.string name="single_folder_mode_btn">Command_Map_Icon</panel.string>
   <text
 		     type="string"
 		     length="1"
@@ -38,157 +41,262 @@
 		     width="300">
     Items:
   </text>
-  <combo_box
-   height="23"
-   layout="topleft"
-   left="3"
-   top="18"
-   name="search_type"
-   follows="top|left"
-   width="67">
-    <item
-     label="Name"
-     name="Name"
-     value="search_by_name"/>
-    <item
-     label="Creator"
-     name="Creator"
-     value="search_by_creator"/>
-    <item
-     label="Description"
-     name="Description"
-     value="search_by_description"/>
-    <item
-     label="UUID"
-     name="UUID"
-     value="search_by_UUID"/>
-  </combo_box>
-  <menu_button
-   follows="top|left"
-   tool_tip="Show search visibility options"
-   height="23"
-   image_overlay="Inv_Toolbar_SearchVisibility"
-   layout="topleft"
-   left_pad="1"
-   name="options_visibility_btn"
-   width="31" />
-  <filter_editor
-   text_pad_left="10"
+  <layout_stack
    follows="left|top|right"
-   height="23"
-   label="Enter search text"
-   layout="topleft"
-   left_pad="1"
-   max_length_chars="300"
-   highlight_text_field="true"
-   name="inventory search editor"
-   width="99" />
-  <menu_button
-   follows="top|right"
-   tool_tip="Show additional options"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="OptionsMenu_Off"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   name="options_gear_btn"
-   width="31" />
-  <menu_button
-   follows="top|right"
-   tool_tip="View/sort options"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="Conv_toolbar_sort"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   name="view_btn"
-   width="31" />
-  <button
-   follows="top|right"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="AddItem_Off"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   name="add_btn"
-   tool_tip="Add new item"
-   width="31" />
-  <button
-   follows="top|right"
-   tool_tip="Toggles between traditional and single-folder views"
-   height="23"
-   image_hover_unselected="Toolbar_Middle_Over"
-   image_overlay="Command_Map_Icon"
-   image_selected="Toolbar_Middle_Selected"
-   image_unselected="Toolbar_Middle_Off"
-   layout="topleft"
-   left_pad="1"
-   enabled="false"
-   name="view_mode_btn"
-   width="31" />
-  <tab_container
+   height="25"
+   animate="false"
+   top_pad="10"
+   left="2"
+   orientation="horizontal">
+    <layout_panel
+     border="false"
+     bevel_style="in"
+     user_resize="false"
+     auto_resize="false"
+     height="25"
+     width="65"
+     name="nav_buttons"
+     visible="false">
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Arrow_Left"
+      image_pressed="Arrow_Left"
+      image_unselected="Arrow_Left"
+      scale_image="false"
+      layout="topleft"
+      left="3"
+      top="2"
+      name="back_btn"
+      tool_tip="Back"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Arrow_Right"
+      image_pressed="Arrow_Right"
+      image_unselected="Arrow_Right"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="forward_btn"
+      tool_tip="Forward"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Arrow_Up"
+      image_pressed="Arrow_Up"
+      image_unselected="Arrow_Up"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="up_btn"
+      tool_tip="Go up one level"
+      width="20" />
+    </layout_panel>
+    <layout_panel
+      border="false"
+      bevel_style="in"
+      user_resize="false"
+      height="25"
+      width="375"
+      visible="true">
+      <combo_box
+       height="23"
+       layout="topleft"
+       left="2"
+       top="0"
+       name="search_type"
+       tool_tip="Search by"
+       follows="top|left"
+       width="67">
+       <item
+        label="Name"
+        name="Name"
+        value="search_by_name"/>
+       <item
+        label="Creator"
+        name="Creator"
+        value="search_by_creator"/>
+       <item
+        label="Description"
+        name="Description"
+        value="search_by_description"/>
+       <item
+        label="UUID"
+        name="UUID"
+        value="search_by_UUID"/>
+      </combo_box>
+      <menu_button
+       follows="top|left"
+       tool_tip="Search visibility options"
+       height="23"
+       image_overlay="Inv_Toolbar_SearchVisibility"
+       layout="topleft"
+       left_pad="1"
+       name="options_visibility_btn"
+       width="31" />
+      <filter_editor
+       text_pad_left="10"
+       follows="left|top|right"
+       height="23"
+       label="Enter search text"
+       layout="topleft"
+       left_pad="1"
+       max_length_chars="300"
+       highlight_text_field="true"
+       name="inventory search editor"
+       width="150" />
+      <menu_button
+       follows="top|right"
+       tool_tip="Actions"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="OptionsMenu_Off"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="options_gear_btn"
+       width="31" />
+      <menu_button
+       follows="top|right"
+       tool_tip="View &amp; sort options"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="Conv_toolbar_sort"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="view_btn"
+       width="31" />
+      <button
+       follows="top|right"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="AddItem_Off"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="add_btn"
+       tool_tip="Create new item"
+       width="31" />
+      <button
+       follows="top|right"
+       tool_tip="Switch between views"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="Command_Map_Icon"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="view_mode_btn"
+       width="31" />
+    </layout_panel>
+    </layout_stack>
+    <panel
      follows="all"
      halign="center"
      height="372"
      layout="topleft"
      left="7"
-     name="inventory filter tabs"
-     tab_height="30"
-     tab_position="top"
-     tab_min_width="100"
+     name="default_inventory_panel"
      top_pad="10"
      width="312">
-    <inventory_panel
-     bg_opaque_color="DkGray2"
-     bg_alpha_color="DkGray2"
-     background_visible="true"
-     border="false"
-     bevel_style="none"
+      <tab_container
+       follows="all"
+       halign="center"
+       height="372"
+       layout="topleft"
+       left="0"
+       name="inventory filter tabs"
+       tab_height="30"
+       tab_position="top"
+       tab_min_width="100"
+       top="0"
+       width="312">
+        <inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         height="338"
+         label="MY INVENTORY"
+         help_topic="my_inventory_tab"
+         layout="topleft"
+         left="0"
+         name="All Items"
+         sort_order_setting="InventorySortOrder"
+         show_item_link_overlays="true"
+         top="16"
+         width="288" />
+        <recent_inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         height="338"
+         label="RECENT"
+         help_topic="recent_inventory_tab"
+         layout="topleft"
+         left_delta="0"
+         name="Recent Items"
+         show_item_link_overlays="true"
+         width="290" />
+        <inventory_panel
+         name="Worn Items"
+         label="WORN"
+         show_empty_message="false"
+         follows="all"
+         layout="topleft"
+         width="290"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+        </inventory_panel>
+      </tab_container>
+    </panel>
+    <panel
      follows="all"
-     height="338"
-     label="MY INVENTORY"
-     help_topic="my_inventory_tab"
-     layout="topleft"
-     left="0"
-     name="All Items"
-     sort_order_setting="InventorySortOrder"
-     show_item_link_overlays="true"
-     top="16"
-     width="288" />
-    <recent_inventory_panel
-     bg_opaque_color="DkGray2"
-     bg_alpha_color="DkGray2"
-     background_visible="true"
-     border="false"
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="RECENT"
-     help_topic="recent_inventory_tab"
+     halign="center"
+     height="372"
      layout="topleft"
-     left_delta="0"
-     name="Recent Items"
-     show_item_link_overlays="true"
-     width="290" />
-       <inventory_panel
-      name="Worn Items"
-      label="WORN"
-      show_empty_message="false"
-      follows="all"
-      layout="topleft"
-      width="290"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      scroll.reserve_scroll_corner="false">
-  </inventory_panel>
-  </tab_container>
+     left="7"
+     name="single_folder_inventory"
+     top_delta="0"
+     visible="false"
+     width="312">
+      <single_folder_inventory_panel
+       name="single_folder_inv"
+       show_empty_message="false"
+       follows="all"
+       left="0"
+       top="0"
+       top_pad="5"
+       height="372"
+       width="312"
+       layout="topleft"
+       bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       border="false"
+       bevel_style="none"
+       scroll.reserve_scroll_corner="false">
+        <item folder_indentation="0"/>
+        <folder
+         single_folder_mode="true"
+         folder_indentation="0"/>
+      </single_folder_inventory_panel>
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 82eb629670..a4b7f48c5e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -18,7 +18,7 @@
 		 height="570"
 		 visible="true"
 		 default_tab_group="1"
-		 width="355">
+		 width="395">
       <layout_stack
               follows="left|right|top|bottom"
               layout="topleft"
@@ -28,14 +28,14 @@
               orientation="vertical"
               name="inventory_layout_stack"
               height="565"
-              width="355">
+              width="395">
              <layout_panel
                  name="main_inventory_layout_panel"
                  layout="topleft"
                  auto_resize="true"
                  user_resize="true"
                  min_dim="150"
-                 width="355"
+                 width="395"
                  follows="bottom|left|right"
                  height="300">
                  <panel
@@ -48,7 +48,7 @@
                       top="0"
                       label=""
                       height="300"
-                      width="355" />
+                      width="395" />
              </layout_panel>
 			    <layout_panel
                  width="355"
-- 
cgit v1.2.3