ui: Support wallets loaded dynamically
This commit is contained in:
parent
1c8fe0bf90
commit
0e674ba557
2 changed files with 28 additions and 13 deletions
|
@ -5,4 +5,4 @@ Previously, wallets could only be loaded at startup, by specifying `-wallet` par
|
||||||
|
|
||||||
The wallet can be specified as file/directory basename (which must be located in the `walletdir` directory), or as an absolute path to a file/directory.
|
The wallet can be specified as file/directory basename (which must be located in the `walletdir` directory), or as an absolute path to a file/directory.
|
||||||
|
|
||||||
This feature is currently only available through the RPC interface. Wallets loaded in this way will not display in the bitcoin-qt GUI.
|
This feature is currently only available through the RPC interface. Wallets loaded in this way will display in the bitcoin-qt GUI.
|
||||||
|
|
|
@ -234,6 +234,7 @@ public Q_SLOTS:
|
||||||
void shutdownResult();
|
void shutdownResult();
|
||||||
/// Handle runaway exceptions. Shows a message box with the problem and quits the program.
|
/// Handle runaway exceptions. Shows a message box with the problem and quits the program.
|
||||||
void handleRunawayException(const QString &message);
|
void handleRunawayException(const QString &message);
|
||||||
|
void addWallet(WalletModel* walletModel);
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
void requestedInitialize();
|
void requestedInitialize();
|
||||||
|
@ -251,6 +252,7 @@ private:
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
PaymentServer* paymentServer;
|
PaymentServer* paymentServer;
|
||||||
std::vector<WalletModel*> m_wallet_models;
|
std::vector<WalletModel*> m_wallet_models;
|
||||||
|
std::unique_ptr<interfaces::Handler> m_handler_load_wallet;
|
||||||
#endif
|
#endif
|
||||||
int returnValue;
|
int returnValue;
|
||||||
const PlatformStyle *platformStyle;
|
const PlatformStyle *platformStyle;
|
||||||
|
@ -447,6 +449,22 @@ void BitcoinApplication::requestShutdown()
|
||||||
Q_EMIT requestedShutdown();
|
Q_EMIT requestedShutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void BitcoinApplication::addWallet(WalletModel* walletModel)
|
||||||
|
{
|
||||||
|
#ifdef ENABLE_WALLET
|
||||||
|
window->addWallet(walletModel);
|
||||||
|
|
||||||
|
if (m_wallet_models.empty()) {
|
||||||
|
window->setCurrentWallet(walletModel->getWalletName());
|
||||||
|
}
|
||||||
|
|
||||||
|
connect(walletModel, SIGNAL(coinsSent(WalletModel*, SendCoinsRecipient, QByteArray)),
|
||||||
|
paymentServer, SLOT(fetchPaymentACK(WalletModel*, const SendCoinsRecipient&, QByteArray)));
|
||||||
|
|
||||||
|
m_wallet_models.push_back(walletModel);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
void BitcoinApplication::initializeResult(bool success)
|
void BitcoinApplication::initializeResult(bool success)
|
||||||
{
|
{
|
||||||
qDebug() << __func__ << ": Initialization result: " << success;
|
qDebug() << __func__ << ": Initialization result: " << success;
|
||||||
|
@ -465,19 +483,13 @@ void BitcoinApplication::initializeResult(bool success)
|
||||||
window->setClientModel(clientModel);
|
window->setClientModel(clientModel);
|
||||||
|
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
auto wallets = m_node.getWallets();
|
m_handler_load_wallet = m_node.handleLoadWallet([this](std::unique_ptr<interfaces::Wallet> wallet) {
|
||||||
for (auto& wallet : wallets) {
|
QMetaObject::invokeMethod(this, "addWallet", Qt::QueuedConnection,
|
||||||
WalletModel * const walletModel = new WalletModel(std::move(wallet), m_node, platformStyle, optionsModel);
|
Q_ARG(WalletModel*, new WalletModel(std::move(wallet), m_node, platformStyle, optionsModel)));
|
||||||
|
});
|
||||||
|
|
||||||
window->addWallet(walletModel);
|
for (auto& wallet : m_node.getWallets()) {
|
||||||
if (m_wallet_models.empty()) {
|
addWallet(new WalletModel(std::move(wallet), m_node, platformStyle, optionsModel));
|
||||||
window->setCurrentWallet(walletModel->getWalletName());
|
|
||||||
}
|
|
||||||
|
|
||||||
connect(walletModel, SIGNAL(coinsSent(WalletModel*,SendCoinsRecipient,QByteArray)),
|
|
||||||
paymentServer, SLOT(fetchPaymentACK(WalletModel*,const SendCoinsRecipient&,QByteArray)));
|
|
||||||
|
|
||||||
m_wallet_models.push_back(walletModel);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -593,6 +605,9 @@ int main(int argc, char *argv[])
|
||||||
// IMPORTANT if it is no longer a typedef use the normal variant above
|
// IMPORTANT if it is no longer a typedef use the normal variant above
|
||||||
qRegisterMetaType< CAmount >("CAmount");
|
qRegisterMetaType< CAmount >("CAmount");
|
||||||
qRegisterMetaType< std::function<void(void)> >("std::function<void(void)>");
|
qRegisterMetaType< std::function<void(void)> >("std::function<void(void)>");
|
||||||
|
#ifdef ENABLE_WALLET
|
||||||
|
qRegisterMetaType<WalletModel*>("WalletModel*");
|
||||||
|
#endif
|
||||||
|
|
||||||
/// 3. Application identification
|
/// 3. Application identification
|
||||||
// must be set before OptionsModel is initialized or translations are loaded,
|
// must be set before OptionsModel is initialized or translations are loaded,
|
||||||
|
|
Loading…
Add table
Reference in a new issue