qt: Rework RPCConsole::clearSelectedNode()

hebasto · hebasto · commit ab070cf39a67 · 2020-11-28T22:30:58.000+02:00
Only successfully disconnected peers are deselected from the selection.
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -647,7 +647,7 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
         connect(unbanAction, &QAction::triggered, this, &RPCConsole::unbanSelectedNode);
 
         // ban table signal handling - clear peer details when clicking a peer in the ban table
-        connect(ui->banlistWidget, &QTableView::clicked, this, &RPCConsole::clearSelectedNode);
+        connect(ui->banlistWidget, &QTableView::clicked, ui->peerWidget->selectionModel(), &QItemSelectionModel::clearSelection);
         // ban table signal handling - ensure ban table is shown or hidden (if empty)
         connect(model->getBanTableModel(), &BanTableModel::layoutChanged, this, &RPCConsole::showOrHideBanTableIfRequired);
         showOrHideBanTableIfRequired();
@@ -1124,8 +1124,9 @@ void RPCConsole::disconnectSelectedNode()
         // Get currently selected peer address
         NodeId id = nodes.at(i).data().toLongLong();
         // Find the node, disconnect it and clear the selected node
-        if(m_node.disconnectById(id))
-            clearSelectedNode();
+        if (m_node.disconnectById(id)) {
+            clearSelectedNode(nodes.at(i));
+        }
     }
 }
 
@@ -1149,10 +1150,11 @@ void RPCConsole::banSelectedNode(int bantime)
         const CNodeCombinedStats *stats = clientModel->getPeerTableModel()->getNodeStats(detailNodeRow);
         if (stats) {
             m_node.ban(stats->nodeStats.addr, bantime);
-            m_node.disconnectByAddress(stats->nodeStats.addr);
+            if (m_node.disconnectByAddress(stats->nodeStats.addr)) {
+                clearSelectedNode(nodes.at(i));
+            }
         }
     }
-    clearSelectedNode();
     clientModel->getBanTableModel()->refresh();
 }
 
@@ -1177,11 +1179,10 @@ void RPCConsole::unbanSelectedNode()
     }
 }
 
-void RPCConsole::clearSelectedNode()
+void RPCConsole::clearSelectedNode(const QModelIndex& peer)
 {
-    ui->peerWidget->selectionModel()->clearSelection();
-    cachedNodeids.clear();
-    updateDetailWidget();
+    auto selection = ui->peerWidget->selectionModel();
+    selection->select(peer, QItemSelectionModel::Deselect | QItemSelectionModel::Rows);
 }
 
 void RPCConsole::showOrHideBanTableIfRequired()
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
@@ -94,7 +94,7 @@ private Q_SLOTS:
     /** Hides ban table if no bans are present */
     void showOrHideBanTableIfRequired();
     /** clear the selected node */
-    void clearSelectedNode();
+    void clearSelectedNode(const QModelIndex& peer);
     /** show detailed information on ui about selected node */
     void updateDetailWidget();
 

Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_`
`647`	`647`	`connect(unbanAction, &QAction::triggered, this, &RPCConsole::unbanSelectedNode);`
`648`	`648`
`649`	`649`	`// ban table signal handling - clear peer details when clicking a peer in the ban table`
`650`		`- connect(ui->banlistWidget, &QTableView::clicked, this, &RPCConsole::clearSelectedNode);`
	`650`	`+ connect(ui->banlistWidget, &QTableView::clicked, ui->peerWidget->selectionModel(), &QItemSelectionModel::clearSelection);`
`651`	`651`	`// ban table signal handling - ensure ban table is shown or hidden (if empty)`
`652`	`652`	`connect(model->getBanTableModel(), &BanTableModel::layoutChanged, this, &RPCConsole::showOrHideBanTableIfRequired);`
`653`	`653`	`showOrHideBanTableIfRequired();`
`@@ -1124,8 +1124,9 @@ void RPCConsole::disconnectSelectedNode()`
`1124`	`1124`	`// Get currently selected peer address`
`1125`	`1125`	`NodeId id = nodes.at(i).data().toLongLong();`
`1126`	`1126`	`// Find the node, disconnect it and clear the selected node`
`1127`		`- if(m_node.disconnectById(id))`
`1128`		`- clearSelectedNode();`
	`1127`	`+ if (m_node.disconnectById(id)) {`
	`1128`	`+ clearSelectedNode(nodes.at(i));`
	`1129`	`+ }`
`1129`	`1130`	`}`
`1130`	`1131`	`}`
`1131`	`1132`
`@@ -1149,10 +1150,11 @@ void RPCConsole::banSelectedNode(int bantime)`
`1149`	`1150`	`const CNodeCombinedStats *stats = clientModel->getPeerTableModel()->getNodeStats(detailNodeRow);`
`1150`	`1151`	`if (stats) {`
`1151`	`1152`	`m_node.ban(stats->nodeStats.addr, bantime);`
`1152`		`- m_node.disconnectByAddress(stats->nodeStats.addr);`
	`1153`	`+ if (m_node.disconnectByAddress(stats->nodeStats.addr)) {`
	`1154`	`+ clearSelectedNode(nodes.at(i));`
	`1155`	`+ }`
`1153`	`1156`	`}`
`1154`	`1157`	`}`
`1155`		`- clearSelectedNode();`
`1156`	`1158`	`clientModel->getBanTableModel()->refresh();`
`1157`	`1159`	`}`
`1158`	`1160`
`@@ -1177,11 +1179,10 @@ void RPCConsole::unbanSelectedNode()`
`1177`	`1179`	`}`
`1178`	`1180`	`}`
`1179`	`1181`
`1180`		`-void RPCConsole::clearSelectedNode()`
	`1182`	`+void RPCConsole::clearSelectedNode(const QModelIndex& peer)`
`1181`	`1183`	`{`
`1182`		`- ui->peerWidget->selectionModel()->clearSelection();`
`1183`		`- cachedNodeids.clear();`
`1184`		`- updateDetailWidget();`
	`1184`	`+ auto selection = ui->peerWidget->selectionModel();`
	`1185`	`+ selection->select(peer, QItemSelectionModel::Deselect \| QItemSelectionModel::Rows);`
`1185`	`1186`	`}`
`1186`	`1187`
`1187`	`1188`	`void RPCConsole::showOrHideBanTableIfRequired()`