Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-09-27 03:41:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Moved HandleRichText from the folder "chat" to "util" and redesigned the source

Browse source 
- Extended RsHtml::formatText to replace the RetroShare links with an image and enabled this for the certificate links in the system messages (friend recommendation and user request)
- Added new ObjectPainter for painting a button on a pixmap


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-05-12 00:40:53 +00:00
parent 5a3863d216
commit dc2d6c975e
27 changed files with 470 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

9
retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp
View file

@ -32,6 +32,7 @@
#include "ImHistoryBrowser.h"
#include "IMHistoryItemDelegate.h"
#include "IMHistoryItemPainter.h"
#include "util/HandleRichText.h"
#include "rshare.h"
#include <retroshare/rshistory.h>
@ -254,10 +255,10 @@ void ImHistoryBrowser::historyChanged(uint msgId, int type)
void ImHistoryBrowser::fillItem(QListWidgetItem *itemWidget, HistoryMsg& msg)
{
unsigned int formatFlag = CHAT_FORMATMSG_EMBED_LINKS;
unsigned int formatTextFlag = RSHTML_FORMATTEXT_EMBED_LINKS;
if (embedSmileys) {
formatFlag |= CHAT_FORMATMSG_EMBED_SMILEYS;
formatTextFlag |= RSHTML_FORMATTEXT_EMBED_SMILEYS;
}
ChatStyle::enumFormatMessage type;
@ -267,8 +268,8 @@ void ImHistoryBrowser::fillItem(QListWidgetItem *itemWidget, HistoryMsg& msg)
type = ChatStyle::FORMATMSG_OUTGOING;
}
QString messageText = QString::fromUtf8(msg.message.c_str());
QString formatMsg = style.formatMessage(type, QString::fromUtf8(msg.peerName.c_str()), QDateTime::fromTime_t(msg.sendTime), messageText, formatFlag);
QString messageText = RsHtml().formatText(NULL, QString::fromUtf8(msg.message.c_str()), formatTextFlag);
QString formatMsg = style.formatMessage(type, QString::fromUtf8(msg.peerName.c_str()), QDateTime::fromTime_t(msg.sendTime), messageText);
itemWidget->setData(Qt::DisplayRole, qVariantFromValue(IMHistoryItemPainter(formatMsg)));
itemWidget->setData(ROLE_MSGID, msg.msgId);