[Qt] simplify ban list signal handling

Philip Kaufmann · jonasschnelli · commit cdd72cd5fbc2 · 2015-09-16T16:50:19.000+02:00
- remove banListChanged signal from client model
- directly call clientModel-&gt;getBanTableModel()-&gt;refresh() without the way
  over clientModel-&gt;updateBanlist()

- also fix clearing peer detail window, when selecting (clicking)
  peers in the ban list
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -217,7 +217,6 @@ QString ClientModel::formatClientStartupTime() const
 void ClientModel::updateBanlist()
 {
     banTableModel->refresh();
-    emit banListChanged();
 }
 
 // Handlers for core signals
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -91,7 +91,6 @@ class ClientModel : public QObject
     void numBlocksChanged(int count, const QDateTime& blockDate);
     void alertsChanged(const QString &warnings);
     void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
-    void banListChanged();
 
     //! Fired when a message should be reported to the user
     void message(const QString &title, const QString &message, unsigned int style);
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -331,8 +331,7 @@ void RPCConsole::setClientModel(ClientModel *model)
 {
     clientModel = model;
     ui->trafficGraph->setClientModel(model);
-    if(model)
-    {
+    if (model && clientModel->getPeerTableModel() && clientModel->getBanTableModel()) {
         // Keep up to date with client
         setNumConnections(model->getNumConnections());
         connect(model, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
@@ -404,19 +403,23 @@ void RPCConsole::setClientModel(ClientModel *model)
         ui->banlistWidget->setContextMenuPolicy(Qt::CustomContextMenu);
         ui->banlistWidget->horizontalHeader()->setStretchLastSection(true);
 
-        // ensure ban table is shown or hidden (if empty)
-        connect(model, SIGNAL(banListChanged()), this, SLOT(showOrHideBanTableIfRequired()));
-        showOrHideBanTableIfRequired();
-
-        // create banlist context menu actions
+        // create ban table context menu action
         QAction* unbanAction = new QAction(tr("&Unban Node"), this);
+
+        // create ban table context menu
         banTableContextMenu = new QMenu();
         banTableContextMenu->addAction(unbanAction);
 
-        // context menu signals
+        // ban table context menu signals
         connect(ui->banlistWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showBanTableContextMenu(const QPoint&)));
         connect(unbanAction, SIGNAL(triggered()), this, SLOT(unbanSelectedNode()));
 
+        // ban table signal handling - clear peer details when clicking a peer in the ban table
+        connect(ui->banlistWidget, SIGNAL(clicked(const QModelIndex&)), this, SLOT(clearSelectedNode()));
+        // ban table signal handling - ensure ban table is shown or hidden (if empty)
+        connect(model->getBanTableModel(), SIGNAL(layoutChanged()), this, SLOT(showOrHideBanTableIfRequired()));
+        showOrHideBanTableIfRequired();
+
         // Provide initial values
         ui->clientVersion->setText(model->formatFullVersion());
         ui->clientUserAgent->setText(model->formatSubVersion());
@@ -790,6 +793,9 @@ void RPCConsole::disconnectSelectedNode()
 
 void RPCConsole::banSelectedNode(int bantime)
 {
+    if (!clientModel)
+        return;
+
     // Get currently selected peer address
     QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address);
     // Find possible nodes, ban it and clear the selected node
@@ -803,23 +809,23 @@ void RPCConsole::banSelectedNode(int bantime)
         bannedNode->fDisconnect = true;
 
         clearSelectedNode();
-        ui->banlistWidget->setVisible(true);
-        ui->banHeading->setVisible(true);
-        clientModel->updateBanlist();
+        clientModel->getBanTableModel()->refresh();
     }
 }
 
 void RPCConsole::unbanSelectedNode()
 {
+    if (!clientModel)
+        return;
+
     // Get currently selected ban address
     QString strNode = GUIUtil::getEntryData(ui->banlistWidget, 0, BanTableModel::Address);
     CSubNet possibleSubnet(strNode.toStdString());
 
     if (possibleSubnet.IsValid())
     {
         CNode::Unban(possibleSubnet);
-        clientModel->updateBanlist();
-        showOrHideBanTableIfRequired();
+        clientModel->getBanTableModel()->refresh();
     }
 }
 
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
@@ -66,6 +66,8 @@ private Q_SLOTS:
     void showBanTableContextMenu(const QPoint& point);
     /** Hides ban table if no bans are present */
     void showOrHideBanTableIfRequired();
+    /** clear the selected node */
+    void clearSelectedNode();
 
 public Q_SLOTS:
     void clear();
@@ -100,8 +102,6 @@ public Q_SLOTS:
     void setTrafficGraphRange(int mins);
     /** show detailed information on ui about selected node */
     void updateNodeDetail(const CNodeCombinedStats *stats);
-    /** clear the selected node */
-    void clearSelectedNode();
 
     enum ColumnWidths
     {

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,6 @@ QString ClientModel::formatClientStartupTime() const`
`217`	`217`	`void ClientModel::updateBanlist()`
`218`	`218`	`{`
`219`	`219`	`banTableModel->refresh();`
`220`		`- emit banListChanged();`
`221`	`220`	`}`
`222`	`221`
`223`	`222`	`// Handlers for core signals`