Skip to content

Commit 656ac00

Browse files
committed
GUI: Peers: Update table column widths and labels
1 parent 727a2f8 commit 656ac00

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/qt/peertablemodel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public Q_SLOTS:
8989
const QStringList columns{
9090
/*: Title of Peers Table column which contains a
9191
unique number used to identify a connection. */
92-
tr("Peer"),
92+
tr("id"),
9393
/*: Title of Peers Table column which indicates the duration (length of time)
9494
since the peer connection started. */
9595
tr("Age"),
@@ -111,7 +111,7 @@ public Q_SLOTS:
111111
tr("Sent"),
112112
/*: Title of Peers Table column which indicates the total amount of
113113
network information we have received from the peer. */
114-
tr("Received"),
114+
tr("Recv'd"),
115115
/*: Title of Peers Table column which contains the peer's
116116
User Agent string. */
117117
tr("User Agent")};

src/qt/rpcconsole.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <QAbstractItemModel>
3131
#include <QDateTime>
3232
#include <QFont>
33+
#include <QFontMetrics>
3334
#include <QKeyEvent>
3435
#include <QKeySequence>
3536
#include <QLatin1String>
@@ -681,10 +682,18 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
681682
ui->peerWidget->setContextMenuPolicy(Qt::CustomContextMenu);
682683

683684
if (!ui->peerWidget->horizontalHeader()->restoreState(m_peer_widget_header_state)) {
685+
const QFontMetrics fm = ui->peerWidget->fontMetrics();
686+
ui->peerWidget->setColumnWidth(PeerTableModel::NetNodeId, GUIUtil::TextWidth(fm, QStringLiteral("99999")));
687+
ui->peerWidget->setColumnWidth(PeerTableModel::Age, GUIUtil::TextWidth(fm, GUIUtil::FormatPeerAge(std::chrono::hours{23976 /* 999 days */})));
684688
ui->peerWidget->setColumnWidth(PeerTableModel::Direction, DIRECTION_COLUMN_WIDTH);
685689
ui->peerWidget->setColumnWidth(PeerTableModel::Address, ADDRESS_COLUMN_WIDTH);
690+
ui->peerWidget->setColumnWidth(PeerTableModel::ConnectionType, GUIUtil::TextWidth(fm, GUIUtil::ConnectionTypeToQString(ConnectionType::ADDR_FETCH /* TODO: Find the WIDEST string? */, /*prepend_direction=*/false)));
691+
const auto bytesize_width = GUIUtil::TextWidth(fm, GUIUtil::formatBytes(999'000'000'000) + QStringLiteral("x"));
692+
ui->peerWidget->setColumnWidth(PeerTableModel::Network, GUIUtil::TextWidth(fm, qvariant_cast<QString>(model->peerTableSortProxy()->headerData(PeerTableModel::ColumnIndex::Network, Qt::Horizontal, Qt::DisplayRole)) /* TODO: Find the WIDEST string? */ + QStringLiteral("x")));
686693
ui->peerWidget->setColumnWidth(PeerTableModel::Subversion, SUBVERSION_COLUMN_WIDTH);
687694
ui->peerWidget->setColumnWidth(PeerTableModel::Ping, PING_COLUMN_WIDTH);
695+
ui->peerWidget->setColumnWidth(PeerTableModel::Sent, bytesize_width);
696+
ui->peerWidget->setColumnWidth(PeerTableModel::Received, bytesize_width);
688697
}
689698
ui->peerWidget->horizontalHeader()->setSectionResizeMode(PeerTableModel::Age, QHeaderView::ResizeToContents);
690699
ui->peerWidget->horizontalHeader()->setStretchLastSection(true);

0 commit comments

Comments
 (0)