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

Merge branch 'master' into gxs_mail_experiments

Browse source
This commit is contained in:
Gioacchino Mazzurco 2017-03-13 22:57:33 +01:00
commit 2630ed4573
223 changed files with 123466 additions and 98194 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -1609,7 +1609,7 @@ void ChatWidget::updateStatus(const QString &peer_id, int status)
switch (status) {
case RS_STATUS_OFFLINE:
ui->infoFrame->setVisible(true);
ui->infoLabel->setText(peerName + " " + tr("appears to be Offline.") +"\n" + tr("Messages you send will be delivered after Friend is again Online"));
ui->infoLabel->setText(peerName + " " + tr("appears to be Offline.") +"\n" + tr("Messages you send will be delivered after Friend is again Online."));
break;
case RS_STATUS_INACTIVE:
@ -1727,9 +1727,9 @@ void ChatWidget::quote()
if(text.length() > 0)
{
QStringList sl = text.split(QRegExp("[\r\n]"),QString::SkipEmptyParts);
text = sl.join("\n>");
text.replace(QChar(-4),"");//Char used when image on text.
emit ui->chatTextEdit->append(QString(">") + text);
text = sl.join("\n> ");
text.replace(QChar(-4)," ");//Char used when image on text.
emit ui->chatTextEdit->append(QString("> ") + text);
}
}