livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-82 : Fixed all icons to use the new Conv_*.png icons; please use those in the new UIs moving forward

meow-7.2.2
Merov Linden 2012-06-28 16:47:37 -07:00
parent cbe3c3ae95
commit e8fa07d638
16 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 B

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 293 B

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_call_log.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 546 B

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_close.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 262 B

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 663 B

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 662 B

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 460 B

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_open_call.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 485 B

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 B

BIN
indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 196 B

14
indra/newview/skins/default/textures/textures.xml
View File

@ -160,7 +160,21 @@ with the same filename but different name
<texture name="ComboButton_On" file_name="widgets/ComboButton_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="Container" file_name="containers/Container.png" preload="false" />
<texture name="Conv_toolbar_add_person" file_name="icons/Conv_toolbar_add_person.png" preload="false" />
<texture name="Conv_toolbar_arrow_ne" file_name="icons/Conv_toolbar_arrow_ne.png" preload="false" />
<texture name="Conv_toolbar_arrow_sw" file_name="icons/Conv_toolbar_arrow_sw.png" preload="false" />
<texture name="Conv_toolbar_call_log" file_name="icons/Conv_toolbar_call_log.png" preload="false" />
<texture name="Conv_toolbar_close" file_name="icons/Conv_toolbar_close.png" preload="false" />
<texture name="Conv_toolbar_collapse" file_name="icons/Conv_toolbar_collapse.png" preload="false" />
<texture name="Conv_toolbar_expand" file_name="icons/Conv_toolbar_expand.png" preload="false" />
<texture name="Conv_toolbar_hang_up" file_name="icons/Conv_toolbar_hang_up.png" preload="false" />
<texture name="Conv_toolbar_open_call" file_name="icons/Conv_toolbar_open_call.png" preload="false" />
<texture name="Conv_toolbar_plus" file_name="icons/Conv_toolbar_plus.png" preload="false" />
<texture name="Conv_toolbar_sort" file_name="icons/Conv_toolbar_sort.png" preload="false" />
<texture name="Copy" file_name="icons/Copy.png" preload="false" />
<texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" />

10
indra/newview/skins/default/xui/en/floater_im_container.xml
View File

@ -15,10 +15,10 @@
width="680">
<string
name="collapse_icon"
value="TabIcon_Open_Off"/>
value="Conv_toolbar_collapse"/>
<string
name="expand_icon"
value="TabIcon_Close_Off"/>
value="Conv_toolbar_expand"/>
<layout_stack
animate="true"
follows="all"
@ -53,7 +53,7 @@
follows="top|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="OptionsMenu_Off"
image_overlay="Conv_toolbar_sort"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
@ -65,7 +65,7 @@
follows="top|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="AddItem_Off"
image_overlay="Conv_toolbar_plus"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
@ -84,7 +84,7 @@
follows="right|top"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="TabIcon_Open_Off"
image_overlay="Conv_toolbar_collapse"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"

36
indra/newview/skins/default/xui/en/floater_im_session.xml
View File

@ -18,20 +18,20 @@
<floater.string
name="NearbyChatTitle"
value="Nearby Chat"/>
<floater.string name="call_btn_start">VoicePTT_Off</floater.string>
<floater.string name="call_btn_stop">VoicePTT_On</floater.string>
<floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
<floater.string name="call_btn_stop">Conv_toolbar_hang_up</floater.string>
<floater.string
name="collapse_icon"
value="TabIcon_Open_Off"/>
value="Conv_toolbar_collapse"/>
<floater.string
name="expand_icon"
value="TabIcon_Close_Off"/>
value="Conv_toolbar_expand"/>
<floater.string
name="tear_off_icon"
value="tearoffbox.tga"/>
value="Conv_toolbar_arrow_ne"/>
<floater.string
name="return_icon"
value="Icon_Dock_Foreground"/>
value="Conv_toolbar_arrow_sw"/>
<view
follows="all"
layout="topleft"
@ -52,10 +52,10 @@
menu_filename="menu_im_session_showmodes.xml"
follows="top|left"
height="25"
image_hover_unselected="Toolbar_Left_Over"
image_overlay="OptionsMenu_Off"
image_selected="Toolbar_Left_Selected"
image_unselected="Toolbar_Left_Off"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Conv_toolbar_sort"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left="5"
name="view_options_btn"
@ -66,7 +66,7 @@
follows="top|left"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="AddItem_Off"
image_overlay="Conv_toolbar_add_person"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
@ -77,10 +77,10 @@
<button
follows="top|left"
height="25"
image_hover_unselected="Toolbar_Right_Over"
image_overlay="VoicePTT_Off"
image_selected="Toolbar_Right_Selected"
image_unselected="Toolbar_Right_Off"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Conv_toolbar_open_call"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
top="5"
left_pad="4"
@ -90,7 +90,7 @@
follows="right|top"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Icon_Close_Foreground"
image_overlay="Conv_toolbar_close"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
@ -102,7 +102,7 @@
follows="right|top"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="TabIcon_Open_Off"
image_overlay="Conv_toolbar_collapse"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
@ -114,7 +114,7 @@
follows="right|top"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="tearoffbox.tga"
image_overlay="Conv_toolbar_arrow_ne"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"

2
indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
View File

@ -49,7 +49,7 @@
follows="right"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Inv_Underpants"
image_overlay="Conv_toolbar_sort"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"

8
indra/newview/skins/default/xui/en/panel_people.xml
View File

@ -122,7 +122,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
follows="right"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Inv_Underpants"
image_overlay="Conv_toolbar_sort"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
@ -270,7 +270,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
follows="right"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Inv_Underpants"
image_overlay="Conv_toolbar_sort"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
@ -425,7 +425,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
follows="right"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Inv_Underpants"
image_overlay="Conv_toolbar_sort"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
@ -533,7 +533,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
follows="right"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Inv_Underpants"
image_overlay="Conv_toolbar_sort"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"