gui: add NodeID to the peer table

theuni · theuni · commit 531214fb100c · 2016-09-08T12:03:22.000-04:00
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -291,17 +291,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,
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -70,7 +70,7 @@ namespace GUIUtil
        @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
@@ -24,6 +24,8 @@ bool NodeLessThan::operator()(const CNodeCombinedStats &left, const CNodeCombine
 
     switch(column)
     {
+    case PeerTableModel::NetNodeId:
+        return pLeft->nodeid < pRight->nodeid;
     case PeerTableModel::Address:
         return pLeft->addrName.compare(pRight->addrName) < 0;
     case PeerTableModel::Subversion:
@@ -114,7 +116,7 @@ PeerTableModel::PeerTableModel(ClientModel *parent) :
     clientModel(parent),
     timer(0)
 {
-    columns << tr("Node/Service") << tr("User Agent") << tr("Ping Time");
+    columns << tr("NodeId") << tr("Node/Service") << tr("User Agent") << tr("Ping Time");
     priv = new PeerTablePriv();
     // default to unsorted
     priv->sortColumn = -1;
@@ -160,6 +162,8 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const
     if (role == Qt::DisplayRole) {
         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
@@ -877,7 +877,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->fDisconnect = true;
@@ -891,7 +891,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();
@@ -915,7 +915,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
`@@ -291,17 +291,17 @@ void copyEntryData(QAbstractItemView *view, int column, int role)`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
`294`		`-QString getEntryData(QAbstractItemView *view, int column, int role)`
	`294`	`+QVariant getEntryData(QAbstractItemView *view, int column, int role)`
`295`	`295`	`{`
`296`	`296`	`if(!view \|\| !view->selectionModel())`
`297`		`- return QString();`
	`297`	`+ return QVariant();`
`298`	`298`	`QModelIndexList selection = view->selectionModel()->selectedRows(column);`
`299`	`299`
`300`	`300`	`if(!selection.isEmpty()) {`
`301`	`301`	`// Return first item`
`302`		`- return (selection.at(0).data(role).toString());`
	`302`	`+ return (selection.at(0).data(role));`
`303`	`303`	`}`
`304`		`- return QString();`
	`304`	`+ return QVariant();`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`QString getSaveFileName(QWidget *parent, const QString &caption, const QString &dir,`