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

added tooltip to show identity ID in distant chat dialog

Browse Source
This commit is contained in:
csoler 2018-09-24 20:55:27 +02:00
parent 5eda5a5bcb
commit 57577472fc
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
6 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/chat/ChatDialog.cpp
View File

@ -311,10 +311,13 @@ bool ChatDialog::hasNewMessages()
return false; return false;
} }
QString ChatDialog::getPeerName(const ChatId& id) const QString ChatDialog::getPeerName(const ChatId& id, QString& additional_info) const
{ {
if(id.isPeerId()) if(id.isPeerId())
{
additional_info = QString("Peer ID: ")+QString::fromStdString(id.toPeerId().toStdString());
return QString::fromUtf8(rsPeers->getPeerName(id.toPeerId()).c_str()) ; return QString::fromUtf8(rsPeers->getPeerName(id.toPeerId()).c_str()) ;
}
else else
return "ChatDialog::getPeerName(): invalid id type passed (RsPeerId is required). This is a bug."; return "ChatDialog::getPeerName(): invalid id type passed (RsPeerId is required). This is a bug.";
} }

2
retroshare-gui/src/gui/chat/ChatDialog.h
View File

@ -81,7 +81,7 @@ protected:
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event);
virtual bool canClose() { return true; } virtual bool canClose() { return true; }
virtual QString getPeerName(const ChatId &sslid) const ; // can be overloaded for chat dialogs that have specific peers virtual QString getPeerName(const ChatId &sslid,QString& additional_info) const ; // can be overloaded for chat dialogs that have specific peers
virtual QString getOwnName() const; virtual QString getOwnName() const;
virtual void init(const ChatId &id, const QString &title); virtual void init(const ChatId &id, const QString &title);

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

@ -1702,22 +1702,34 @@ void ChatWidget::updateStatus(const QString &peer_id, int status)
{ {
// the peers status has changed // the peers status has changed
QString tooltip_info ;
QString peerName ; QString peerName ;
if(chatId.isDistantChatId()) if(chatId.isDistantChatId())
{ {
DistantChatPeerInfo dcpinfo ; DistantChatPeerInfo dcpinfo ;
RsIdentityDetails details ; RsIdentityDetails details ;
if(rsMsgs->getDistantChatStatus(chatId.toDistantChatId(),dcpinfo)) if(rsMsgs->getDistantChatStatus(chatId.toDistantChatId(),dcpinfo))
{
if(rsIdentity->getIdDetails(dcpinfo.to_id,details)) if(rsIdentity->getIdDetails(dcpinfo.to_id,details))
peerName = QString::fromUtf8( details.mNickname.c_str() ) ; peerName = QString::fromUtf8( details.mNickname.c_str() ) ;
else else
peerName = QString::fromStdString(dcpinfo.to_id.toStdString()) ; peerName = QString::fromStdString(dcpinfo.to_id.toStdString()) ;
else
peerName = QString::fromStdString(chatId.toDistantChatId().toStdString()) ; tooltip_info = QString("Identity Id: ")+QString::fromStdString(dcpinfo.to_id.toStdString());
} }
else else
{
peerName = QString::fromStdString(chatId.toDistantChatId().toStdString()) ;
tooltip_info = QString("Identity Id: unknown (bug?)");
}
}
else
{
peerName = QString::fromUtf8(rsPeers->getPeerName(chatId.toPeerId()).c_str()); peerName = QString::fromUtf8(rsPeers->getPeerName(chatId.toPeerId()).c_str());
tooltip_info = QString("Peer Id: ") + QString::fromStdString(chatId.toPeerId().toStdString());
}
// is scrollbar at the end? // is scrollbar at the end?
QScrollBar *scrollbar = ui->textBrowser->verticalScrollBar(); QScrollBar *scrollbar = ui->textBrowser->verticalScrollBar();
@ -1750,6 +1762,7 @@ void ChatWidget::updateStatus(const QString &peer_id, int status)
} }
ui->titleLabel->setText(peerName); ui->titleLabel->setText(peerName);
ui->titleLabel->setToolTip(tooltip_info);
ui->statusLabel->setText(QString("(%1)").arg(StatusDefs::name(status))); ui->statusLabel->setText(QString("(%1)").arg(StatusDefs::name(status)));
peerStatus = status; peerStatus = status;

