From 986ddaf9e8770f31461a9240cce5a720cd20bc66 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sun, 22 Feb 2015 09:01:49 -0500
Subject: STORM-2082 XML changes: move Reset button, add Ok and Cancel buttons
---
.../en/floater_preferences_graphics_advanced.xml | 56 ++++++++++++++++------
.../default/xui/en/panel_preferences_graphics1.xml | 4 +-
2 files changed, 44 insertions(+), 16 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 9d8f2215aa..9c6589d466 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -11,19 +11,6 @@
<!-- This block shows Advanced Settings -->
- <button
- follows="top|left"
- height="23"
- label="Reset all to recommended settings"
- layout="topleft"
- left="10"
- name="Defaults"
- top="5"
- width="250">
- <button.commit_callback
- function="Pref.HardwareDefaults" />
- </button>
-
<text
type="string"
length="1"
@@ -31,7 +18,7 @@
height="16"
layout="topleft"
name="GeneralText"
- top_delta="35"
+ top="5"
left="10"
width="128">
General
@@ -859,4 +846,45 @@
</text>
<!-- End of Advanced Settings block -->
+ <button
+ follows="top|left"
+ height="23"
+ label="Reset to recommended settings"
+ layout="topleft"
+ left="10"
+ name="Defaults"
+ top_delta="25"
+ width="210">
+ <button.commit_callback
+ function="Pref.HardwareDefaults" />
+ </button>
+
+ <button
+ follows="right|bottom"
+ height="23"
+ label="OK"
+ label_selected="OK"
+ layout="topleft"
+ left_pad="5"
+ name="OK"
+ top_delta="0"
+ width="80">
+ <button.commit_callback
+ function="Pref.OK" />
+ </button>
+
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Cancel"
+ label_selected="Cancel"
+ layout="topleft"
+ left_pad="5"
+ name="Cancel"
+ top_delta="0"
+ width="80" >
+ <button.commit_callback
+ function="Pref.Cancel" />
+ </button>
+
</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 5d4bfdd17f..a94907f0c9 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -233,12 +233,12 @@
<button
follows="top|left"
height="23"
- label="Reset all to recommended settings"
+ label="Reset to recommended settings"
layout="topleft"
left="5"
name="Defaults"
top_delta="30"
- width="250">
+ width="210">
<button.commit_callback
function="Pref.HardwareDefaults" />
</button>
--
cgit v1.2.3