highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-13 21:30:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt, wallet: Add LoadWalletsActivity class

Browse Source 
Also this commit moves wallets loading out from the main GUI thread.
This commit is contained in:
Hennadii Stepanov 2021-05-22 22:27:45 +03:00
parent 4a024fc310
commit f6991cb906
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/bitcoingui.cpp
View File

@ -659,9 +659,8 @@ void BitcoinGUI::setWalletController(WalletController* wallet_controller)
GUIUtil::ExceptionSafeConnect(wallet_controller, &WalletController::walletAdded, this, &BitcoinGUI::addWallet); GUIUtil::ExceptionSafeConnect(wallet_controller, &WalletController::walletAdded, this, &BitcoinGUI::addWallet);
connect(wallet_controller, &WalletController::walletRemoved, this, &BitcoinGUI::removeWallet); connect(wallet_controller, &WalletController::walletRemoved, this, &BitcoinGUI::removeWallet);
for (WalletModel* wallet_model : m_wallet_controller->getOpenWallets()) { auto activity = new LoadWalletsActivity(m_wallet_controller, this);
addWallet(wallet_model); activity->load();
}
} }
WalletController* BitcoinGUI::getWalletController() WalletController* BitcoinGUI::getWalletController()

22
src/qt/walletcontroller.cpp
View File

@ -41,10 +41,6 @@ WalletController::WalletController(ClientModel& client_model, const PlatformStyl
getOrCreateWallet(std::move(wallet)); getOrCreateWallet(std::move(wallet));
}); });
for (std::unique_ptr<interfaces::Wallet>& wallet : m_node.walletClient().getWallets()) {
getOrCreateWallet(std::move(wallet));
}
m_activity_worker->moveToThread(m_activity_thread); m_activity_worker->moveToThread(m_activity_thread);
m_activity_thread->start(); m_activity_thread->start();
QTimer::singleShot(0, m_activity_worker, []() { QTimer::singleShot(0, m_activity_worker, []() {
@ -342,3 +338,21 @@ void OpenWalletActivity::open(const std::string& path)
QTimer::singleShot(0, this, &OpenWalletActivity::finish); QTimer::singleShot(0, this, &OpenWalletActivity::finish);
}); });
} }
LoadWalletsActivity::LoadWalletsActivity(WalletController* wallet_controller, QWidget* parent_widget)
: WalletControllerActivity(wallet_controller, parent_widget)
{
}
void LoadWalletsActivity::load()
{
showProgressDialog(tr("Loading wallets…"));
QTimer::singleShot(0, worker(), [this] {
for (auto& wallet : node().walletClient().getWallets()) {
m_wallet_controller->getOrCreateWallet(std::move(wallet));
}
QTimer::singleShot(0, this, [this] { Q_EMIT finished(); });
});
}

10
src/qt/walletcontroller.h
View File

@ -148,4 +148,14 @@ private:
void finish(); void finish();
}; };
class LoadWalletsActivity : public WalletControllerActivity
{
Q_OBJECT
public:
LoadWalletsActivity(WalletController* wallet_controller, QWidget* parent_widget);
void load();
};
#endif // BITCOIN_QT_WALLETCONTROLLER_H #endif // BITCOIN_QT_WALLETCONTROLLER_H