From dc6216e77e84369450d3a9e2269bf4d03436a23d Mon Sep 17 00:00:00 2001 From: "Justin C. Rounds (Chuck)" Date: Mon, 23 Nov 2009 13:56:01 -0500 Subject: "Fit and finish" issues with bottom bar. See comments in JIRAs for details. http://jira.secondlife.com/browse/EXT-2537 http://jira.secondlife.com/browse/EXT-2352 --- .../skins/default/xui/en/widgets/gesture_combo_box.xml | 4 +++- indra/newview/skins/default/xui/en/widgets/talk_button.xml | 11 +++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en/widgets') diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml index 6171be034f..6ac654f14e 100644 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml @@ -19,8 +19,10 @@ hover_glow_amount="0.15" font="SansSerif" scale_image="true" + image_selected="PushButton_Selected_Press" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" image_unselected="PushButton_Off" - image_selected="PushButton_Selected" image_disabled="PushButton_Disabled" image_disabled_selected="PushButton_Selected_Disabled" /> Date: Mon, 23 Nov 2009 14:16:31 -0500 Subject: Scrollbar was too dark and not matching other scrollbars. Switched scroll_bar_bg_visible attribute to false in gesture_combo_box.xml to fix. http://jira.secondlife.com/browse/EXT-1451 --- indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/widgets') diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml index 6ac654f14e..b61f9fffff 100644 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml @@ -26,7 +26,7 @@ image_disabled="PushButton_Disabled" image_disabled_selected="PushButton_Selected_Disabled" /> + scroll_bar_bg_visible="false" /> -- cgit v1.2.3 From a8126a82cfa5e5f6625d78ecdb1199a88f512b91 Mon Sep 17 00:00:00 2001 From: "Justin C. Rounds (Chuck)" Date: Mon, 23 Nov 2009 15:21:59 -0500 Subject: Removed font references to SansSerifSmall. http://jira.secondlife.com/browse/EXT-1315 --- indra/newview/skins/default/xui/en/widgets/button.xml | 1 - indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml | 7 ++----- indra/newview/skins/default/xui/en/widgets/menu_item.xml | 4 +--- indra/newview/skins/default/xui/en/widgets/talk_button.xml | 1 - 4 files changed, 3 insertions(+), 10 deletions(-) (limited to 'indra/newview/skins/default/xui/en/widgets') diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 6b11e72247..7c54e618ef 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -15,7 +15,6 @@ image_color="ButtonImageColor" image_color_disabled="ButtonImageColor" flash_color="ButtonFlashBgColor" - font="SansSerifSmall" hover_glow_amount="0.15" halign="center" scale_image="true"> diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml index b61f9fffff..4229f34c09 100644 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml @@ -1,5 +1,5 @@ - + select_on_focus="true" /> diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml index c98e9cb6b8..2bbaa6233f 100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml @@ -1,6 +1,4 @@ - + diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml index bbc508de08..ea0a213c79 100644 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml @@ -13,7 +13,6 @@ name="left" label="Speak" label_selected="Speak" - font="SansSerifSmall" tab_stop="false" /> Date: Mon, 23 Nov 2009 14:23:51 -0800 Subject: Initial implementation of parcel property icons and maturity string on nav bar Added new LLAgentUI location format, renamed unclear old one Renamed ShowCoordinatesOption to NavBarShowCoordinates Extended LLLocationInputCtrl to show icons. Reviewed with Rick --- .../default/xui/en/widgets/location_input.xml | 48 +++++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/widgets') diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index d88bcfab1d..1fed1c075a 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -11,7 +11,7 @@ add_landmark_image_disabled="Favorite_Star_Off" add_landmark_image_hover="Favorite_Star_Over" add_landmark_image_selected="Favorite_Star_Press" - add_landmark_hpad="2" + icon_hpad="2" allow_text_entry="true" list_position="below" show_text_as_tentative="false" @@ -38,7 +38,51 @@ scale_image="false" top="19" left="-3" /> - + + + + + + + + Date: Mon, 23 Nov 2009 18:16:03 -0800 Subject: Add damage % text to nav bar, clip text entry to avoid overlapping icons Fixed includes of llmenugl.h / llnotifications.h Note: Clipping is incorrect, I think due to line editor bug. --- .../newview/skins/default/xui/en/widgets/location_input.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/widgets') diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 1fed1c075a..17b1479ec4 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -81,8 +81,18 @@ top="21" image_name="parcel_lght_Damage" /> + + - Date: Tue, 24 Nov 2009 11:16:34 -0500 Subject: Set global fontsize for tabs to SansSerifSmall http://jira.secondlife.com/browse/EXT-2731 --- indra/newview/skins/default/xui/en/widgets/tab_container.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/widgets') diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index f1401140de..477c6fb8b8 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -2,7 +2,7 @@