From 98f7d73d46fdc045759023eda6409e8c791f5cb2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 16 May 2024 17:08:26 +0300
Subject: viewer#1424 Finish menus

---
 .../default/xui/en/menu_outfit_gallery_sort.xml    | 42 +++++++++++++++++++
 .../skins/default/xui/en/menu_outfit_gear.xml      | 16 +------
 .../skins/default/xui/en/menu_outfit_list_sort.xml | 49 ++++++++++++++++++++++
 .../skins/default/xui/en/menu_outfit_sort.xml      | 49 ----------------------
 4 files changed, 93 insertions(+), 63 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_outfit_sort.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml
new file mode 100644
index 0000000000..aa4cd1483d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu
+ layout="topleft"
+ visible="false"
+ name="Sort Outfit">  
+  <menu_item_check
+   label="Sort favorites to top"
+   layout="topleft"
+   visible="true"
+   name="sort_favorites_to_top">
+    <on_click
+     function="Sort.OnSort"
+    parameter="favorites_to_top" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="favorites_to_top" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort images to top"
+   layout="topleft"
+   visible="true"
+   name="sort_images_to_top">
+    <on_click
+     function="Sort.OnSort"
+    parameter="images_to_top" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="images_to_top" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by name"
+   layout="topleft"
+   visible="true"
+   name="sort_by_name">
+    <on_click
+     function="Sort.OnSort"
+    parameter="by_name" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="by_name" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index bd0c49309d..e333b05d3e 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -109,18 +109,6 @@
          function="Gear.OnVisible"
          parameter="delete" />
     </menu_item_call>
-    <menu_item_separator
-      name="sort_order_separator"/>
-    <menu_item_check
-     label="Show outfits with images first"
-     layout="topleft"
-     name="sort_order_by_image">
-        <on_click
-         function="Gear.SortByImage" />
-        <on_check
-         function="Gear.OnEnable"
-         parameter="sort_by_image" />
-    </menu_item_check>
   <menu_item_separator/>
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
@@ -282,12 +270,12 @@
             </menu>
             <!-- copied from menu_inventory_add.xml -->
 
-  <menu_item_separator
-    name="inv_settings_separator"/>
+  <menu_item_separator/>
 
   <menu_item_check
    label="Inventory settings..."
    layout="topleft"
+   visible="true"
    name="inventory_settings">
     <menu_item_check.on_check
      function="Floater.Visible"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml
new file mode 100644
index 0000000000..0a4d1ea877
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu
+ layout="topleft"
+ visible="false"
+ name="Sort Outfit">
+    <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Sort.Expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     visible="true"
+     name="collapse">
+        <on_click
+         function="Sort.Collapse" />
+    </menu_item_call>
+  
+  <menu_item_separator/>
+
+  <menu_item_check
+   label="Sort favorites to top"
+   layout="topleft"
+   name="sort_favorites_to_top">
+    <on_click
+     function="Sort.OnSort"
+    parameter="favorites_to_top" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="favorites_to_top" />
+  </menu_item_check>
+
+  <menu_item_separator/>
+
+  <menu_item_check
+   label="Show entire outfit in search"
+   layout="topleft"
+   name="show_entire_outfit_in_search">
+    <on_click
+     function="Sort.OnSort"
+    parameter="show_entire_outfit" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="show_entire_outfit" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
deleted file mode 100644
index 0a4d1ea877..0000000000
--- a/indra/newview/skins/default/xui/en/menu_outfit_sort.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu
- layout="topleft"
- visible="false"
- name="Sort Outfit">
-    <menu_item_call
-     label="Expand all folders"
-     layout="topleft"
-     name="expand">
-        <on_click
-         function="Sort.Expand" />
-    </menu_item_call>
-    <menu_item_call
-     label="Collapse all folders"
-     layout="topleft"
-     visible="true"
-     name="collapse">
-        <on_click
-         function="Sort.Collapse" />
-    </menu_item_call>
-  
-  <menu_item_separator/>
-
-  <menu_item_check
-   label="Sort favorites to top"
-   layout="topleft"
-   name="sort_favorites_to_top">
-    <on_click
-     function="Sort.OnSort"
-    parameter="favorites_to_top" />
-    <on_check
-     function="Sort.OnEnable"
-     parameter="favorites_to_top" />
-  </menu_item_check>
-
-  <menu_item_separator/>
-
-  <menu_item_check
-   label="Show entire outfit in search"
-   layout="topleft"
-   name="show_entire_outfit_in_search">
-    <on_click
-     function="Sort.OnSort"
-    parameter="show_entire_outfit" />
-    <on_check
-     function="Sort.OnEnable"
-     parameter="show_entire_outfit" />
-  </menu_item_check>
-</toggleable_menu>
-- 
cgit v1.2.3