From 45b59881ebcc19510c7e36398232f057366eb41d Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 3 Feb 2015 08:37:31 -0500
Subject: STORM-2082 Reformat preset floaters. Remove Impostor checkbox. That
 control is now merged into the right side of the impostors slider. Maximum
 ARC still depends on impostors being enabled.  Once that dependency is
 removed in llvoavatar then it will be necessary to reflect that change in the
 UI code.

---
 .../default/xui/en/floater_delete_pref_preset.xml  | 24 +++++------
 .../default/xui/en/floater_load_pref_preset.xml    | 26 +++++------
 .../default/xui/en/floater_save_pref_preset.xml    | 27 ++++++------
 .../default/xui/en/panel_preferences_graphics1.xml | 50 +++++++++++-----------
 indra/newview/skins/default/xui/en/strings.xml     |  2 +-
 5 files changed, 66 insertions(+), 63 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
index cc3f9c5842..0688fdb42c 100644
--- a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
@@ -7,43 +7,43 @@
  name="Delete Pref Preset"
  save_rect="true"
  title="DELETE PREF PRESET"
- width="550">
+ width="300">
 
     <string name="title_graphic">Delete Graphic Preset</string>
     <string name="title_camera">Delete Camera Preset</string>
 
     <text
      follows="top|left|right"
-     font="SansSerif"
      height="10"
      layout="topleft"
-     left="50"
+     left="20"
      name="Preset"
-     top="60"
-     width="60">
-     Preset:
+     top="30"
+     width="200">
+     Select a preset
     </text>
     <combo_box
      follows="top|left"
      layout="topleft"
-     left_pad="10"
+     left="20"
      name="preset_combo"
-     top_delta="-5"
+     top_delta="20"
      width="200"/>
     <button
-     follows="bottom|right"
+     follows="top|left"
      height="23"
      label="Delete"
      layout="topleft"
-     left_pad="15"
+     top_delta="40"
+     left="20"
      name="delete"
      width="70"/>
     <button
-     follows="bottom|right"
+     follows="top|left"
      height="23"
      label="Cancel"
      layout="topleft"
-     left_pad="5"
+     left_pad="20"
      name="cancel"
      width="70"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
index fbca7bbe37..5f2eb770e2 100644
--- a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
@@ -7,43 +7,43 @@
  name="Load Pref Preset"
  save_rect="true"
  title="LOAD PREF PRESET"
- width="550">
+ width="300">
 
     <string name="title_graphic">Load Graphic Preset</string>
     <string name="title_camera">Load Camera Preset</string>
 
     <text
      follows="top|left|right"
-     font="SansSerif"
-     height="10"
+     height="16"
      layout="topleft"
-     left="50"
+     left="20"
      name="Preset"
-     top="60"
-     width="60">
-     Preset:
+     top="30"
+     width="200">
+     Select a preset
     </text>
     <combo_box
      follows="top|left"
      layout="topleft"
-     left_pad="10"
+     left="20"
      name="preset_combo"
-     top_delta="-5"
+     top_delta="20"
      width="200"/>
     <button
-     follows="bottom|right"
+     follows="top|left"
      height="23"
      label="OK"
      layout="topleft"
-     left_pad="15"
+     top_delta="40"
+     left="20"
      name="ok"
      width="70"/>
     <button
-     follows="bottom|right"
+     follows="top|left"
      height="23"
      label="Cancel"
      layout="topleft"
-     left_pad="5"
+     left_pad="20"
      name="cancel"
      width="70"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index 0180d2f821..7dee28eff3 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -1,42 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <floater
  legacy_header_height="18"
- height="130"
+ height="145"
  help_topic="floater_save_preset"
  layout="topleft"
  name="Save Pref Preset"
  save_rect="true"
  title="SAVE PREF PRESET"
- width="550">
+ width="300">
 
     <string name="title_graphic">Save Graphic Preset</string>
     <string name="title_camera">Save Camera Preset</string>
 
     <text
      follows="top|left|right"
-     font="SansSerif"
-     height="10"
+     height="32"
      layout="topleft"
-     left="50"
+     word_wrap="true"
+     left="20"
      name="Preset"
-     top="60"
-     width="60">
-     Preset:
+     top="30"
+     width="200">
+     Type a name for the preset or choose an existing preset.
     </text>
     <combo_box
      follows="top|left"
      layout="topleft"
-     left_pad="10"
+     left="20"
      name="preset_combo"
-     top_delta="-5"
+     top_delta="35"
      allow_text_entry="true"
      width="200"/>
     <button
-     follows="bottom|right"
+     follows="top|left"
      height="23"
      label="Save"
      layout="topleft"
-     left_pad="15"
+     top_delta="40"
+     left="20"
      name="save"
      width="70"/>
     <button
@@ -44,7 +45,7 @@
      height="23"
      label="Cancel"
      layout="topleft"
-     left_pad="5"
+     left_pad="20"
      name="cancel"
      width="70"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 13e0593221..756c765bbd 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -13,7 +13,6 @@
 <!-- This block is always displayed -->
   <text
     follows="top|left|right"
-    font="SansSerif"
     height="16"
     layout="topleft"
     left="5"
@@ -24,7 +23,6 @@
 
   <text
     follows="top|left|right"
-    font="SansSerif"
     height="16"
     layout="topleft"
     left_delta="110"
@@ -482,20 +480,6 @@
              Avatar
           </text>
 
-          <check_box
-            control_name="RenderUseImpostors"
-            height="16"
-            initial_value="true"
-            label="Impostors"
-            layout="topleft"
-            left="30"
-            name="AvatarImpostors"
-            top_delta="20"
-            width="300">
-            <check_box.commit_callback
-              function="Pref.AvatarImpostorsEnable" />
-          </check_box>
-
           <slider
             control_name="MaximumARC"
             follows="left|top"
@@ -503,15 +487,15 @@
             initial_value="101"
             increment="1"
             label="Maximum ARC:"
-            label_width="165"
+            label_width="185"
             layout="topleft"
-            left="50"
+            left="30"
             min_val="1"
             max_val="101"
             name="MaximumARC"
             show_text="false"
             top_delta="16"
-            width="280">
+            width="300">
             <slider.commit_callback
               function="Pref.UpdateSliderText"
               parameter="MaximumARCText" />
@@ -523,7 +507,7 @@
             height="16"
             layout="topleft"
             top_delta="0"
-            left_delta="284"
+            left_delta="304"
             text_readonly_color="LabelDisabledColor"
             name="MaximumARCText"
             width="128">
@@ -538,14 +522,32 @@
             increment="1"
             initial_value="12"
             label="Max. # of non-impostors:"
-            label_width="165"
+            label_width="185"
             layout="topleft"
-            left="50"
+            left="30"
             min_val="1"
-            max_val="65"
+            max_val="66"
             name="MaxNumberAvatarDrawn"
+            show_text="false"
             top_delta="16"
-            width="305" />
+            width="300">
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="ImpostorsText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            top_delta="0"
+            left_delta="304"
+            text_readonly_color="LabelDisabledColor"
+            name="ImpostorsText"
+            width="128">
+               0
+          </text>
 
           <slider
             control_name="RenderAvatarLODFactor"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c09129c867..c0a8866549 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4045,6 +4045,6 @@ Try enclosing path to the editor with double quotes.
   <!-- Presets graphic/camera -->
   <string name="preset_combo_label">-Empty list-</string>
   <string name="Default">Default</string>
-  <string name="Off">Off</string>
   <string name="none_paren_cap">(None)</string>
+  <string name="no_limit">No Limit</string>
   </strings>
-- 
cgit v1.2.3