Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 05:39:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1105 from RetroPooh/smallfixes1

Browse source 
Smallfixes1
This commit is contained in:
csoler 2017-11-11 16:31:33 +01:00 • committed by GitHub
commit cb7724312e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,10 +32,10 @@
#include "RsAutoUpdatePage.h" #include "RsAutoUpdatePage.h"
#include "PopupDistantChatDialog.h" #include "PopupDistantChatDialog.h"
#define IMAGE_RED_LED ":/icons/bullet_red_64.png" #define IMAGE_RED_LED ":/icons/bullet_red_128.png"
#define IMAGE_YEL_LED ":/icons/bullet_yellow_64.png" #define IMAGE_YEL_LED ":/icons/bullet_yellow_128.png"
#define IMAGE_GRN_LED ":/icons/bullet_green_64.png" #define IMAGE_GRN_LED ":/icons/bullet_green_128.png"
#define IMAGE_GRY_LED ":/icons/bullet_grey_64.png" #define IMAGE_GRY_LED ":/icons/bullet_grey_128.png"
PopupDistantChatDialog::~PopupDistantChatDialog() PopupDistantChatDialog::~PopupDistantChatDialog()
{ {

2
retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp
View file

@ -285,7 +285,7 @@ void BwCtrlWindow::updateBandwidth()
std::string name = rsPeers->getPeerName(it->first); std::string name = rsPeers->getPeerName(it->first);
peer_item -> setData(COLUMN_PEERID, Qt::DisplayRole, QString::fromStdString(it->first.toStdString())); peer_item -> setData(COLUMN_PEERID, Qt::DisplayRole, QString::fromStdString(it->first.toStdString()));
peer_item -> setData(COLUMN_RSNAME, Qt::DisplayRole, QString::fromStdString(name)); peer_item -> setData(COLUMN_RSNAME, Qt::DisplayRole, QString::fromUtf8(name.c_str()));
peer_item -> setData(COLUMN_IN_RATE, Qt::DisplayRole, it->second.mRateIn); peer_item -> setData(COLUMN_IN_RATE, Qt::DisplayRole, it->second.mRateIn);
peer_item -> setData(COLUMN_IN_MAX, Qt::DisplayRole, it->second.mRateMaxIn); peer_item -> setData(COLUMN_IN_MAX, Qt::DisplayRole, it->second.mRateMaxIn);