diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-15 13:36:33 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-15 13:36:33 -0800 |
| commit | e761ba064a2b5960efdfc94bb5baef85a7ec1a0a (patch) | |
| tree | de9970a791adf551b9cfa65a0013118d33c77554 /indra/newview/skins/default/xui/en/widgets | |
| parent | 56af8f1639a13adeb6f34e9988489aa5757a3184 (diff) | |
| parent | 4c4c68a3408c85e49d365c31be93e006be612ab1 (diff) | |
Merge for EXT-1874, EXT-3800, EXT-4133
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
4 files changed, 34 insertions, 41 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index 8785dff2ae..f6d1992c8e 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -1,23 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <chat_history - message_header="panel_chat_header.xml" - message_separator="panel_chat_separator.xml" - left_text_pad="10" - right_text_pad="15" - left_widget_pad="0" - right_widget_pad="10" - top_separator_pad="5" - bottom_separator_pad="5" - top_header_pad="17" - bottom_header_pad="10" + message_header="panel_chat_header.xml" + message_separator="panel_chat_separator.xml" + left_text_pad="10" + right_text_pad="15" + left_widget_pad="0" + right_widget_pad="10" + top_separator_pad="2" + bottom_separator_pad="2" + top_header_pad="12" + bottom_header_pad="5" max_length="2147483647" track_bottom="true" name="chat_history" type="string" word_wrap="true" + line_spacing.multiple="1.0" font="SansSerif"> <more_chat_text mouse_opaque="true" word_wrap="true" /> </chat_history> +enabledcontrol
\ No newline at end of file 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 deleted file mode 100644 index 4229f34c09..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<gesture_combo_box - label="Gestures" - list_position="below" - max_chars="20" - follows="right|top"> - <gesture_combo_box.combo_button name="Combobox Button" - label="" - hover_glow_amount="0.15" - scale_image="true" - image_unselected="ComboButton_Off" - image_selected="ComboButton_Selected" - image_disabled="ComboButton_Disabled" - image_disabled_selected="ComboButton_Disabled_Selected" /> - <gesture_combo_box.drop_down_button name="Drop Down Button" - label="" - halign="center" - hover_glow_amount="0.15" - scale_image="true" - image_selected="PushButton_Selected_Press" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_unselected="PushButton_Off" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Selected_Disabled" /> - <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" - scroll_bar_bg_visible="false" /> - <gesture_combo_box.combo_editor name="Combo Text Entry" - select_on_focus="true" /> -</gesture_combo_box> diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml new file mode 100644 index 0000000000..808683864d --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<gesture_combo_list + follows="right|top"> + <gesture_combo_list.combo_button + name="Combolist Button" + label="" + layout="topleft" + halign="center" + hover_glow_amount="0.15" + mouse_opaque="false" + scale_image="true" + image_selected="PushButton_Selected_Press" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_unselected="PushButton_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Selected_Disabled" /> + <gesture_combo_list.combo_list + bg_writeable_color="MenuDefaultBgColor" + scroll_bar_bg_visible="false" /> +</gesture_combo_list> diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml index 53034afa61..58543338f6 100644 --- a/indra/newview/skins/default/xui/en/widgets/menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu bg_color="MenuDefaultBgColor" bg_visible="true" - drop_shadow="false" + drop_shadow="true" tear_off="false" shortcut_pad="15"> </menu> |