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

Fixed shown name in chat list.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4810 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-01-18 00:32:15 +00:00
parent df741f7c64
commit 1ec716175b
8 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -147,12 +147,15 @@ ChatWidget::~ChatWidget()
delete ui;
}
void ChatWidget::init(const std::string &peerId, const QString &peerName)
void ChatWidget::init(const std::string &peerId, const QString &title)
{
this->peerId = peerId;
this->peerName = peerName;
this->title = title;
ui->friendnamelabel->setText(peerName);
ui->friendnamelabel->setText(title);
std::string ownId = rsPeers->getOwnId();
setName(QString::fromUtf8(rsPeers->getPeerName(ownId).c_str()));
ChatLobbyId lid;
if (rsMsgs->isLobbyId(peerId, lid)) {
@ -400,15 +403,13 @@ void ChatWidget::sendChat()
return;
}
std::string ownId = rsPeers->getOwnId();
#ifdef CHAT_DEBUG
std::cout << "ChatWidget:sendChat " << std::endl;
#endif
if (rsMsgs->sendPrivateChat(peerId, msg)) {
QDateTime currentTime = QDateTime::currentDateTime();
addChatMsg(false, QString::fromUtf8(rsPeers->getPeerName(ownId).c_str()), currentTime, currentTime, QString::fromStdWString(msg), TYPE_NORMAL);
addChatMsg(false, name, currentTime, currentTime, QString::fromStdWString(msg), TYPE_NORMAL);
}
chatWidget->clear();
@ -562,9 +563,8 @@ void ChatWidget::fileHashingFinished(QList<HashedFile> hashedFiles)
std::wstring msg = textBrowser.toHtml().toStdWString();
if (rsMsgs->sendPrivateChat(peerId, msg)) {
std::string ownId = rsPeers->getOwnId();
QDateTime currentTime = QDateTime::currentDateTime();
addChatMsg(false, QString::fromUtf8(rsPeers->getPeerName(ownId).c_str()), currentTime, currentTime, QString::fromStdWString(msg), TYPE_NORMAL);
addChatMsg(false, name, currentTime, currentTime, QString::fromStdWString(msg), TYPE_NORMAL);
}
}
@ -608,6 +608,8 @@ void ChatWidget::updateStatus(const QString &peer_id, int status)
if (peer_id.toStdString() == peerId) {
// the peers status has changed
QString peerName = QString::fromUtf8(rsPeers->getPeerName(peerId).c_str());
switch (status) {
case RS_STATUS_OFFLINE:
ui->infoframe->setVisible(true);
@ -678,6 +680,11 @@ void ChatWidget::updateStatusString(const QString &statusMask, const QString &st
QTimer::singleShot(5000, this, SLOT(resetStatusBar())) ;
}
void ChatWidget::setName(const QString &name)
{
this->name = name;
}
bool ChatWidget::setStyle()
{
if (style.showDialog(window())) {