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
This commit is contained in:
thunder2 2014-12-23 10:16:27 +00:00
parent 4bb15cd211
commit 7a562cfe9c
3 changed files with 3 additions and 3 deletions

View File

@ -393,7 +393,7 @@
</item>
<item>
<property name="text">
<string>Inon Size = 32x32</string>
<string>Icon Size = 32x32</string>
</property>
</item>
</widget>

View File

@ -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;

View File

@ -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);
}