mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-31 11:54:22 -04:00
Enabled clickable links in forums and messages.
Added new translation in messages (count of recommended files). Fixed german translation. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3946 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
2307ef04a0
commit
ad67844c7a
14 changed files with 80 additions and 77 deletions
|
@ -26,7 +26,7 @@
|
|||
#include "FeedHolder.h"
|
||||
#include "../RsAutoUpdatePage.h"
|
||||
#include "gui/msgs/MessageComposer.h"
|
||||
#include "gui/chat/ChatStyle.h"
|
||||
#include "gui/chat/HandleRichText.h"
|
||||
#include "gui/settings/rsharesettings.h"
|
||||
|
||||
#include "gui/notifyqt.h"
|
||||
|
@ -149,15 +149,14 @@ void ChatMsgItem::insertChat(std::string &message)
|
|||
|
||||
QString formatMsg = QString::fromStdString(message);
|
||||
|
||||
ChatStyle style;
|
||||
unsigned int formatFlag = CHAT_FORMATTEXT_EMBED_LINKS;
|
||||
unsigned int formatFlag = RSHTML_FORMATTEXT_EMBED_LINKS;
|
||||
|
||||
// embed smileys ?
|
||||
if (Settings->valueFromGroup(QString("Chat"), QString::fromUtf8("Emoteicons_GroupChat"), true).toBool()) {
|
||||
formatFlag |= CHAT_FORMATTEXT_EMBED_SMILEYS;
|
||||
formatFlag |= RSHTML_FORMATTEXT_EMBED_SMILEYS;
|
||||
}
|
||||
|
||||
formatMsg = style.formatText(formatMsg, formatFlag);
|
||||
formatMsg = RsHtml::formatText(formatMsg, formatFlag);
|
||||
|
||||
chatTextlabel->setText(formatMsg);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue