From 49da5288bd0425241823186bfd56a159fe2f9a60 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 24 Feb 2023 03:05:30 +0200
Subject: SL-19234 add Inventory settings floater

---
 .../default/xui/en/floater_inventory_settings.xml  | 169 +++++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_inventory_settings.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
new file mode 100644
index 0000000000..c3e81a5523
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_minimize="true"
+ can_resize="false"
+ save_rect="true"
+ height="350"
+ width="370"
+ name="inventory_settings"
+ title="Inventory settings">
+ <icon
+  follows="top|left"
+  height="18"
+  image_name="Multi_Folder_Mode"
+  layout="topleft"
+  left="18"
+  mouse_opaque="true"
+  name="multi_folder_icon"
+  top="25"
+  width="18" />
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left_pad="12"
+   top_delta="2"
+   name="multi_folder_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Double-click on folder in multi-folder view:
+ </text>
+ <radio_group
+  control_name="MultiModeDoubleClickOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="325"
+  height="45"
+  name="multi_double_click_setting">
+     <radio_item
+      height="20"
+      label="Expands &amp; collapses folder"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <icon
+  follows="top|left"
+  height="18"
+  image_name="Single_Folder_Mode"
+  layout="topleft"
+  left="18"
+  mouse_opaque="true"
+  name="single_folder_icon"
+  top_pad="30"
+  width="18" />
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left_pad="12"
+   top_delta="2"
+   name="single_folder_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Double-click on folder in single-folder view:
+ </text>
+ <radio_group
+  control_name="SingleModeDoubleClickOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="325"
+  height="45"
+  name="single_double_click_setting">
+     <radio_item
+      height="20"
+      label="Stays in current window"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left="48"
+   name="find_original_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   top_pad="30"
+   width="300">
+   Clicking on "Show in inventory" or "Find original"
+ </text>
+ <radio_group
+  control_name="FindOriginalOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="325"
+  height="45"
+  name="find_original_settings">
+     <radio_item
+      height="20"
+      label="Shows item in main inventory window"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new single-folder window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <button
+  height="20"
+  label="OK"
+  layout="topleft"
+  left="140"
+  bottom="-20"
+  name="ok_btn"
+  label_color="White"
+  width="90" />
+</floater>
-- 
cgit v1.2.3


From f377e27f0b8ddabf755c6efe71d6bc0e53e751c1 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 27 Feb 2023 20:27:11 +0200
Subject: SL-19274 Add new double-click option to Inventory settings

---
 .../default/xui/en/floater_inventory_settings.xml  | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index c3e81a5523..bfac79ac46 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -4,10 +4,10 @@
  can_minimize="true"
  can_resize="false"
  save_rect="true"
- height="350"
+ height="370"
  width="370"
  name="inventory_settings"
- title="Inventory settings">
+ title="INVENTORY SETTINGS">
  <icon
   follows="top|left"
   height="18"
@@ -33,14 +33,14 @@
    Double-click on folder in multi-folder view:
  </text>
  <radio_group
-  control_name="MultiModeDoubleClickOpenWindow"
+  control_name="MultiModeDoubleClickFolder"
   follows="left|top"
   top_pad="8"
   layout="topleft"
   font="SansSerifMedium"
   left="60"
-  width="325"
-  height="45"
+  width="300"
+  height="70"
   name="multi_double_click_setting">
      <radio_item
       height="20"
@@ -48,7 +48,7 @@
       label_text.text_color="White"
       follows="left|top"
       layout="topleft"
-      name="false"
+      name="0"
       width="200"/>
      <radio_item
       height="20"
@@ -57,7 +57,17 @@
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
-      name="true"
+      name="1"
+      top_pad ="5"
+      width="200" />
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Switch view"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="2"
       top_pad ="5"
       width="200" />
  </radio_group>
@@ -92,7 +102,7 @@
   layout="topleft"
   font="SansSerifMedium"
   left="60"
-  width="325"
+  width="300"
   height="45"
   name="single_double_click_setting">
      <radio_item
@@ -135,7 +145,7 @@
   layout="topleft"
   font="SansSerifMedium"
   left="60"
-  width="325"
+  width="300"
   height="45"
   name="find_original_settings">
      <radio_item
-- 
cgit v1.2.3


From 4a5ffb70c448f4fdf3e937c0da07ed8cb1d976e9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Jun 2023 22:04:34 +0300
Subject: SL-19274 Update 'switch view' label

---
 indra/newview/skins/default/xui/en/floater_inventory_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index bfac79ac46..2e619d91fb 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -63,7 +63,7 @@
      <radio_item
       height="20"
       follows="left|top"
-      label="Switch view"
+      label="Switches view"
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
-- 
cgit v1.2.3