SL-19104 Clean up inventory UI to prepare for thumbnails (#66)

5 files changed, 153 insertions, 280 deletions

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 3eacdbc781..3fb2e01e5b 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
@@ -7,60 +7,32 @@
  name="menu_gear_default"
  visible="false">
     <menu_item_call
-     label="New Inventory Window"
+     label="New Folder Window"
      layout="topleft"
-     shortcut="control|shift|I"
-     name="new_window">
+     shortcut="control|shift|J"
+     enabled="false"
+     name="new_single_folder">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
          parameter="new_window" />
     </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
-    <menu_item_check
-     label="Sort by Name"
-     layout="topleft"
-     name="sort_by_name">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_by_name" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_by_name" />
-    </menu_item_check>
-    <menu_item_check
-     label="Sort by Most Recent"
-     layout="topleft"
-     name="sort_by_recent">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_by_recent" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_by_recent" />         
-    </menu_item_check>
-    <menu_item_check
-     label="Sort Folders Always by Name"
+    <menu_item_call
+     label="New Inventory Window"
      layout="topleft"
-     name="sort_folders_by_name">
+     shortcut="control|shift|I"
+     name="new_window">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_folders_by_name" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_folders_by_name" />
-    </menu_item_check>
-    <menu_item_check
-     label="Sort System Folders to Top"
+         parameter="new_window" />
+    </menu_item_call>
+    <menu_item_call
+     label="Close All Folders"
      layout="topleft"
-     name="sort_system_folders_to_top">
+     name="close_folders">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_system_folders_to_top" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_system_folders_to_top" />
-    </menu_item_check>
+         parameter="close_folders" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
@@ -79,29 +51,6 @@
          function="Inventory.GearDefault.Custom.Action"
          parameter="reset_filters" />
     </menu_item_call>
-    <menu_item_call
-     label="Close All Folders"
-     layout="topleft"
-     name="close_folders">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="close_folders" />
-    </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
-    <menu_item_call
-     label="Empty Lost and Found"
-     layout="topleft"
-     name="empty_lostnfound">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="empty_lostnfound" />
-        <on_enable
-         function="Inventory.GearDefault.Enable"
-         parameter="empty_lostnfound" />
-    </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
     <menu_item_call 
          label="Save Texture As"
          layout="topleft"
@@ -156,7 +105,17 @@
         </menu_item_call>
     <menu_item_separator
      layout="topleft" />
-
+    <menu_item_call
+     label="Empty Lost and Found"
+     layout="topleft"
+     name="empty_lostnfound">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="empty_lostnfound" />
+        <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="empty_lostnfound" />
+    </menu_item_call>
     <menu_item_call
      label="Empty Trash"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
index 46193f4a7a..8e34f52f3a 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
@@ -7,6 +7,17 @@
  name="menu_search_visibility"
  visible="false">
   <menu_item_check
+   label="Search outfit folders"
+   layout="topleft"
+   name="search_outfits">
+    <on_click
+     function="Inventory.GearDefault.Custom.Action"
+     parameter="toggle_search_outfits" />
+    <on_check
+     function="Inventory.GearDefault.Check"
+     parameter="toggle_search_outfits" />
+  </menu_item_check>
+  <menu_item_check
    label="Search Trash"
    layout="topleft"
    name="search_trash">
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
new file mode 100644
index 0000000000..6e3cfd9cee
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_view_default"
+ visible="false">
+    <menu_item_check
+     label="Sort by Name"
+     layout="topleft"
+     name="sort_by_name">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_by_name" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort by Most Recent"
+     layout="topleft"
+     name="sort_by_recent">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_by_recent" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_by_recent" />         
+    </menu_item_check>
+    <menu_item_check
+     label="Sort Folders Always by Name"
+     layout="topleft"
+     name="sort_folders_by_name">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_folders_by_name" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_folders_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort System Folders to Top"
+     layout="topleft"
+     name="sort_system_folders_to_top">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_system_folders_to_top" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_system_folders_to_top" />
+    </menu_item_check>
+</toggleable_menu>
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 2ff58035ed..d437f98e91 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -7,7 +7,7 @@
  min_height="300"
  min_width="240"
  name="main inventory panel"
- width="330">
+ width="355">
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -41,11 +41,11 @@
   <combo_box
    height="23"
    layout="topleft"
-   left="10"
+   left="3"
    top="18"
    name="search_type"
    follows="top|left"
-   width="88">
+   width="67">
     <item
      label="Name"
      name="Name"
@@ -69,7 +69,7 @@
    height="23"
    image_overlay="Inv_Toolbar_SearchVisibility"
    layout="topleft"
-   left_pad="3"
+   left_pad="1"
    name="options_visibility_btn"
    width="31" />
   <filter_editor
@@ -78,15 +78,64 @@
    height="23"
    label="Enter search text"
    layout="topleft"
-   left_pad="3"
+   left_pad="1"
    max_length_chars="300"
    highlight_text_field="true"
    name="inventory search editor"
-   width="177" />
+   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
      follows="all"
      halign="center"
-     height="339"
+     height="372"
      layout="topleft"
      left="7"
      name="inventory filter tabs"
@@ -142,92 +191,4 @@
       scroll.reserve_scroll_corner="false">
   </inventory_panel>
   </tab_container>
-  <layout_stack
-   animate="false"
-   border_size="0"
-   follows="left|right|bottom"
-   height="25"
-   layout="topleft"
-   orientation="horizontal"
-   top_pad="0"
-   left="10"
-   name="bottom_panel"
-   width="307">
-      <layout_panel
-       auto_resize="false"
-       height="25"
-       layout="topleft"
-       name="options_gear_btn_panel"
-       width="32">
-          <menu_button
-           follows="bottom|left"
-           tool_tip="Show additional options"
-           height="25"
-           image_hover_unselected="Toolbar_Left_Over"
-           image_overlay="OptionsMenu_Off"
-           image_selected="Toolbar_Left_Selected"
-           image_unselected="Toolbar_Left_Off"
-           layout="topleft"
-           left="0"
-           name="options_gear_btn"
-           top="0"
-           width="31" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       height="25"
-       layout="topleft"
-       name="add_btn_panel"
-       width="32">
-          <button
-           follows="bottom|left"
-           height="25"
-           image_hover_unselected="Toolbar_Middle_Over"
-           image_overlay="AddItem_Off"
-           image_selected="Toolbar_Middle_Selected"
-           image_unselected="Toolbar_Middle_Off"
-           layout="topleft"
-           left="0"
-           name="add_btn"
-           tool_tip="Add new item"
-           top="0"
-           width="31" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="true"
-       height="25"
-       layout="topleft"
-       name="dummy_panel"
-       width="212">
-          <icon
-           follows="bottom|left|right"
-           height="25"
-           image_name="Toolbar_Middle_Off"
-           layout="topleft"
-           left="0"
-           top="0"
-           name="dummy_icon"
-           width="211" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       height="25"
-       layout="topleft"
-       name="trash_btn_panel"
-       width="31">
-          <dnd_button
-           follows="bottom|left"
-           height="25"
-           image_hover_unselected="Toolbar_Right_Over"
-           image_overlay="TrashItem_Off"
-           image_selected="Toolbar_Right_Selected"
-           image_unselected="Toolbar_Right_Off"
-           left="0"
-           layout="topleft"
-           name="trash_btn"
-           tool_tip="Remove selected item"
-           top="0"
-           width="31"/>
-      </layout_panel>
-  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 9995523e61..bf50b1adfd 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -7,7 +7,7 @@
 	  min_height="350"
 	  min_width="240"
 	  name="objects panel"
-	  width="333">
+	  width="358">
     <panel
 		 follows="all"
 		 layout="topleft"
@@ -18,7 +18,7 @@
 		 height="570"
 		 visible="true"
 		 default_tab_group="1"
-		 width="330">
+		 width="355">
       <layout_stack
               follows="left|right|top|bottom"
               layout="topleft"
@@ -27,15 +27,15 @@
 							tab_group="1"
               orientation="vertical"
               name="inventory_layout_stack"
-              height="535"
-              width="330">
+              height="565"
+              width="355">
              <layout_panel
                  name="main_inventory_layout_panel"
                  layout="topleft"
                  auto_resize="true"
                  user_resize="true"
                  min_dim="150"
-                 width="330"
+                 width="355"
                  follows="bottom|left|right"
                  height="300">
                  <panel
@@ -48,10 +48,10 @@
                       top="0"
                       label=""
                       height="300"
-                      width="330" />
+                      width="355" />
              </layout_panel>
 			    <layout_panel
-                 width="330"
+                 width="355"
                  layout="topleft"
                  auto_resize="false"
                  user_resize="true"
@@ -133,117 +133,6 @@ Purchases from the marketplace will be delivered here.
                  </panel>
              </layout_panel>
          </layout_stack>
-			<panel follows="bottom|left|right"
-					 height="30"
-					 layout="topleft"
-					 name="button_panel"
-					 left="9"
-					 top_pad="7"
-					 width="308">
-				<layout_stack follows="bottom|left|right"
-											height="23"
-											layout="topleft"
-											mouse_opaque="false"
-											name="button_panel_ls"
-											left="0"
-											orientation="horizontal"
-											top="0"
-											width="308">	
-			    <layout_panel follows="bottom|left|right"
-												height="23"
-												layout="bottomleft"
-												left="0"			
-												mouse_opaque="false"
-												name="info_btn_lp"
-												auto_resize="true"
-												width="101">
-						<button enabled="true"
-										follows="bottom|left|right"
-										height="23"
-										label="Profile"
-										layout="topleft"
-										left="1"
-										name="info_btn"
-										tool_tip="Show object profile"
-										top="0"
-										width="100" />
-			    </layout_panel>
-			    <layout_panel
-                     follows="bottom|left|right"
-                     height="23"
-                     layout="bottomleft"
-                     left_pad="1"			
-                     mouse_opaque="false"
-                     name="share_btn_lp"
-                     auto_resize="true"
-                     width="100">
-                    <button
-                         enabled="true"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Share"
-                         layout="topleft"
-                         left="1"
-                         name="share_btn"
-                         tool_tip="Share an inventory item"
-                         top="0"
-                         width="99" />
-			    </layout_panel>
-			    <layout_panel
-                     follows="bottom|left|right"
-                     height="23"
-                     layout="bottomleft"
-                     left_pad="1"			
-                     mouse_opaque="false"
-                     name="shop_btn_lp"
-                     auto_resize="true"
-                     width="100">
-                    <button
-                         enabled="true"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Shop"
-                         layout="topleft"
-                         left="1"
-                         name="shop_btn"
-                         tool_tip="Open Marketplace webpage"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Wear"
-                         layout="topleft"
-                         left="1"
-                         name="wear_btn"
-                         tool_tip="Wear seleceted outfit"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Play"
-                         layout="topleft"
-                         name="play_btn"
-                         left="1"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Teleport"
-                         layout="topleft"
-                         left="1"
-                         name="teleport_btn"
-                         tool_tip="Teleport to the selected area"
-                         top="0"
-                         width="99" />
-			    </layout_panel>
-			</layout_stack>
-		</panel>
 	</panel>
 	<panel
 		 follows="all"