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

FIRE-6545: Basic chat transcript search. Needs more work

Cinders 2013-12-02 19:15:31 -07:00
parent d8a7b8245d
commit 910a1d6811
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llfloaterconversationpreview.cpp
View File

@ -36,11 +36,12 @@
#include "llspinctrl.h"
#include "lltrans.h"
// <FS:CR>
#include "llviewercontrol.h"
#include "llavataractions.h"
#include "llviewerwindow.h"
#include "llwindow.h"
#include "llconversationlog.h"
#include "llfloatersearchreplace.h"
#include "llviewerwindow.h"
#include "llviewercontrol.h"
#include "llwindow.h"
// </FS:CR>
const std::string LL_FCP_COMPLETE_NAME("complete_name");
@ -68,6 +69,7 @@ BOOL LLFloaterConversationPreview::postBuild()
LLLoadHistoryThread::setLoadEndSignal(boost::bind(&LLFloaterConversationPreview::setPages, this, _1, _2));
childSetAction("open_external_btn", boost::bind(&LLFloaterConversationPreview::onBtnOpenExternal, this)); //<FS:CR> Open chat history externally
childSetAction("search_btn", boost::bind(&LLFloaterConversationPreview::onClickSearch, this)); // [FS:CR] FIRE-6545
const LLConversation* conv = LLConversationLog::instance().getConversation(mSessionID);
std::string name;
@ -227,7 +229,13 @@ void LLFloaterConversationPreview::onMoreHistoryBtnClick()
}
// <FS:CR> Open chat history externally
void (LLFloaterConversationPreview::onBtnOpenExternal())
void LLFloaterConversationPreview::onBtnOpenExternal()
{
gViewerWindow->getWindow()->openFile(LLLogChat::makeLogFileName(mChatHistoryFileName));
}
// [FS:CR] FIRE-6545
void LLFloaterConversationPreview::onClickSearch()
{
LLFloaterSearchReplace::show(mChatHistory);
}

1
indra/newview/llfloaterconversationpreview.h
View File

@ -54,6 +54,7 @@ private:
void onMoreHistoryBtnClick();
void showHistory();
void onBtnOpenExternal(); // <FS:CR> Open chat history externally
void onClickSearch(); // [FS:CR] FIRE-6545
LLMutex mMutex;
LLSpinCtrl* mPageSpinner;

12
indra/newview/skins/default/xui/en/floater_conversation_preview.xml
View File

@ -75,4 +75,16 @@
name="open_external_btn"
top_delta="-2"
width="25"/>
<button
follows="bottom|left"
height="22"
left_pad="4"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
tool_tip="Search this transcript"
image_overlay="Script_Search"
name="search_btn"
top_delta="0"
width="25"/>
</floater>