From 32a8c6abfe32d5b89bf4505ca8397bdb44867614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= Date: Sat, 12 Jan 2019 11:34:05 +0000 Subject: [PATCH] gui: Add openWallet and getWalletsAvailableToOpen to WalletController --- src/qt/walletcontroller.cpp | 25 +++++++++++++++++++++++++ src/qt/walletcontroller.h | 3 +++ 2 files changed, 28 insertions(+) diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp index df2b7a3f9..0730afca9 100644 --- a/src/qt/walletcontroller.cpp +++ b/src/qt/walletcontroller.cpp @@ -9,6 +9,7 @@ #include +#include #include #include @@ -37,6 +38,30 @@ std::vector WalletController::getWallets() const return m_wallets; } +std::vector WalletController::getWalletsAvailableToOpen() const +{ + QMutexLocker locker(&m_mutex); + std::vector wallets = m_node.listWalletDir(); + for (WalletModel* wallet_model : m_wallets) { + auto it = std::remove(wallets.begin(), wallets.end(), wallet_model->wallet().getWalletName()); + if (it != wallets.end()) wallets.erase(it); + } + return wallets; +} + +WalletModel* WalletController::openWallet(const std::string& name, QWidget* parent) +{ + std::string error, warning; + WalletModel* wallet_model = getOrCreateWallet(m_node.loadWallet(name, error, warning)); + if (!wallet_model) { + QMessageBox::warning(parent, tr("Open Wallet"), QString::fromStdString(error)); + } + if (!warning.empty()) { + QMessageBox::information(parent, tr("Open Wallet"), QString::fromStdString(warning)); + } + return wallet_model; +} + WalletModel* WalletController::getOrCreateWallet(std::unique_ptr wallet) { QMutexLocker locker(&m_mutex); diff --git a/src/qt/walletcontroller.h b/src/qt/walletcontroller.h index 22b71b07f..523e47d27 100644 --- a/src/qt/walletcontroller.h +++ b/src/qt/walletcontroller.h @@ -37,6 +37,9 @@ public: ~WalletController(); std::vector getWallets() const; + std::vector getWalletsAvailableToOpen() const; + + WalletModel* openWallet(const std::string& name, QWidget* parent = nullptr); private Q_SLOTS: void addWallet(WalletModel* wallet_model);