From 551f74125bacfe8353a4b13692d2fdb0cc29958b Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Thu, 15 Jul 2010 16:32:50 -0700 Subject: Changes to allow disabling an LLTextBox (or LLTextBox subclass) to gray out the text. Due to some legacy issues, text boxes will not gray out on disable unless they have their text_readonly_color property in xui set to "LabelDisabledColor" (or some other color distinct from their text color). Reviewed by Richard. --- indra/newview/skins/default/xui/en/widgets/text.xml | 2 +- indra/newview/skins/default/xui/en/widgets/text_editor.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 3006df22b8..3fa3f3eb90 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -8,7 +8,7 @@ halign="left" h_pad="0" allow_scroll="false" - text_readonly_color="LabelDisabledColor" + text_readonly_color="LabelTextColor" bg_writeable_color="FloaterDefaultBackgroundColor" use_ellipses="false" bg_visible="false" diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml index 2ced8b1b4b..af2e17fc3f 100644 --- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml @@ -2,4 +2,5 @@ -- cgit v1.2.3 From de65b93f082a680b86b6afed59f028d0bddb0eb6 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Thu, 15 Jul 2010 17:07:05 -0700 Subject: Fix for EXT-8230 LLPanelMediaSettingsPermissions::initValues() was referencing both XUI elements that don't exist and strings that don't appear in strings.xml. Also fixed a number of elements in panel_media_settings_permissions.xml and floater_tools.xml that weren't graying out properly when non-editable items were selected, and some mixed up image attributes that made the media "gear" icon states look wrong. --- indra/newview/skins/default/xui/en/floater_tools.xml | 15 +++++++++++---- .../default/xui/en/panel_media_settings_permissions.xml | 15 ++++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index a96dbe3553..514b0a501b 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2322,6 +2322,7 @@ even though the user gets a free copy. layout="topleft" left_pad="15" name="color trans" + text_readonly_color="LabelDisabledColor" top="6" width="110"> Transparency % @@ -2346,6 +2347,7 @@ even though the user gets a free copy. layout="topleft" left_delta="0" name="glow label" + text_readonly_color="LabelDisabledColor" top_pad="8" width="80"> Glow @@ -2376,6 +2378,7 @@ even though the user gets a free copy. layout="topleft" left="10" name="tex gen" + text_readonly_color="LabelDisabledColor" top_pad="5" width="90"> Mapping @@ -2404,6 +2407,7 @@ even though the user gets a free copy. layout="topleft" name="label shininess" left_pad="4" + text_readonly_color="LabelDisabledColor" top_pad="-36" width="90"> Shininess @@ -2440,6 +2444,7 @@ even though the user gets a free copy. layout="topleft" left_pad="4" name="label bumpiness" + text_readonly_color="LabelDisabledColor" top_pad="-36" width="90"> Bumpiness @@ -2565,7 +2570,8 @@ even though the user gets a free copy. height="10" layout="topleft" left="10" - name="tex scale" + name="rpt" + text_readonly_color="LabelDisabledColor" top_pad="4" width="200"> Repeats / Face @@ -2654,6 +2660,7 @@ even though the user gets a free copy. layout="topleft" left="10" name="tex offset" + text_readonly_color="LabelDisabledColor" width="200"> Texture Offset @@ -2737,9 +2744,9 @@ even though the user gets a free copy. follows="top|left" tool_tip="Edit this Media" height="12" - image_disabled="Icon_Gear_Foreground" - image_selected="Icon_Gear_Background" - image_unselected="Icon_Gear_Press" + image_disabled="Icon_Gear_Background" + image_selected="Icon_Gear_Press" + image_unselected="Icon_Gear_Foreground" layout="topleft" left_pad="10" name="edit_media" diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml index c5f44cd049..d3a58fed58 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml @@ -16,7 +16,8 @@ follows="top|left" height="15" left="10" - name="controls_label"> + name="controls_label" + text_readonly_color="LabelDisabledColor"> Controls: + name="owner_label" + text_readonly_color="LabelDisabledColor"> Owner @@ -83,8 +85,9 @@ enabled="false" follows="top|left" height="15" - left="10" - name="group_label"> + left="10" + name="group_label" + text_readonly_color="LabelDisabledColor"> Group: @@ -95,6 +98,7 @@ font="SansSerif" height="20" left="60" name="perms_group_name" + text_readonly_color="LabelDisabledColor" value ="" width="200" /> @@ -132,7 +136,8 @@ follows="top|left" height="15" left="10" - name="anyone_label"> + name="anyone_label" + text_readonly_color="LabelDisabledColor"> Anyone -- cgit v1.2.3