neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Qt] polish ban table

Browse Source
This commit is contained in:
Philip Kaufmann 2015-06-23 21:10:42 +02:00 committed by Jonas Schnelli
parent 607809f037
commit 9e521c1735
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qt/bantablemodel.cpp
View File

@ -56,12 +56,11 @@ public:
CCombinedBan *index(int idx) CCombinedBan *index(int idx)
{ {
if(idx >= 0 && idx < cachedBanlist.size()) { if (idx >= 0 && idx < cachedBanlist.size())
return &cachedBanlist[idx]; return &cachedBanlist[idx];
} else {
return 0; return 0;
} }
}
}; };
BanTableModel::BanTableModel(ClientModel *parent) : BanTableModel::BanTableModel(ClientModel *parent) :
@ -124,7 +123,7 @@ QVariant BanTableModel::data(const QModelIndex &index, int role) const
} }
} else if (role == Qt::TextAlignmentRole) { } else if (role == Qt::TextAlignmentRole) {
if (index.column() == Bantime) if (index.column() == Bantime)
return (int)(Qt::AlignRight | Qt::AlignVCenter); return (QVariant)(Qt::AlignRight | Qt::AlignVCenter);
} }
return QVariant(); return QVariant();
@ -157,14 +156,9 @@ QModelIndex BanTableModel::index(int row, int column, const QModelIndex &parent)
CCombinedBan *data = priv->index(row); CCombinedBan *data = priv->index(row);
if (data) if (data)
{
return createIndex(row, column, data); return createIndex(row, column, data);
}
else
{
return QModelIndex(); return QModelIndex();
} }
}
void BanTableModel::refresh() void BanTableModel::refresh()
{ {

2
src/qt/clientmodel.cpp
View File

@ -246,7 +246,7 @@ static void NotifyAlertChanged(ClientModel *clientmodel, const uint256 &hash, Ch
static void BannedListChanged(ClientModel *clientmodel) static void BannedListChanged(ClientModel *clientmodel)
{ {
qDebug() << "BannedListChanged"; qDebug() << QString("%1: Requesting update for peer banlist").arg(__func__);
QMetaObject::invokeMethod(clientmodel, "updateBanlist", Qt::QueuedConnection); QMetaObject::invokeMethod(clientmodel, "updateBanlist", Qt::QueuedConnection);
} }

14
src/qt/rpcconsole.cpp
View File

@ -5,6 +5,7 @@
#include "rpcconsole.h" #include "rpcconsole.h"
#include "ui_rpcconsole.h" #include "ui_rpcconsole.h"
#include "bantablemodel.h"
#include "clientmodel.h" #include "clientmodel.h"
#include "guiutil.h" #include "guiutil.h"
#include "platformstyle.h" #include "platformstyle.h"
@ -373,9 +374,9 @@ void RPCConsole::setClientModel(ClientModel *model)
connect(ui->peerWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showPeersTableContextMenu(const QPoint&))); connect(ui->peerWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showPeersTableContextMenu(const QPoint&)));
connect(disconnectAction, SIGNAL(triggered()), this, SLOT(disconnectSelectedNode())); connect(disconnectAction, SIGNAL(triggered()), this, SLOT(disconnectSelectedNode()));
//add a signal mapping to allow a dynamic argument // Add a signal mapping to allow dynamic context menu arguments.
//we need to use int (instead of int64_t) because signal mapper only supports int or objects // We need to use int (instead of int64_t), because signal mapper only supports
//this is okay because max bantime (1 Year) is smaler then int_max // int or objects, which is okay because max bantime (1 year) is < int_max.
QSignalMapper* signalMapper = new QSignalMapper(this); QSignalMapper* signalMapper = new QSignalMapper(this);
signalMapper->setMapping(banAction1h, 60*60); signalMapper->setMapping(banAction1h, 60*60);
signalMapper->setMapping(banAction24h, 60*60*24); signalMapper->setMapping(banAction24h, 60*60*24);
@ -403,6 +404,10 @@ void RPCConsole::setClientModel(ClientModel *model)
ui->banlistWidget->setContextMenuPolicy(Qt::CustomContextMenu); ui->banlistWidget->setContextMenuPolicy(Qt::CustomContextMenu);
ui->banlistWidget->horizontalHeader()->setStretchLastSection(true); 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 banlist context menu actions
QAction* unbanAction = new QAction(tr("&Unban Node"), this); QAction* unbanAction = new QAction(tr("&Unban Node"), this);
banTableContextMenu = new QMenu(); banTableContextMenu = new QMenu();
@ -419,9 +424,6 @@ void RPCConsole::setClientModel(ClientModel *model)
ui->buildDate->setText(model->formatBuildDate()); ui->buildDate->setText(model->formatBuildDate());
ui->startupTime->setText(model->formatClientStartupTime()); ui->startupTime->setText(model->formatClientStartupTime());
ui->networkName->setText(QString::fromStdString(Params().NetworkIDString())); ui->networkName->setText(QString::fromStdString(Params().NetworkIDString()));
connect(model, SIGNAL(banListChanged()), this, SLOT(showOrHideBanTableIfRequired()));
showOrHideBanTableIfRequired();
} }
} }