Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed replacing of %color% in ChatStyle. It should not be replaced after %message%.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5182 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-05-23 09:19:50 +00:00
parent 22a0f89751
commit 56e156a65a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/chat/ChatStyle.cpp
View File

@ -301,8 +301,8 @@ QString ChatStyle::formatMessage(enumFormatMessage type, const QString &name, co
m_style[type] = style; m_style[type] = style;
} }
QColor color;
#ifdef COLORED_NICKNAMES #ifdef COLORED_NICKNAMES
QColor color;
if (flag & CHAT_FORMATMSG_SYSTEM) { if (flag & CHAT_FORMATMSG_SYSTEM) {
color = Qt::darkBlue; color = Qt::darkBlue;
} else { } else {
@ -326,8 +326,10 @@ QString ChatStyle::formatMessage(enumFormatMessage type, const QString &name, co
QString formatMsg = style.replace("%name%", name) QString formatMsg = style.replace("%name%", name)
.replace("%date%", timestamp.date().toString("dd.MM.yyyy")) .replace("%date%", timestamp.date().toString("dd.MM.yyyy"))
.replace("%time%", timestamp.time().toString("hh:mm:ss")) .replace("%time%", timestamp.time().toString("hh:mm:ss"))
.replace("%message%", message) #ifdef COLORED_NICKNAMES
.replace("%color%", color.name()); .replace("%color%", color.name())
#endif
.replace("%message%", message);
return formatMsg; return formatMsg;
} }