mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
fixed back my wrong commit
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4193 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
cf585b3ce0
commit
dd457e15c7
@ -58,7 +58,7 @@ ForumMsgItem::ForumMsgItem(FeedHolder *parent, uint32_t feedId, const std::strin
|
|||||||
connect( unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeForum ( void ) ) );
|
connect( unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeForum ( void ) ) );
|
||||||
connect( replyButton, SIGNAL( clicked( void ) ), this, SLOT( replyToPost ( void ) ) );
|
connect( replyButton, SIGNAL( clicked( void ) ), this, SLOT( replyToPost ( void ) ) );
|
||||||
connect( sendButton, SIGNAL( clicked( ) ), this, SLOT( sendMsg() ) );
|
connect( sendButton, SIGNAL( clicked( ) ), this, SLOT( sendMsg() ) );
|
||||||
|
|
||||||
connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(const QString&)), this, SLOT(updateAvatar(const QString&)));
|
connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(const QString&)), this, SLOT(updateAvatar(const QString&)));
|
||||||
|
|
||||||
subjectLabel->setMinimumWidth(20);
|
subjectLabel->setMinimumWidth(20);
|
||||||
@ -146,7 +146,9 @@ void ForumMsgItem::updateItemStatic()
|
|||||||
|
|
||||||
if (rsPeers->getPeerName(msg.srcId) !="")
|
if (rsPeers->getPeerName(msg.srcId) !="")
|
||||||
{
|
{
|
||||||
namelabel->setText(QString::fromStdString(rsPeers->getPeerName(msg.srcId)));
|
RetroShareLink linkMessage;
|
||||||
|
linkMessage.createMessage(msg.srcId, "");
|
||||||
|
namelabel->setText(linkMessage.toHtml());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -159,7 +161,7 @@ void ForumMsgItem::updateItemStatic()
|
|||||||
QDateTime qtime;
|
QDateTime qtime;
|
||||||
qtime.setTime_t(msg.ts);
|
qtime.setTime_t(msg.ts);
|
||||||
QString timestamp = qtime.toString("dd.MMMM yyyy hh:mm");
|
QString timestamp = qtime.toString("dd.MMMM yyyy hh:mm");
|
||||||
timestamplabel->setText(timestamp);
|
timestamplabel->setText(timestamp);
|
||||||
|
|
||||||
nextFrame->hide();
|
nextFrame->hide();
|
||||||
}
|
}
|
||||||
@ -169,7 +171,9 @@ void ForumMsgItem::updateItemStatic()
|
|||||||
|
|
||||||
if (rsPeers->getPeerName(msg.srcId) !="")
|
if (rsPeers->getPeerName(msg.srcId) !="")
|
||||||
{
|
{
|
||||||
nextnamelabel->setText(QString::fromStdString(rsPeers->getPeerName(msg.srcId)));
|
RetroShareLink linkMessage;
|
||||||
|
linkMessage.createMessage(msg.srcId, "");
|
||||||
|
nextnamelabel->setText(linkMessage.toHtml());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -198,7 +202,9 @@ void ForumMsgItem::updateItemStatic()
|
|||||||
|
|
||||||
if (rsPeers->getPeerName(msgParent.srcId) !="")
|
if (rsPeers->getPeerName(msgParent.srcId) !="")
|
||||||
{
|
{
|
||||||
namelabel->setText(QString::fromStdString(rsPeers->getPeerName(msgParent.srcId)));
|
RetroShareLink linkMessage;
|
||||||
|
linkMessage.createMessage(msgParent.srcId, "");
|
||||||
|
namelabel->setText(linkMessage.toHtml());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user