Skip to content

Commit

Permalink
[Qt] simplify ban list signal handling
Browse files Browse the repository at this point in the history
- remove banListChanged signal from client model
- directly call clientModel->getBanTableModel()->refresh() without the way
  over clientModel->updateBanlist()

- also fix clearing peer detail window, when selecting (clicking)
  peers in the ban list
  • Loading branch information
Philip Kaufmann authored and jonasschnelli committed Sep 16, 2015
1 parent 43c1f5b commit cdd72cd
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 17 deletions.
1 change: 0 additions & 1 deletion src/qt/clientmodel.cpp
Expand Up @@ -217,7 +217,6 @@ QString ClientModel::formatClientStartupTime() const
void ClientModel::updateBanlist()
{
banTableModel->refresh();
emit banListChanged();
}

// Handlers for core signals
Expand Down
1 change: 0 additions & 1 deletion src/qt/clientmodel.h
Expand Up @@ -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);
Expand Down
32 changes: 19 additions & 13 deletions src/qt/rpcconsole.cpp
Expand Up @@ -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)));
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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
Expand All @@ -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();
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/qt/rpcconsole.h
Expand Up @@ -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();
Expand Down Expand Up @@ -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
{
Expand Down

0 comments on commit cdd72cd

Please sign in to comment.