From 611391a818746f560ad49847ae643613313ac216 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 20 Jan 2015 09:17:23 -0500
Subject: STORM-2082 Update to new UI design.  Bugs are not worked out yet.

---
 .../default/xui/en/floater_load_pref_preset.xml    | 49 +++++++++++++
 .../default/xui/en/panel_preferences_graphics1.xml | 83 +++++++++++++++-------
 indra/newview/skins/default/xui/en/strings.xml     |  1 +
 3 files changed, 106 insertions(+), 27 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_load_pref_preset.xml

(limited to 'indra/newview/skins')

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
new file mode 100644
index 0000000000..72feeeef74
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="130"
+ help_topic="floater_load_pref"
+ layout="topleft"
+ name="Load Pref Preset"
+ save_rect="true"
+ title="LOAD PREF PRESET"
+ width="550">
+
+    <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"
+     layout="topleft"
+     left="50"
+     name="Preset"
+     top="60"
+     width="60">
+     Preset:
+    </text>
+    <combo_box
+     follows="top|left"
+     layout="topleft"
+     left_pad="10"
+     name="preset_combo"
+     top_delta="-5"
+     width="200"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="OK"
+     layout="topleft"
+     left_pad="15"
+     name="ok"
+     width="70"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     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 983e0edb97..b5a1c1eda6 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -17,36 +17,37 @@
     height="16"
     layout="topleft"
     left="5"
-    name="presets_text"
     top="10"
-    width="60">
-      Presets:
+    width="100">
+      Preset in use:
+  </text>
+
+  <text
+    follows="top|left|right"
+    font="SansSerif"
+    height="16"
+    layout="topleft"
+    left_delta="110"
+    name="preset_text"
+    top="10"
+    width="120">
+      (None)
   </text>
-  <combo_box
-   	follows="top|left"
-   	layout="topleft"
-   	left_pad="0"
-   	max_chars="100"
-   	name="graphic_preset_combo"
-   	top_delta="0"
-   	width="150">
-    <combo_box.commit_callback
-      function="Pref.Preset"
-      parameter="graphic" />
-  </combo_box>
+
   <button
     follows="top|left"
     height="23"
-    label="Save As..."
+    label="Load preset..."
     layout="topleft"
     left_pad="5"
-    name="PrefSaveButton"
+    name="PrefLoadButton"
     top_delta="0"
     width="115">
     <button.commit_callback
-      function="Pref.PrefSave"
+      function="Pref.PrefLoad"
 	  parameter="graphic"/>
   </button>
+
   <button
     follows="top|left"
     height="23"
@@ -60,6 +61,7 @@
       function="Pref.PrefDelete"
 	  parameter="graphic"/>
   </button>
+
   <text
     type="string"
     length="1"
@@ -255,6 +257,19 @@
       top="30"
       width="517">
 
+      <button
+        follows="top|left"
+        height="23"
+        label="Reset all to recommended settings"
+        layout="topleft"
+        left="10"
+        name="Defaults"
+        top_delta="0"
+        width="250">
+        <button.commit_callback
+          function="Pref.HardwareDefaults" />
+      </button>
+
       <slider
         control_name="RenderFarClip"
         decimal_digits="0"
@@ -269,7 +284,7 @@
         min_val="64"
         max_val="512"
         name="DrawDistance"
-        top_delta="0"
+        top_delta="40"
         width="330" />
       <text
         type="string"
@@ -348,6 +363,19 @@
           top_delta="0"
           width="485">
 
+          <button
+            follows="top|left"
+            height="23"
+            label="Reset all to recommended settings"
+            layout="topleft"
+            left="0"
+            name="Defaults"
+            top="0"
+            width="250">
+            <button.commit_callback
+              function="Pref.HardwareDefaults" />
+          </button>
+
           <text
             type="string"
             length="1"
@@ -355,7 +383,7 @@
             height="16"
             layout="topleft"
             name="GeneralText"
-            top="0"
+            top_delta="25"
             left="5"
             width="128">
              General
@@ -471,14 +499,14 @@
             control_name="MaximumARC"
             follows="left|top"
             height="16"
-            initial_value="0"
+            initial_value="101"
             increment="1"
             label="Maximum ARC:"
             label_width="165"
             layout="topleft"
             left="50"
-            min_val="0"
-            max_val="100"
+            min_val="1"
+            max_val="101"
             name="MaximumARC"
             show_text="false"
             top_delta="16"
@@ -1185,14 +1213,15 @@
     <button
       follows="left|bottom"
       height="23"
-      label="Recommended Settings"
+      label="Save settings as a preset..."
       layout="topleft"
       left="10"
-      name="Defaults"
+      name="PrefSaveButton"
       top="310"
-      width="200">
+      width="250">
       <button.commit_callback
-        function="Pref.HardwareDefaults" />
+        function="Pref.PrefSave"
+        parameter="graphic" />
     </button>
   </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 023c6e5bbb..c09129c867 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4046,4 +4046,5 @@ Try enclosing path to the editor with double quotes.
   <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>
   </strings>
-- 
cgit v1.2.3