aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-20 07:58:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in nimetu/ryzomcore/issue-221 (pull request #100)

Browse source 
improve chatlog file (issue #221)

--HG--
branch : develop
This commit is contained in:
Jan Boon 2015-02-22 11:01:08 +01:00
commit 543331ea75
6 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/client/src/client_chat_manager.cpp
View file

@ -1204,7 +1204,7 @@ class CHandlerTell : public IActionHandler
ucstring s = CI18N::get("youTellPlayer"); ucstring s = CI18N::get("youTellPlayer");
strFindReplace(s, "%name", receiver); strFindReplace(s, "%name", receiver);
strFindReplace(finalMsg, CI18N::get("youTell"), s); strFindReplace(finalMsg, CI18N::get("youTell"), s);
CInterfaceManager::getInstance()->log(finalMsg); CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
} }
}; };
REGISTER_ACTION_HANDLER( CHandlerTell, "tell"); REGISTER_ACTION_HANDLER( CHandlerTell, "tell");

2
code/ryzom/client/src/interface_v3/chat_window.cpp
View file

@ -483,7 +483,7 @@ void CChatWindow::displayLocalPlayerTell(const ucstring &receiver, const ucstrin
strFindReplace(s, "%name", receiver); strFindReplace(s, "%name", receiver);
strFindReplace(finalMsg, CI18N::get("youTell"), s); strFindReplace(finalMsg, CI18N::get("youTell"), s);
displayMessage(finalMsg, prop.getRGBA(), CChatGroup::tell, 0, numBlinks); displayMessage(finalMsg, prop.getRGBA(), CChatGroup::tell, 0, numBlinks);
CInterfaceManager::getInstance()->log(finalMsg); CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
} }
void CChatWindow::encodeColorTag(const NLMISC::CRGBA &color, ucstring &text, bool append) void CChatWindow::encodeColorTag(const NLMISC::CRGBA &color, ucstring &text, bool append)

4
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -2684,7 +2684,7 @@ bool CInterfaceManager::deletePlayerKeys (const std::string &playerFileIdent)
} }
// *************************************************************************** // ***************************************************************************
void CInterfaceManager::log(const ucstring &str) void CInterfaceManager::log(const ucstring &str, const std::string &cat)
{ {
if (_LogState) if (_LogState)
{ {
@ -2693,7 +2693,7 @@ void CInterfaceManager::log(const ucstring &str)
FILE *f = fopen(fileName.c_str(), "at"); FILE *f = fopen(fileName.c_str(), "at");
if (f != NULL) if (f != NULL)
{ {
const string finalString = string(NLMISC::IDisplayer::dateToHumanString()) + " * " + str.toUtf8(); const string finalString = string(NLMISC::IDisplayer::dateToHumanString()) + " (" + NLMISC::toUpper(cat) + ") * " + str.toUtf8();
fprintf(f, "%s\n", finalString.c_str()); fprintf(f, "%s\n", finalString.c_str());
} }
fclose(f); fclose(f);

2
code/ryzom/client/src/interface_v3/interface_manager.h
View file

@ -218,7 +218,7 @@ public:
// Log system (all chat/tell // Log system (all chat/tell
void setLogState(bool state) { _LogState = state; } void setLogState(bool state) { _LogState = state; }
bool getLogState() const { return _LogState; } bool getLogState() const { return _LogState; }
void log(const ucstring &str); void log(const ucstring &str, const std::string &cat = "");
/// Text from here and from server /// Text from here and from server

4
code/ryzom/client/src/interface_v3/people_list.cpp
View file

@ -478,7 +478,7 @@ void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, c
strFindReplace(s, "%name", receiver); strFindReplace(s, "%name", receiver);
strFindReplace(finalMsg, CI18N::get("youTell"), s); strFindReplace(finalMsg, CI18N::get("youTell"), s);
gl->addChild(getChatTextMngr().createMsgText(finalMsg, prop.getRGBA())); gl->addChild(getChatTextMngr().createMsgText(finalMsg, prop.getRGBA()));
CInterfaceManager::getInstance()->log(finalMsg); CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
// if the group is closed, make it blink // if the group is closed, make it blink
if (!gc->isOpen()) if (!gc->isOpen())
@ -946,7 +946,7 @@ class CHandlerContactEntry : public IActionHandler
ucstring s = CI18N::get("youTellPlayer"); ucstring s = CI18N::get("youTellPlayer");
strFindReplace(s, "%name", pWin->getFreeTellerName(str)); strFindReplace(s, "%name", pWin->getFreeTellerName(str));
strFindReplace(final, CI18N::get("youTell"), s); strFindReplace(final, CI18N::get("youTell"), s);
CInterfaceManager::getInstance()->log(final); CInterfaceManager::getInstance()->log(final, CChatGroup::groupTypeToString(CChatGroup::tell));
} }
} }
} }

25
code/ryzom/client/src/net_manager.cpp
View file

@ -879,7 +879,28 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
} }
// Log // Log
pIM->log (finalString);
string channel;
if (mode == CChatGroup::dyn_chat)
{
sint32 dbIndex = ChatMngr.getDynamicChannelDbIndexFromId(dynChatId);
clamp(dbIndex, (sint32)0 , (sint32)CChatGroup::MaxDynChanPerPlayer);
channel = "dyn" + toString(dbIndex);
}
else
{
channel = CChatGroup::groupTypeToString(mode);
if (channel.empty())
{
channel = "#" + toString((uint32)mode);
}
}
if (!stringCategory.empty() && NLMISC::toUpper(stringCategory) != "SYS")
{
channel = channel + "/" + stringCategory;
}
pIM->log (finalString, channel);
} }
@ -911,7 +932,7 @@ void CInterfaceChatDisplayer::displayTell(/*TDataSetIndex senderIndex, */const u
colorizeSender(finalString, senderPart, prop.getRGBA()); colorizeSender(finalString, senderPart, prop.getRGBA());
PeopleInterraction.ChatInput.Tell.displayTellMessage(/*senderIndex, */finalString, goodSenderName, prop.getRGBA(), 2, &windowVisible); PeopleInterraction.ChatInput.Tell.displayTellMessage(/*senderIndex, */finalString, goodSenderName, prop.getRGBA(), 2, &windowVisible);
CInterfaceManager::getInstance()->log(finalString); CInterfaceManager::getInstance()->log(finalString, CChatGroup::groupTypeToString(CChatGroup::tell));
// Open the free teller window // Open the free teller window
CChatGroupWindow *pCGW = PeopleInterraction.getChatGroupWindow(); CChatGroupWindow *pCGW = PeopleInterraction.getChatGroupWindow();