Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-11-17 17:57:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wizard: don't show stagenet wallet in mainnet mode

Browse source
This commit is contained in:
tobtoht 2020-12-18 23:39:27 +01:00
parent 6c8255b12b
commit 68f8be01ac
No known key found for this signature in database
GPG key ID: 1CADD27F41F45C3C
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/utils/keysfiles.cpp
View file

@ -19,7 +19,7 @@
using namespace std::chrono;
WalletKeysFiles::WalletKeysFiles(const QFileInfo &info, quint8 networkType, QString address) :
WalletKeysFiles::WalletKeysFiles(const QFileInfo &info, int networkType, QString address) :
m_fileName(info.fileName()),
m_modified(info.lastModified().toSecsSinceEpoch()),
m_path(QDir::toNativeSeparators(info.absoluteFilePath())),
@ -42,7 +42,7 @@ QString WalletKeysFiles::path() const {
return m_path;
}
quint8 WalletKeysFiles::networkType() const {
int WalletKeysFiles::networkType() const {
return m_networkType;
}
@ -168,7 +168,7 @@ QVariant WalletKeysFilesModel::data(const QModelIndex &index, int role) const {
} else if(role == Qt::UserRole) {
switch(index.column()) {
case ModelColumns::NetworkType:
return static_cast<uint>(walletKeyFile.networkType());
return static_cast<int>(walletKeyFile.networkType());
case ModelColumns::FileName:
return walletKeyFile.fileName();
case ModelColumns::Modified:
@ -201,9 +201,15 @@ QVariant WalletKeysFilesModel::headerData(int section, Qt::Orientation orientati
return QVariant();
}
WalletKeysFilesProxyModel::WalletKeysFilesProxyModel(QObject *parent) :
QSortFilterProxyModel(parent) {}
WalletKeysFilesProxyModel::WalletKeysFilesProxyModel(QObject *parent, NetworkType::Type nettype)
: QSortFilterProxyModel(parent)
, m_nettype(nettype)
{
}
bool WalletKeysFilesProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const {
return true;
QModelIndex nettypeIndex = sourceModel()->index(sourceRow, WalletKeysFilesModel::NetworkType, sourceParent);
NetworkType::Type nettype = static_cast<NetworkType::Type>(sourceModel()->data(nettypeIndex, Qt::UserRole).toInt());
return (m_nettype == nettype);
}

11
src/utils/keysfiles.h
View file

@ -12,19 +12,19 @@
class WalletKeysFiles
{
public:
WalletKeysFiles(const QFileInfo &info, quint8 networkType, QString address);
WalletKeysFiles(const QFileInfo &info, int networkType, QString address);
QString fileName() const;
qint64 modified() const;
QString path() const;
quint8 networkType() const;
int networkType() const;
QString address() const;
private:
QString m_fileName;
qint64 m_modified;
QString m_path;
quint8 m_networkType;
int m_networkType;
QString m_address;
};
@ -64,8 +64,11 @@ class WalletKeysFilesProxyModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
explicit WalletKeysFilesProxyModel(QObject *parent = nullptr);
explicit WalletKeysFilesProxyModel(QObject *parent, NetworkType::Type nettype);
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
private:
NetworkType::Type m_nettype;
};
#endif // KEYSFILES_H

3
src/wizard/openwallet.cpp
View file

@ -49,11 +49,12 @@ OpenWalletPage::OpenWalletPage(AppContext *ctx, QWidget *parent) :
this->walletKeysFilesModel = new WalletKeysFilesModel(m_ctx);
this->walletKeysFilesModel->refresh();
m_keysProxy = new WalletKeysFilesProxyModel();
m_keysProxy = new WalletKeysFilesProxyModel(this, m_ctx->networkType);
m_keysProxy->setSourceModel(this->walletKeysFilesModel);
m_keysProxy->setSortRole(Qt::UserRole);
ui->walletTable->setModel(m_keysProxy);
ui->walletTable->hideColumn(WalletKeysFilesModel::NetworkType);
ui->walletTable->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
ui->walletTable->header()->setSectionResizeMode(WalletKeysFilesModel::Path, QHeaderView::Stretch);
ui->walletTable->setSortingEnabled(true);