From cc22efa4c0d6b06bac6f49b6243df7726f89c7c4 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 3 Dec 2014 06:35:46 -0500
Subject: STORM-2082 Remove Apply button. Add new control variable to track
 which preset is active.  Save settings to active preset when clicking on Ok
 button. Initial work to make pulldown operational. Still to do: add pretty
 icon for current preset. Notifications do not appear when called from this
 panel.

---
 .../default/xui/en/panel_preferences_graphics1.xml | 21 ++------
 .../default/xui/en/panel_presets_pulldown.xml      | 59 +++++++++++++++++-----
 2 files changed, 49 insertions(+), 31 deletions(-)

(limited to 'indra/newview/skins')

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 837644ed27..6df4a4f2ea 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -37,7 +37,7 @@
   <button
     follows="top|left"
     height="23"
-    label="Save..."
+    label="SaveAs..."
     layout="topleft"
     left_pad="5"
     name="PrefSaveButton"
@@ -946,25 +946,12 @@
     </panel>
 <!-- End of Advanced Settings block -->
 
-    <button
-      follows="left|bottom"
-      height="23"
-      label="Apply"
-      label_selected="Apply"
-      layout="topleft"
-      left="10"
-      name="Apply"
-      top="310"
-      width="115">
-      <button.commit_callback
-        function="Pref.Apply" />
-    </button>
     <button
       follows="left|bottom"
       height="23"
       label="Undo"
       layout="topleft"
-      left_pad="5"
+      left="10"
       name="Defaults"
       top="310"
       width="115">
@@ -974,12 +961,12 @@
     <button
       follows="left|bottom"
       height="23"
-      label="Recommended"
+      label="Recommended Settings"
       layout="topleft"
       left_pad="5"
       name="Recommended"
       top="310"
-      width="115">
+      width="190">
       <button.commit_callback
         function="Pref.Recommended" />
     </button>
diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
index 697bfd58e7..652d85656c 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
@@ -12,29 +12,60 @@
  layout="topleft"
  name="presets_pulldown"
  width="225">
-  <button
-    name="open_prefs_btn"
-    image_overlay="Icon_Gear_Foreground"
-    hover_glow_amount="0.15"
-    tool_tip = "Bring up graphics prefs"
-    top="5"
-    left="5"
-    height="20"
-    width="20">
-    <button.commit_callback
-      function="Presets.GoGraphicsPrefs" />
-  </button>
   <text
     type="string"
     length="1"
     follows="left|top"
     height="12"
     layout="topleft"
-    top_delta="4"
-    left_delta="25"
+    top="4"
+    left_delta="5"
     font.style="BOLD"
     name="Graphic Presets"
     width="120">
       Graphic Presets
   </text>
+  <scroll_list
+    follows="left|top"
+    layout="topleft"
+    column_padding="0"
+    height="100"
+    width="215"
+    draw_heading="false"
+    draw_stripes="false"
+    bg_stripe_color="0.25 0.25 0.25 0.25"
+    top_delta="15"
+    left_delta="0"
+    name="preset_list">
+    <scroll_list.columns
+      width="10"
+      label="Active"
+      name="active_name" />
+    <scroll_list.columns
+      width="200"
+      label="Preset Name"
+      name="preset_name" />
+      <scroll_list.commit_callback
+      function="Presets.RowClick" />
+  </scroll_list>
+  <view_border
+    bevel_style="none"
+    follows="top|left"
+    height="0"
+    layout="topleft"
+    left="5"
+    name="horiz_separator"
+    top_delta="105"
+    width="215" />
+  <button
+    name="open_prefs_btn"
+    label="Open Graphics Preferences"
+    tool_tip = "Bring up graphics prefs"
+    top_delta="5"
+    left="15"
+    height="20"
+    width="200">
+    <button.commit_callback
+      function="Presets.GoGraphicsPrefs" />
+  </button>
 </panel>
-- 
cgit v1.2.3