mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-01 02:46:20 -05:00
Enabled on Private Chat to display for the status string smileys, when there is smiley codes used.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
cd8188bf09
commit
ed3fa92096
@ -1237,6 +1237,7 @@ void PopupChatDialog::updateStatus(const QString &peer_id, int status)
|
|||||||
void PopupChatDialog::updatePeersCustomStateString(const QString& peer_id, const QString& status_string)
|
void PopupChatDialog::updatePeersCustomStateString(const QString& peer_id, const QString& status_string)
|
||||||
{
|
{
|
||||||
std::string stdPeerId = peer_id.toStdString();
|
std::string stdPeerId = peer_id.toStdString();
|
||||||
|
QString status_text;
|
||||||
|
|
||||||
if (stdPeerId == dialogId) {
|
if (stdPeerId == dialogId) {
|
||||||
// the peers status string has changed
|
// the peers status string has changed
|
||||||
@ -1244,7 +1245,8 @@ void PopupChatDialog::updatePeersCustomStateString(const QString& peer_id, const
|
|||||||
ui.statusmessagelabel->hide();
|
ui.statusmessagelabel->hide();
|
||||||
} else {
|
} else {
|
||||||
ui.statusmessagelabel->show();
|
ui.statusmessagelabel->show();
|
||||||
ui.statusmessagelabel->setText(status_string);
|
status_text = RsHtml::formatText(QString(status_string), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS);
|
||||||
|
ui.statusmessagelabel->setText(status_text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user