Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-08 14:42:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug when the user clicks on a link without http:// in a QTextBrowser. This link was opened directly in RetroShare.

Browse source 
Show clickable links in the channel feed message.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4923 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-02-11 13:42:42 +00:00
parent 6a44342e4f
commit 340a313fea
11 changed files with 78 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
View file

@ -29,6 +29,7 @@
#include "gui/notifyqt.h"
#include "util/misc.h"
#include "gui/RetroShareLink.h"
#include "gui/chat/HandleRichText.h"
#include <retroshare/rschannels.h>
@ -125,7 +126,7 @@ void ChanMsgItem::updateItemStatic()
{
/* subject */
titleLabel->setText(QString::fromStdWString(cmi.subject));
subjectLabel->setText(QString::fromStdWString(cmi.msg));
subjectLabel->setText(RsHtml::formatText(QString::fromStdWString(cmi.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
/* disable buttons: deletion facility not enabled with cache services yet */
clearButton->setEnabled(false);
@ -162,7 +163,7 @@ void ChanMsgItem::updateItemStatic()
}
}
msgLabel->setText(QString::fromStdWString(cmi.msg));
msgLabel->setText(RsHtml::formatText(QString::fromStdWString(cmi.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
msgWidget->setVisible(!cmi.msg.empty());
QDateTime qtime;