From e51fd03945ac0b2094b809c212eaa85b69ed0420 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 26 Jan 2017 09:43:10 +0200
Subject: MAINT-6959 swapping line edits with text boxes in preferences tab

---
 indra/newview/llfloaterpreference.cpp              |  8 +--
 .../default/xui/en/panel_preferences_uploads.xml   | 59 ++++++++++------------
 2 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 02dffa7f08..30dfff4ac8 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2013,7 +2013,7 @@ void LLFloaterPreference::onChangeModelFolder()
 {
     if (gInventory.isInventoryUsable())
     {
-        getChild<LLLineEditor>("upload_models")->setText(get_category_path(LLFolderType::FT_OBJECT));
+        getChild<LLTextBox>("upload_models")->setText(get_category_path(LLFolderType::FT_OBJECT));
     }
 }
 
@@ -2021,7 +2021,7 @@ void LLFloaterPreference::onChangeTextureFolder()
 {
     if (gInventory.isInventoryUsable())
     {
-        getChild<LLLineEditor>("upload_textures")->setText(get_category_path(LLFolderType::FT_TEXTURE));
+        getChild<LLTextBox>("upload_textures")->setText(get_category_path(LLFolderType::FT_TEXTURE));
     }
 }
 
@@ -2029,7 +2029,7 @@ void LLFloaterPreference::onChangeSoundFolder()
 {
     if (gInventory.isInventoryUsable())
     {
-        getChild<LLLineEditor>("upload_sounds")->setText(get_category_path(LLFolderType::FT_SOUND));
+        getChild<LLTextBox>("upload_sounds")->setText(get_category_path(LLFolderType::FT_SOUND));
     }
 }
 
@@ -2037,7 +2037,7 @@ void LLFloaterPreference::onChangeAnimationFolder()
 {
     if (gInventory.isInventoryUsable())
     {
-        getChild<LLLineEditor>("upload_animation")->setText(get_category_path(LLFolderType::FT_ANIMATION));
+        getChild<LLTextBox>("upload_animation")->setText(get_category_path(LLFolderType::FT_ANIMATION));
     }
 }
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
index f397d05408..487da54fdf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
@@ -30,21 +30,19 @@
    layout="topleft"
    left="37"
    name="title_models"
-   top_pad="20"
+   top_pad="17"
    width="100">
     Images
   </text>
-  <line_editor
-   border_style="line"
-   border_thickness="1"
+  <text
+   type="string"
+   use_ellipses="true"
    follows="left|top"
-   font="SansSerif"
    height="23"
    layout="topleft"
-   left="40"
-   max_length="4096"
+   font.style="BOLD"
+   left="37"
    name="upload_textures"
-   enabled="false"
    top_pad="5"
    width="350" />
   
@@ -56,21 +54,19 @@
    layout="topleft"
    left="37"
    name="title_sounds"
-   top_pad="10"
+   top_pad="7"
    width="100">
     Sounds
   </text>
-  <line_editor
-   border_style="line"
-   border_thickness="1"
+  <text
+   type="string"
+   use_ellipses="true"
    follows="left|top"
-   font="SansSerif"
    height="23"
    layout="topleft"
-   left="40"
-   max_length="4096"
+   font.style="BOLD"
+   left="37"
    name="upload_sounds"
-   enabled="false"
    top_pad="5"
    width="350" />
   
@@ -82,21 +78,19 @@
    layout="topleft"
    left="37"
    name="title_animation"
-   top_pad="10"
+   top_pad="7"
    width="100">
     Animations
   </text>
-  <line_editor
-   border_style="line"
-   border_thickness="1"
+  <text
+   type="string"
+   use_ellipses="true"
    follows="left|top"
-   font="SansSerif"
    height="23"
    layout="topleft"
-   left="40"
-   max_length="4096"
+   font.style="BOLD"
+   left="37"
    name="upload_animation"
-   enabled="false"
    top_pad="5"
    width="350" />
 
@@ -108,21 +102,19 @@
    layout="topleft"
    left="37"
    name="title_animation"
-   top_pad="10"
+   top_pad="7"
    width="100">
     Models
   </text>
-  <line_editor
-   border_style="line"
-   border_thickness="1"
+  <text
+   type="string"
+   use_ellipses="true"
    follows="left|top"
-   font="SansSerif"
    height="23"
    layout="topleft"
-   left="40"
-   max_length="4096"
+   font.style="BOLD"
+   left="37"
    name="upload_models"
-   enabled="false"
    top_pad="5"
    width="350" />
 
@@ -132,9 +124,10 @@
    follows="left|top"
    height="30"
    layout="topleft"
+   font.style="ITALIC"
    left="33"
    name="upload_help"
-   top_pad="10"
+   top_pad="6"
    width="387">
     To change a destination folder, right click on it in inventory and choose
  "Use as default for"
-- 
cgit v1.2.3