diff options
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png | bin | 490 -> 309 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png | bin | 302 -> 309 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_sys_well.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_checkbox.xml | 79 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_bottomtray.xml | 22 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml | 13 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml | 16 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml | 19 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml | 12 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chiclet_script.xml | 12 |
11 files changed, 152 insertions, 33 deletions
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png Binary files differindex 661d1c5611..6cb33efb93 100644 --- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png +++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png Binary files differindex f927fd3989..6cb33efb93 100644 --- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png +++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml index 3fc57372de..005952f3f2 100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -3,13 +3,13 @@ legacy_header_height="18" bevel_style="in" left="0" - top="0" + top="0" follows="right|bottom" layout="topleft" name="sys_well_window" help_topic="notification_chiclet" save_rect="true" - title="NOTIFICATIONS" + title="NOTIFICATIONS" width="320" min_width="320" height="23" @@ -23,13 +23,13 @@ > <string name="title_im_well_window"> - IM SESSIONS + CONVERSATIONS </string> <string name="title_notification_well_window"> NOTIFICATIONS </string> - + <flat_list_view color="FloaterDefaultBackgroundColor" follows="all" diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml index 9977e85a9d..042b4226c3 100644 --- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml @@ -71,4 +71,83 @@ name="font_checkbox" top_pad="14" width="150" /> + +<chiclet_im_p2p + height="25" + name="im_p2p_chiclet" + show_speaker="false" + width="25"> + <chiclet_im_p2p.chiclet_button + height="25" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> + <chiclet_im_p2p.speaker + auto_update="true" + draw_border="false" + height="25" + left="25" + name="speaker" + visible="false" + width="20" /> + <chiclet_im_p2p.avatar_icon + bottom="3" + follows="left|top|bottom" + height="20" + left="2" + mouse_opaque="false" + name="avatar_icon" + width="21" /> + <chiclet_im_p2p.unread_notifications + height="25" + font_halign="center" + left="25" + mouse_opaque="false" + name="unread" + text_color="white" + v_pad="5" + visible="false" + width="20"/> + <chiclet_im_p2p.new_message_icon + bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> +</chiclet_im_p2p> + + +<chiclet_offer + height="25" + name="offer_chiclet" + width="25"> + <chiclet_offer.chiclet_button + height="25" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> + <chiclet_offer.icon + bottom="3" + default_icon="Generic_Object_Small" + follows="all" + height="19" + left="3" + mouse_opaque="false" + name="chiclet_icon" + width="19" /> + <chiclet_offer.new_message_icon + bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> +</chiclet_offer> </floater> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index de3de45718..d3db9fd531 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -265,7 +265,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. left="1" min_width="110" name="chiclet_list" - top="6" + top="8" chiclet_padding="4" scrolling_offset="40" width="189"> @@ -284,7 +284,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. name="chicklet_left_scroll_button" scale_image="true" tab_stop="false" - top="-2" + top="-4" right_pad="2" visible="false" width="7" /> @@ -303,7 +303,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. name="chicklet_right_scroll_button" scale_image="true" tab_stop="false" - top="-2" + top="-4" visible="false" width="7" /> </chiclet_panel> @@ -334,11 +334,11 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. max_displayed_count="99" flash_period="0.3" follows="right" - height="23" + height="28" layout="topleft" left="0" name="im_well" - top="5" + top="0" width="35"> <!-- Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button @@ -350,7 +350,6 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well --> <button auto_resize="true" - flash_color="ChicletFlashColor" follows="right" halign="center" height="23" @@ -358,12 +357,12 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well image_overlay_alignment="center" image_pressed="WellButton_Lit" image_pressed_selected="WellButton_Lit_Selected" - image_selected="PushButton_Selected_Press" + image_selected="PushButton_Press" label_color="Black" left="0" name="Unread IM messages" tool_tip="Conversations" - width="35" > + width="34" > <button.init_callback function="Button.SetDockableFloaterToggle" parameter="im_well_window" /> @@ -407,12 +406,11 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well bottom_pad="3" image_pressed="WellButton_Lit" image_pressed_selected="WellButton_Lit_Selected" - image_selected="PushButton_Selected_Press" + image_selected="PushButton_Press" auto_resize="true" halign="center" height="23" follows="right" - flash_color="ChicletFlashColor" label_color="Black" left="0" name="Unread" @@ -420,12 +418,12 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well image_overlay_alignment="center" pad_right="15" tool_tip="Notifications" - width="35" > + width="34" > <button.init_callback function="Button.SetDockableFloaterToggle" parameter="notification_well_window" /> </button> - <icon + <icon auto_resize="false" color="0 0 0 0" follows="left|right" diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml index 693c43f141..dcfaeb449b 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml @@ -4,6 +4,13 @@ name="im_adhoc_chiclet" show_speaker="false" width="25"> + <chiclet_im_adhoc.chiclet_button + height="25" + image_selected="PushButton_On" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25" /> <chiclet_im_adhoc.speaker auto_update="true" draw_border="false" @@ -13,11 +20,13 @@ visible="false" width="20" /> <chiclet_im_adhoc.avatar_icon + bottom="3" follows="left|top|bottom" - height="22" + height="20" + left="2" mouse_opaque="true" name="adhoc_icon" - width="22" /> + width="21" /> <chiclet_im_adhoc.unread_notifications font_halign="center" height="25" diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml index f4fc58701c..de37b5b94e 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml @@ -4,6 +4,13 @@ name="im_group_chiclet" show_speaker="false" width="25"> + <chiclet_im_group.chiclet_button + height="25" + image_selected="PushButton_On" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25" /> <chiclet_im_group.speaker auto_update="true" draw_border="false" @@ -13,13 +20,14 @@ visible="false" width="20" /> <chiclet_im_group.group_icon + bottom="3" default_icon="Generic_Group" follows="left|top|bottom" - height="18" - bottom_pad="4" - mouse_opaque="true" + height="20" + left="2" + mouse_opaque="false" name="group_icon" - width="18" /> + width="21" /> <chiclet_im_group.unread_notifications height="25" font_halign="center" diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml index 535113f717..8233c4b488 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml @@ -4,6 +4,13 @@ name="im_p2p_chiclet" show_speaker="false" width="25"> + <chiclet_im_p2p.chiclet_button + height="25" + image_selected="PushButton_On" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> <chiclet_im_p2p.speaker auto_update="true" draw_border="false" @@ -11,13 +18,15 @@ left="25" name="speaker" visible="false" - width="20"/> + width="20" /> <chiclet_im_p2p.avatar_icon + bottom="3" follows="left|top|bottom" - height="22" - mouse_opaque="true" + height="20" + left="2" + mouse_opaque="false" name="avatar_icon" - width="22" /> + width="21" /> <chiclet_im_p2p.unread_notifications height="25" font_halign="center" @@ -36,4 +45,4 @@ name="new_message_icon" visible="false" width="14" /> -</chiclet_im_p2p>
\ No newline at end of file +</chiclet_im_p2p> diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml index 86bea9be50..8918120918 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml @@ -3,14 +3,22 @@ height="25" name="offer_chiclet" width="25"> + <chiclet_offer.chiclet_button + height="25" + image_selected="PushButton_On" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25" /> <chiclet_offer.icon + bottom="3" default_icon="Generic_Object_Small" follows="all" height="20" + left="2" mouse_opaque="false" name="chiclet_icon" - bottom_pad="2" - width="20" /> + width="21" /> <chiclet_offer.new_message_icon bottom="11" height="14" diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml index f3207ddeae..5f51f4afd9 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_panel - name="chiclet_panel" + name="chiclet_panel" chiclet_padding="3" scrolling_offset="40" - scroll_button_hpad="5" + scroll_button_hpad="0" scroll_ratio="10" min_width="180" />
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml index b1f9f5b0e8..8e3541231d 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml @@ -3,14 +3,22 @@ height="25" name="script_chiclet" width="25"> + <chiclet_script.chiclet_button + height="25" + image_selected="PushButton_On" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> <chiclet_script.icon + bottom="3" follows="all" height="20" image_name="Generic_Object_Small" + left="2" mouse_opaque="false" name="chiclet_icon" - width="20" - bottom_pad="2" /> + width="21"/> <chiclet_script.new_message_icon bottom="11" height="14" |
