Merge pull request #4629

ead6737 [Qt] format ping times in peers tab as ms (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-08-06 15:37:14 +02:00
commit 9db9257ac4
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 6 additions and 3 deletions

View file

@ -806,7 +806,7 @@ QString formatServicesStr(uint64_t mask)
QString formatPingTime(double dPingTime)
{
return dPingTime == 0 ? QObject::tr("N/A") : QString(QObject::tr("%1 s")).arg(QString::number(dPingTime, 'f', 3));
return dPingTime == 0 ? QObject::tr("N/A") : QString(QObject::tr("%1 ms")).arg(QString::number((int)(dPingTime * 1000), 10));
}
} // namespace GUIUtil

View file

@ -152,8 +152,7 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const
CNodeCombinedStats *rec = static_cast<CNodeCombinedStats*>(index.internalPointer());
if(role == Qt::DisplayRole)
{
if (role == Qt::DisplayRole) {
switch(index.column())
{
case Address:
@ -163,7 +162,11 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const
case Ping:
return GUIUtil::formatPingTime(rec->nodeStats.dPingTime);
}
} else if (role == Qt::TextAlignmentRole) {
if (index.column() == Ping)
return (int)(Qt::AlignRight | Qt::AlignVCenter);
}
return QVariant();
}