Skip to content

Commit ff8afeb

Browse files
committed
gui: display Inbound in peer details, add bitcoin-core#162/bitcoin-core#163 release notes
1 parent 16b784d commit ff8afeb

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

doc/release-notes-162-163.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
GUI changes
2+
-----------
3+
4+
- The Peers window has a new sortable Network column and the peer details area
5+
has a new Network row, both of which display the type of network the peer is
6+
connected through: IPv4, IPv6, or Onion, along with the ability to display two
7+
potential future additions, I2P and CJDNS. (#162)
8+
9+
- In the Peers window, the NodeId and Node/Service column headers are renamed to
10+
Peer Id and Address, respectively. (#162)
11+
12+
- In the Peers window, the Direction field in the peer details area is replaced
13+
by a Connection Type field that displays both the direction and the type of
14+
peer connection. For more info, place the cursor over the field to see the
15+
detailed tooltip. (#163)

src/qt/guiutil.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,10 +766,10 @@ QString NetworkToQString(Network net)
766766
assert(false);
767767
}
768768

769-
QString ConnectionTypeToQString(ConnectionType conn_type, bool relay_txes)
769+
QString ConnectionTypeToQString(ConnectionType conn_type)
770770
{
771771
switch (conn_type) {
772-
case ConnectionType::INBOUND: return relay_txes ? QObject::tr("Inbound Full Relay") : QObject::tr("Inbound Block Relay");
772+
case ConnectionType::INBOUND: return QObject::tr("Inbound");
773773
case ConnectionType::OUTBOUND_FULL_RELAY: return QObject::tr("Outbound Full Relay");
774774
case ConnectionType::BLOCK_RELAY: return QObject::tr("Outbound Block Relay");
775775
case ConnectionType::MANUAL: return QObject::tr("Outbound Manual");

src/qt/guiutil.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ namespace GUIUtil
233233
QString NetworkToQString(Network net);
234234

235235
/** Convert enum ConnectionType to QString */
236-
QString ConnectionTypeToQString(ConnectionType conn_type, bool relay_txes);
236+
QString ConnectionTypeToQString(ConnectionType conn_type);
237237

238238
/** Convert seconds into a QString with days, hours, mins, secs */
239239
QString formatDurationStr(int secs);

src/qt/rpcconsole.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformSty
462462

463463
constexpr QChar nonbreaking_hyphen(8209);
464464
const std::vector<QString> CONNECTION_TYPE_DOC{
465-
tr("Inbound Full/Block Relay: initiated by peer"),
465+
tr("Inbound: initiated by peer"),
466466
tr("Outbound Full Relay: default"),
467467
tr("Outbound Block Relay: does not relay transactions or addresses"),
468468
tr("Outbound Manual: added using RPC %1 or %2/%3 configuration options")
@@ -1120,7 +1120,7 @@ void RPCConsole::updateDetailWidget()
11201120
ui->timeoffset->setText(GUIUtil::formatTimeOffset(stats->nodeStats.nTimeOffset));
11211121
ui->peerVersion->setText(QString::number(stats->nodeStats.nVersion));
11221122
ui->peerSubversion->setText(QString::fromStdString(stats->nodeStats.cleanSubVer));
1123-
ui->peerConnectionType->setText(GUIUtil::ConnectionTypeToQString(stats->nodeStats.m_conn_type, stats->nodeStats.fRelayTxes));
1123+
ui->peerConnectionType->setText(GUIUtil::ConnectionTypeToQString(stats->nodeStats.m_conn_type));
11241124
ui->peerNetwork->setText(GUIUtil::NetworkToQString(stats->nodeStats.m_network));
11251125
if (stats->nodeStats.m_permissionFlags == PF_NONE) {
11261126
ui->peerPermissions->setText(tr("N/A"));

0 commit comments

Comments
 (0)