Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-13 23:58:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2042 from csoler/v0.6-ImprovedGUI

Browse source 
V0.6 improved gui
This commit is contained in:
csoler 2020-08-18 23:25:51 +02:00 • committed by GitHub
commit a7db89a9ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 1088 additions and 1014 deletions
Download patch file Download diff file Expand all files Collapse all files

9
retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp
View file

@ -26,6 +26,7 @@
#include <unistd.h>
#include "gui/common/FilesDefs.h"
#include <retroshare/rsstatus.h>
#include <retroshare/rspeers.h>
#include <retroshare/rsidentity.h>
@ -113,7 +114,7 @@ void PopupDistantChatDialog::updateDisplay()
{
case RS_DISTANT_CHAT_STATUS_UNKNOWN:
_status_label->setIcon(QIcon(IMAGE_GRY_LED));
_status_label->setIcon(FilesDefs::getIconFromQtResourcePath(IMAGE_GRY_LED));
msg = tr("Remote status unknown.");
_status_label->setToolTip(msg);
getChatWidget()->updateStatusString("%1", msg, true);
@ -124,7 +125,7 @@ void PopupDistantChatDialog::updateDisplay()
break ;
case RS_DISTANT_CHAT_STATUS_REMOTELY_CLOSED:
std::cerr << "Chat remotely closed. " << std::endl;
_status_label->setIcon(QIcon(IMAGE_RED_LED));
_status_label->setIcon(FilesDefs::getIconFromQtResourcePath(IMAGE_RED_LED));
_status_label->setToolTip( QObject::tr("Distant peer has closed the chat") );
getChatWidget()->updateStatusString("%1", tr( "Your partner closed the conversation." ), true );
@ -135,7 +136,7 @@ void PopupDistantChatDialog::updateDisplay()
case RS_DISTANT_CHAT_STATUS_TUNNEL_DN:
_status_label->setIcon(QIcon(IMAGE_YEL_LED));
_status_label->setIcon(FilesDefs::getIconFromQtResourcePath(IMAGE_YEL_LED));
msg = QObject::tr( "Tunnel is pending");
if(tinfo.pending_items > 0)
@ -148,7 +149,7 @@ void PopupDistantChatDialog::updateDisplay()
break;
case RS_DISTANT_CHAT_STATUS_CAN_TALK:
_status_label->setIcon(QIcon(IMAGE_GRN_LED));
_status_label->setIcon(FilesDefs::getIconFromQtResourcePath(IMAGE_GRN_LED));
msg = QObject::tr( "End-to-end encrypted conversation established");
_status_label->setToolTip(msg);
getChatWidget()->unblockSending();