Skip to content

Peers window Peer id improvements #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Peers window Peer id improvements #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b12165b
gui: rename "Peer Id" to "Peer" in tab column and details area
jonatack Apr 23, 2021
e14d79f
gui: center-align the entries in the peers tab "Peer" column
jonatack Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/qt/peertablemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const
assert(false);
} else if (role == Qt::TextAlignmentRole) {
switch (column) {
case NetNodeId:
case Address:
return {};
case NetNodeId:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In e14d79f

Why move the position of NetNodeId here? In the other areas of the code, NetNodeId always comes before Address in our switch statements. I don't think we should move it here.

You can keep it where it originally is and do:

Suggested change
case NetNodeId:
case NetNodeId:
return QVariant(Qt::AlignCenter);

Copy link
Member Author

@jonatack jonatack Apr 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally I prefer to propose the smaller, simpler diff. The order doesn't matter here and it seems better to group the cases by alignment.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not much of a difference, plus this makes it easier to reason about. You are explicitly stating that you are making it AlignCenter. I'd prefer we keep the same order as our other switch statements, but it's not a strong opinion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Always keeping the same order of enum elements in switch statement could decrease mental burden for some ppl :)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto, diff is only for "once" (for review), while people will read this switch multiple times in the future, so I'm also for same ordering.

case ConnectionType:
case Network:
return QVariant(Qt::AlignCenter);
Expand Down
2 changes: 1 addition & 1 deletion src/qt/peertablemodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public Q_SLOTS:

private:
interfaces::Node& m_node;
const QStringList columns{tr("Peer Id"), tr("Address"), tr("Type"), tr("Network"), tr("Ping"), tr("Sent"), tr("Received"), tr("User Agent")};
const QStringList columns{tr("Peer"), tr("Address"), tr("Type"), tr("Network"), tr("Ping"), tr("Sent"), tr("Received"), tr("User Agent")};
std::unique_ptr<PeerTablePriv> priv;
QTimer *timer;
};
Expand Down
2 changes: 1 addition & 1 deletion src/qt/rpcconsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@ void RPCConsole::updateDetailWidget()
const auto stats = selected_peers.first().data(PeerTableModel::StatsRole).value<CNodeCombinedStats*>();
// update the detail ui with latest node information
QString peerAddrDetails(QString::fromStdString(stats->nodeStats.addrName) + " ");
peerAddrDetails += tr("(peer id: %1)").arg(QString::number(stats->nodeStats.nodeid));
peerAddrDetails += tr("(peer: %1)").arg(QString::number(stats->nodeStats.nodeid));
if (!stats->nodeStats.addrLocal.empty())
peerAddrDetails += "<br />" + tr("via %1").arg(QString::fromStdString(stats->nodeStats.addrLocal));
ui->peerHeading->setText(peerAddrDetails);
Expand Down