From 7a562cfe9c016f3060d8ced9dcf5c28b5e33fb05 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Tue, 23 Dec 2014 10:16:27 +0000 Subject: [PATCH] Added patch from Henry - Fixed some typos - Fixed utf8 issue in DhtWindow git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7780 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/settings/AppearancePage.ui | 2 +- retroshare-gui/src/gui/statistics/DhtWindow.cpp | 2 +- retroshare-gui/src/gui/statusbar/ToasterDisable.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/settings/AppearancePage.ui b/retroshare-gui/src/gui/settings/AppearancePage.ui index cee522901..72385ae72 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.ui +++ b/retroshare-gui/src/gui/settings/AppearancePage.ui @@ -393,7 +393,7 @@ - Inon Size = 32x32 + Icon Size = 32x32 diff --git a/retroshare-gui/src/gui/statistics/DhtWindow.cpp b/retroshare-gui/src/gui/statistics/DhtWindow.cpp index b8ed18ae5..0331d4854 100644 --- a/retroshare-gui/src/gui/statistics/DhtWindow.cpp +++ b/retroshare-gui/src/gui/statistics/DhtWindow.cpp @@ -334,7 +334,7 @@ void DhtWindow::updateNetPeers() std::string name = rsPeers->getPeerName(*it); peer_item -> setData(PTW_COL_PEERID, Qt::DisplayRole, QString::fromStdString(status.mDhtId)); - peer_item -> setData(PTW_COL_RSNAME, Qt::DisplayRole, QString::fromStdString(name)); + peer_item -> setData(PTW_COL_RSNAME, Qt::DisplayRole, QString::fromUtf8(name.c_str())); peer_item -> setData(PTW_COL_RSID, Qt::DisplayRole, QString::fromStdString(status.mRsId.toStdString())); QString dhtstate; diff --git a/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp b/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp index 473b61c7e..3e17637c5 100644 --- a/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp +++ b/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp @@ -56,6 +56,6 @@ ToasterDisable::ToasterDisable(QWidget *parent) void ToasterDisable::disable(bool isDisable) { imageButton->setIcon(QIcon(isDisable ? IMAGE_TOASTERDISABLE : IMAGE_TOASTERENABLE)); - imageButton->setToolTip(isDisable ? tr("All Toasters are disable") : tr("Toasters are enable")); + imageButton->setToolTip(isDisable ? tr("All Toasters are disabled") : tr("Toasters are enabled")); imageButton->setChecked(isDisable); }