7
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View File

@ -118,8 +118,10 @@ void PopupChatDialog::showDialog(uint chatflags)
// //
void PopupChatDialog::chatStatusChanged(const ChatId &chat_id, const QString& statusString) void PopupChatDialog::chatStatusChanged(const ChatId &chat_id, const QString& statusString)
{ {
QString additional_info ;
if (mChatId.isSameEndpoint(chat_id)) { if (mChatId.isSameEndpoint(chat_id)) {
ui.chatWidget->updateStatusString(getPeerName(chat_id) + " %1", statusString); ui.chatWidget->updateStatusString(getPeerName(chat_id,additional_info) + " %1", statusString);
} }
} }
@ -129,8 +131,9 @@ void PopupChatDialog::addChatMsg(const ChatMessage &msg)
if (cw) { if (cw) {
QDateTime sendTime = QDateTime::fromTime_t(msg.sendTime); QDateTime sendTime = QDateTime::fromTime_t(msg.sendTime);
QDateTime recvTime = QDateTime::fromTime_t(msg.recvTime); QDateTime recvTime = QDateTime::fromTime_t(msg.recvTime);
QString additional_info ;
QString message = QString::fromUtf8(msg.msg.c_str()); QString message = QString::fromUtf8(msg.msg.c_str());
QString name = msg.incoming? getPeerName(msg.chat_id): getOwnName(); QString name = msg.incoming? getPeerName(msg.chat_id,additional_info): getOwnName();
cw->addChatMsg(msg.incoming, name, sendTime, recvTime, message, ChatWidget::MSGTYPE_NORMAL); cw->addChatMsg(msg.incoming, name, sendTime, recvTime, message, ChatWidget::MSGTYPE_NORMAL);
} }

4
retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp
View File

@ -181,12 +181,14 @@ void PopupDistantChatDialog::closeEvent(QCloseEvent *e)
PopupChatDialog::closeEvent(e) ; PopupChatDialog::closeEvent(e) ;
} }
QString PopupDistantChatDialog::getPeerName(const ChatId& /*id*/) const QString PopupDistantChatDialog::getPeerName(const ChatId& /*id*/, QString& additional_info) const
{ {
DistantChatPeerInfo tinfo; DistantChatPeerInfo tinfo;
rsMsgs->getDistantChatStatus(_tunnel_id,tinfo) ; rsMsgs->getDistantChatStatus(_tunnel_id,tinfo) ;
additional_info = QString("Identity ID: ") + QString::fromStdString(tinfo.to_id.toStdString());
RsIdentityDetails details ; RsIdentityDetails details ;
if(rsIdentity->getIdDetails(tinfo.to_id,details)) if(rsIdentity->getIdDetails(tinfo.to_id,details))
return QString::fromUtf8( details.mNickname.c_str() ) ; return QString::fromUtf8( details.mNickname.c_str() ) ;

2
retroshare-gui/src/gui/chat/PopupDistantChatDialog.h
View File

@ -41,7 +41,7 @@ class PopupDistantChatDialog: public PopupChatDialog
virtual void init(const ChatId& chat_id, const QString &title); virtual void init(const ChatId& chat_id, const QString &title);
virtual void closeEvent(QCloseEvent *e) ; virtual void closeEvent(QCloseEvent *e) ;
virtual QString getPeerName(const ChatId &id) const ; virtual QString getPeerName(const ChatId &id, QString& additional_info) const ;
virtual QString getOwnName() const; virtual QString getOwnName() const;
protected slots: protected slots: