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

CHUI-123 FIXED Tooltips for buttons are added

meow-7.2.2
maxim_productengine 2012-09-24 14:52:20 +03:00
parent 05bae4d6d7
commit e0b252fc99
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llimconversation.cpp
View File

@ -424,6 +424,7 @@ void LLIMConversation::updateHeaderAndToolbar()
mExpandCollapseBtn->setEnabled(!is_torn_off || !mIsP2PChat);
mTearOffBtn->setImageOverlay(getString(is_torn_off? "return_icon" : "tear_off_icon"));
mTearOffBtn->setToolTip(getString(!is_torn_off? "tooltip_to_separate_window" : "tooltip_to_main_window"));
mCloseBtn->setVisible(!is_torn_off && !mIsNearbyChat);

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

@ -62,6 +62,7 @@
layout="topleft"
left="10"
name="sort_btn"
tool_tip="View/sort options"
top="5"
width="31" />
<button
@ -75,7 +76,7 @@
top="5"
left_pad="4"
name="add_btn"
tool_tip="Add button on the left panel"
tool_tip="Start a new conversation"
width="31"/>
</layout_panel>
<layout_panel
@ -94,6 +95,7 @@
top="5"
left="5"
name="expand_collapse_btn"
tool_tip="Collapse/Expand this list"
width="31" />
</layout_panel>
</layout_stack>

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

@ -37,6 +37,12 @@
<floater.string
name="multiple_participants_added"
value="[NAME] were invited to the conversation."/>
<floater.string
name="tooltip_to_separate_window"
value="Move this conversation to a separate window"/>
<floater.string
name="tooltip_to_main_window"
value="Move this conversation back to main window"/>
<view
follows="all"
layout="topleft"
@ -64,6 +70,7 @@
layout="topleft"
left="5"
name="view_options_btn"
tool_tip="View/sort options"
top="5"
width="31" />
<button
@ -78,6 +85,7 @@
top="5"
left_pad="4"
name="add_btn"
tool_tip="Add someone to this conversation"
width="31"/>
<button
follows="top|left"
@ -90,6 +98,7 @@
top="5"
left_pad="4"
name="voice_call_btn"
tool_tip="Open voice connection"
width="31"/>
<button
follows="right|top"
@ -102,6 +111,7 @@
top="5"
left="283"
name="close_btn"
tool_tip="End this conversation"
width="31" />
<button
follows="right|top"
@ -114,6 +124,7 @@
top="5"
left_pad="5"
name="expand_collapse_btn"
tool_tip="Collapse/Expand this pane"
width="31" />
<button
follows="right|top"