Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2364 from PhenomRetroShare/Fix_ChatHistoryBrowser

Browse Source 
Fix Chat History Browser
This commit is contained in:
defnax 2021-03-05 21:30:29 +01:00 committed by GitHub
commit f0a2fa95ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -403,7 +403,7 @@ void ChatWidget::init(const ChatId &chat_id, const QString &title)
continue;
QString name;
if (chatId.isLobbyId() || chatId.isDistantChatId())
if (chatId.isLobbyId() || chatId.isDistantChatId() || chatId.isPeerId())
{
RsIdentityDetails details;

14
retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp
View File

@ -44,12 +44,8 @@
#define ROLE_PLAINTEXT Qt::UserRole + 1
ImHistoryBrowserCreateItemsThread::ImHistoryBrowserCreateItemsThread(ImHistoryBrowser *parent, const ChatId& peerId)
: QThread(parent)
{
m_chatId = peerId;
m_historyBrowser = parent;
stopped = false;
}
: QThread(parent), m_historyBrowser(parent), m_chatId(peerId), stopped(false)
{}
ImHistoryBrowserCreateItemsThread::~ImHistoryBrowserCreateItemsThread()
{
@ -285,10 +281,12 @@ void ImHistoryBrowser::fillItem(QListWidgetItem *itemWidget, HistoryMsg& msg)
QString name;
if (m_chatId.isLobbyId() || m_chatId.isDistantChatId()) {
RsIdentityDetails details;
if (rsIdentity->getIdDetails(RsGxsId(msg.peerName), details))
if (rsIdentity->getIdDetails(RsGxsId(msg.peerId), details))
name = QString::fromUtf8(details.mNickname.c_str());
else
else if(!msg.peerName.empty())
name = QString::fromUtf8(msg.peerName.c_str());
else
name = QString::fromUtf8(msg.peerId.toStdString().c_str());
} else {
name = QString::fromUtf8(msg.peerName.c_str());
}

10
retroshare-gui/src/util/HandleRichText.cpp
View File

@ -618,13 +618,13 @@ QString RsHtml::formatText(QTextDocument *textDocument, const QString &text, ulo
QString errorMsg; int errorLine; int errorColumn;
QDomDocument doc;
QDomDocument doc;
if (doc.setContent(formattedText, &errorMsg, &errorLine, &errorColumn) == false) {
// convert text with QTextBrowser
QTextBrowser textBrowser;
textBrowser.setText(text);
formattedText=textBrowser.toHtml();
// convert text with QTextDocument
QTextDocument textDoc;
textDoc.setPlainText(text);
formattedText=textDoc.toHtml();
formattedText.remove(0,formattedText.indexOf("<"));
formattedText=saveSpace(formattedText);
doc.setContent(formattedText, &errorMsg, &errorLine, &errorColumn);