Browse Source

[Qt] bantable overhaul

- some code cleanups
- fix date formatting
- reduce header includes
pull/1/head
Jonas Schnelli 7 years ago
parent
commit
53caec66cc
  1. 12
      src/qt/bantablemodel.cpp
  2. 1
      src/qt/bantablemodel.h
  3. 14
      src/qt/rpcconsole.cpp
  4. 4
      src/qt/rpcconsole.h

12
src/qt/bantablemodel.cpp

@ -8,7 +8,6 @@ @@ -8,7 +8,6 @@
#include "guiconstants.h"
#include "guiutil.h"
#include "net.h"
#include "sync.h"
#include "utiltime.h"
@ -41,15 +40,16 @@ public: @@ -41,15 +40,16 @@ public:
cachedBanlist.reserve(banMap.size());
#endif
std::map<CSubNet, int64_t>::iterator iter;
for (iter = banMap.begin(); iter != banMap.end(); ++iter) {
foreach (const PAIRTYPE(CSubNet, int64_t)& banentry, banMap)
{
CCombinedBan banEntry;
banEntry.subnet = iter->first;
banEntry.bantil = iter->second;
banEntry.subnet = banentry.first;
banEntry.bantil = banentry.second;
cachedBanlist.append(banEntry);
}
}
int size()
int size() const
{
return cachedBanlist.size();
}
@ -120,7 +120,7 @@ QVariant BanTableModel::data(const QModelIndex &index, int role) const @@ -120,7 +120,7 @@ QVariant BanTableModel::data(const QModelIndex &index, int role) const
case Bantime:
QDateTime date = QDateTime::fromMSecsSinceEpoch(0);
date = date.addSecs(rec->bantil);
return date.toString(Qt::SystemLocaleShortDate);
return date.toString(Qt::SystemLocaleLongDate);
}
} else if (role == Qt::TextAlignmentRole) {
if (index.column() == Bantime)

1
src/qt/bantablemodel.h

@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
#ifndef BITCOIN_QT_BANTABLEMODEL_H
#define BITCOIN_QT_BANTABLEMODEL_H
#include "main.h"
#include "net.h"
#include <QAbstractTableModel>

14
src/qt/rpcconsole.cpp

@ -356,10 +356,10 @@ void RPCConsole::setClientModel(ClientModel *model) @@ -356,10 +356,10 @@ void RPCConsole::setClientModel(ClientModel *model)
// create context menu actions
QAction* disconnectAction = new QAction(tr("&Disconnect Node"), this);
QAction* banAction1h = new QAction(tr("&Ban Node for 1 hour"), this);
QAction* banAction24h = new QAction(tr("&Ban Node for 24 hours"), this);
QAction* banAction7d = new QAction(tr("&Ban Node for 7 days"), this);
QAction* banAction365d = new QAction(tr("&Ban Node for 1 year"), this);
QAction* banAction1h = new QAction(tr("&Ban Node for") + " " + tr("&1 hour"), this);
QAction* banAction24h = new QAction(tr("&Ban Node for") + " " + tr("&24 hours"), this);
QAction* banAction7d = new QAction(tr("&Ban Node for") + " " + tr("&7 days"), this);
QAction* banAction365d = new QAction(tr("&Ban Node for") + " " + tr("&1 year"), this);
// create context menu
peersTableContextMenu = new QMenu();
@ -798,7 +798,8 @@ void RPCConsole::banSelectedNode(int bantime) @@ -798,7 +798,8 @@ void RPCConsole::banSelectedNode(int bantime)
SplitHostPort(nStr, port, addr);
CNode::Ban(CNetAddr(addr), bantime);
bannedNode->CloseSocketDisconnect();
bannedNode->fDisconnect = true;
clearSelectedNode();
ui->banlistWidget->setVisible(true);
ui->banHeading->setVisible(true);
@ -830,6 +831,9 @@ void RPCConsole::clearSelectedNode() @@ -830,6 +831,9 @@ void RPCConsole::clearSelectedNode()
void RPCConsole::showOrHideBanTableIfRequired()
{
if (!clientModel)
return;
bool visible = clientModel->getBanTableModel()->shouldShow();
ui->banlistWidget->setVisible(visible);
ui->banHeading->setVisible(visible);

4
src/qt/rpcconsole.h

@ -108,8 +108,8 @@ private: @@ -108,8 +108,8 @@ private:
ADDRESS_COLUMN_WIDTH = 200,
SUBVERSION_COLUMN_WIDTH = 100,
PING_COLUMN_WIDTH = 80,
BANSUBNET_COLUMN_WIDTH = 300,
BANTIME_COLUMN_WIDTH = 150
BANSUBNET_COLUMN_WIDTH = 250,
BANTIME_COLUMN_WIDTH = 200
};

Loading…
Cancel
Save