From fdb8dc568c8676f78dbf643d0b0d9a133d4ca5ea Mon Sep 17 00:00:00 2001 From: RetroPooh Date: Mon, 2 Apr 2018 19:38:56 +0300 Subject: [PATCH 1/2] fix unicode display for chat status --- retroshare-gui/src/gui/chat/ChatWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index 2859527cd..00b258d83 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -1791,7 +1791,7 @@ void ChatWidget::updatePeersCustomStateString(const QString& /*peer_id*/, const void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString, bool permanent) { - ui->typingLabel->setText(QString(statusMask).arg(tr(statusString.toUtf8()))); // displays info for 5 secs. + ui->typingLabel->setText(QString(statusMask).arg(trUtf8(statusString.toUtf8()))); // displays info for 5 secs. ui->typingPixmapLabel->setPixmap(QPixmap(":images/typing.png") ); if (statusString == "is typing...") { From 234b576f382ca49ae12ba0a032ef6a39f3f3f5f7 Mon Sep 17 00:00:00 2001 From: RetroPooh Date: Mon, 2 Apr 2018 19:43:21 +0300 Subject: [PATCH 2/2] change distant chat status indicator color to differ closed and pending --- retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp index f457e11d9..da662fcb6 100644 --- a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp @@ -135,7 +135,7 @@ void PopupDistantChatDialog::updateDisplay() break ; case RS_DISTANT_CHAT_STATUS_TUNNEL_DN: //std::cerr << "Tunnel asked. Waiting for reponse. " << std::endl; - _status_label->setIcon(QIcon(IMAGE_RED_LED)); + _status_label->setIcon(QIcon(IMAGE_YEL_LED)); msg = QObject::tr( "Tunnel is pending... Messages will be delivered as" " soon as possible" ); _status_label->setToolTip(msg);