mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Merge bitcoin-core/gui#393: Fix regression in "Encrypt Wallet" menu item
d54d94959869b0c363939163b99ba0475751dcb6 qt: Fix regression in "Encrypt Wallet" menu item (Hennadii Stepanov)
Pull request description:
Fix #392.
Adding a new item to the `m_wallet_selector` must follow the establishment of a connection between the `WalletView::encryptionStatusChanged` signal and the `BitcoinGUI::updateWalletStatus` slot.
This was a regression introduced in 20e2e24e90
(#29).
---
An _encrypted_ wallet being auto-loaded at the GUI startup:
- on master (eaf09bda4ab21f79f89822d2c6fa3d7a3ce57b0d)
![Screenshot from 2021-08-03 22-38-49](https://user-images.githubusercontent.com/32963518/128075837-cdbb2047-5327-43ea-b2d5-2dcdef67cdc0.png)
- with this PR
![Screenshot from 2021-08-03 22-34-58](https://user-images.githubusercontent.com/32963518/128075572-cb727652-ad44-4b85-bf64-edcd19f9dea1.png)
ACKs for top commit:
achow101:
ACK d54d94959869b0c363939163b99ba0475751dcb6
jarolrod:
ACK d54d94959869b0c363939163b99ba0475751dcb6
Tree-SHA512: 669615ec8e1517c2f4cdf59bd11a7c85be793ba0dda112361cf95e6c2f0636215fed331d26a86dc9b779a49defae1b248232f98dab449584376c111c288e87bb
This commit is contained in:
parent
fc900a8aea
commit
6431f71b3a
@ -923,8 +923,6 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
|
|||||||
} else if (m_wallet_selector->count() == 1) {
|
} else if (m_wallet_selector->count() == 1) {
|
||||||
m_wallet_selector_action->setVisible(true);
|
m_wallet_selector_action->setVisible(true);
|
||||||
}
|
}
|
||||||
const QString display_name = walletModel->getDisplayName();
|
|
||||||
m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
|
|
||||||
|
|
||||||
connect(wallet_view, &WalletView::outOfSyncWarningClicked, this, &BitcoinGUI::showModalOverlay);
|
connect(wallet_view, &WalletView::outOfSyncWarningClicked, this, &BitcoinGUI::showModalOverlay);
|
||||||
connect(wallet_view, &WalletView::transactionClicked, this, &BitcoinGUI::gotoHistoryPage);
|
connect(wallet_view, &WalletView::transactionClicked, this, &BitcoinGUI::gotoHistoryPage);
|
||||||
@ -937,6 +935,8 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
|
|||||||
connect(wallet_view, &WalletView::hdEnabledStatusChanged, this, &BitcoinGUI::updateWalletStatus);
|
connect(wallet_view, &WalletView::hdEnabledStatusChanged, this, &BitcoinGUI::updateWalletStatus);
|
||||||
connect(this, &BitcoinGUI::setPrivacy, wallet_view, &WalletView::setPrivacy);
|
connect(this, &BitcoinGUI::setPrivacy, wallet_view, &WalletView::setPrivacy);
|
||||||
wallet_view->setPrivacy(isPrivacyModeActivated());
|
wallet_view->setPrivacy(isPrivacyModeActivated());
|
||||||
|
const QString display_name = walletModel->getDisplayName();
|
||||||
|
m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
|
||||||
}
|
}
|
||||||
|
|
||||||
void BitcoinGUI::removeWallet(WalletModel* walletModel)
|
void BitcoinGUI::removeWallet(WalletModel* walletModel)
|
||||||
|
Loading…
Reference in New Issue
Block a user