diff options
| author | Sergey Borushevsky <sborushevsky@productengine.com> | 2009-11-04 20:09:06 +0200 |
|---|---|---|
| committer | Sergey Borushevsky <sborushevsky@productengine.com> | 2009-11-04 20:09:06 +0200 |
| commit | f59c8b5e4e2625930e24ea28cd8e3a713cffed43 (patch) | |
| tree | 64be2521078ab3fb6962aadd0512e670c1308654 /indra | |
| parent | 8346cd6806f479053a5b81b496dbb9b88ed26bb5 (diff) | |
Implemented normal task EXT-2149 (IM Text Editors should display grayed text "TO [avatar_name/group_name/ad-hoc conference]")
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lllineeditor.h | 2 | ||||
| -rw-r--r-- | indra/newview/llimfloater.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 8 |
3 files changed, 17 insertions, 5 deletions
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index 3d7bbdff89..d3daa941cf 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -172,6 +172,8 @@ public: virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text ); void setLabel(const LLStringExplicit &new_label) { mLabel = new_label; } + const std::string& getLabel() { return mLabel.getString(); } + void setText(const LLStringExplicit &new_text); const std::string& getText() const { return mText.getString(); } diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 19fa66fd0e..85863ed85b 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -225,6 +225,7 @@ BOOL LLIMFloater::postBuild() // enable line history support for instant message bar mInputEditor->setEnableLineHistory(TRUE); + mInputEditor->setFocusReceivedCallback( boost::bind(onInputEditorFocusReceived, _1, this) ); mInputEditor->setFocusLostCallback( boost::bind(onInputEditorFocusLost, _1, this) ); mInputEditor->setKeystrokeCallback( onInputEditorKeystroke, this ); @@ -232,14 +233,17 @@ BOOL LLIMFloater::postBuild() mInputEditor->setRevertOnEsc( FALSE ); mInputEditor->setReplaceNewlinesWithSpaces( FALSE ); - childSetCommitCallback("chat_editor", onSendMsg, this); - - mChatHistory = getChild<LLChatHistory>("chat_history"); - std::string session_name(LLIMModel::instance().getName(mSessionID)); + + mInputEditor->setLabel(mInputEditor->getLabel() + " " + session_name); + LLStringUtil::toUpper(session_name); setTitle(session_name); + childSetCommitCallback("chat_editor", onSendMsg, this); + + mChatHistory = getChild<LLChatHistory>("chat_history"); + setDocked(true); mTypingStart = LLTrans::getString("IM_typing_start_string"); diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 8eeff0a9e4..1585d976b3 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -63,7 +63,13 @@ allow_html="true" width="350"> </chat_history> - <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="345"> + <line_editor + follows="left|right" + height="20" + label="To" + layout="topleft" + name="chat_editor" + width="345"> </line_editor> </layout_panel> </layout_stack> |