gui: add NodeID to the peer table

theuni · Fuzzbawls · commit 10969f6b1f27 · 2020-08-25T15:09:34.000-07:00
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -277,17 +277,17 @@ void copyEntryData(QAbstractItemView* view, int column, int role)
     }
 }
 
-QString getEntryData(QAbstractItemView *view, int column, int role)
+QVariant getEntryData(QAbstractItemView *view, int column, int role)
 {
     if (!view || !view->selectionModel())
-        return QString();
+        return QVariant();
     QModelIndexList selection = view->selectionModel()->selectedRows(column);
 
     if (!selection.isEmpty()) {
         // Return first item
-        return (selection.at(0).data(role).toString());
+        return (selection.at(0).data(role));
     }
-    return QString();
+    return QVariant();
 }
 
 QString getSaveFileName(QWidget* parent, const QString& caption, const QString& dir, const QString& filter, QString* selectedSuffixOut)
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -93,7 +93,7 @@ void copyEntryData(QAbstractItemView* view, int column, int role = Qt::EditRole)
        @param[in] role    Data role to extract from the model
        @see  TransactionView::copyLabel, TransactionView::copyAmount, TransactionView::copyAddress
      */
-QString getEntryData(QAbstractItemView *view, int column, int role);
+QVariant getEntryData(QAbstractItemView *view, int column, int role);
 
 void setClipboard(const QString& str);
 
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
@@ -26,7 +26,9 @@ bool NodeLessThan::operator()(const CNodeCombinedStats& left, const CNodeCombine
     if (order == Qt::DescendingOrder)
         std::swap(pLeft, pRight);
 
-    switch (column) {
+    switch(column) {
+    case PeerTableModel::NetNodeId:
+        return pLeft->nodeid < pRight->nodeid;
     case PeerTableModel::Address:
         return pLeft->addrName.compare(pRight->addrName) < 0;
     case PeerTableModel::Subversion:
@@ -113,7 +115,7 @@ PeerTableModel::PeerTableModel(ClientModel* parent) : QAbstractTableModel(parent
                                                       clientModel(parent),
                                                       timer(0)
 {
-    columns << tr("Address/Hostname") << tr("Version") << tr("Ping Time");
+    columns << tr("NodeID") << tr("Address/Hostname") << tr("Version") << tr("Ping Time");
     priv = new PeerTablePriv();
     // default to unsorted
     priv->sortColumn = -1;
@@ -158,7 +160,9 @@ QVariant PeerTableModel::data(const QModelIndex& index, int role) const
     CNodeCombinedStats* rec = static_cast<CNodeCombinedStats*>(index.internalPointer());
 
     if (role == Qt::DisplayRole) {
-        switch (index.column()) {
+        switch(index.column()) {
+        case NetNodeId:
+            return rec->nodeStats.nodeid;
         case Address:
             return QString::fromStdString(rec->nodeStats.addrName);
         case Subversion:
diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h
@@ -52,9 +52,10 @@ class PeerTableModel : public QAbstractTableModel
     void stopAutoRefresh();
 
     enum ColumnIndex {
-        Address = 0,
-        Subversion = 1,
-        Ping = 2
+        NetNodeId = 0,
+        Address = 1,
+        Subversion = 2,
+        Ping = 3
     };
 
     /** @name Methods overridden from QAbstractTableModel
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -985,7 +985,7 @@ void RPCConsole::showBanTableContextMenu(const QPoint& point)
 void RPCConsole::disconnectSelectedNode()
 {
     // Get currently selected peer address
-    QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address);
+    QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address).toString();
     // Find the node, disconnect it and clear the selected node
     if (CNode *bannedNode = FindNode(strNode.toStdString())) {
         bannedNode->CloseSocketDisconnect();
@@ -999,7 +999,7 @@ void RPCConsole::banSelectedNode(int bantime)
         return;
 
     // Get currently selected peer address
-    QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address);
+    QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address).toString();
     // Find possible nodes, ban it and clear the selected node
     if (FindNode(strNode.toStdString())) {
         std::string nStr = strNode.toStdString();
@@ -1023,7 +1023,7 @@ void RPCConsole::unbanSelectedNode()
         return;
 
     // Get currently selected ban address
-    QString strNode = GUIUtil::getEntryData(ui->banlistWidget, 0, BanTableModel::Address);
+    QString strNode = GUIUtil::getEntryData(ui->banlistWidget, 0, BanTableModel::Address).toString();
     CSubNet possibleSubnet;
 
     LookupSubNet(strNode.toStdString().c_str(), possibleSubnet);

Original file line number	Diff line number	Diff line change
`@@ -277,17 +277,17 @@ void copyEntryData(QAbstractItemView* view, int column, int role)`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`
`280`		`-QString getEntryData(QAbstractItemView *view, int column, int role)`
	`280`	`+QVariant getEntryData(QAbstractItemView *view, int column, int role)`
`281`	`281`	`{`
`282`	`282`	`if (!view \|\| !view->selectionModel())`
`283`		`- return QString();`
	`283`	`+ return QVariant();`
`284`	`284`	`QModelIndexList selection = view->selectionModel()->selectedRows(column);`
`285`	`285`
`286`	`286`	`if (!selection.isEmpty()) {`
`287`	`287`	`// Return first item`
`288`		`- return (selection.at(0).data(role).toString());`
	`288`	`+ return (selection.at(0).data(role));`
`289`	`289`	`}`
`290`		`- return QString();`
	`290`	`+ return QVariant();`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`QString getSaveFileName(QWidget* parent, const QString& caption, const QString& dir, const QString& filter, QString* selectedSuffixOut)`