diff options
| author | fanquake <[email protected]> | 2020-01-16 21:44:24 +0800 |
|---|---|---|
| committer | fanquake <[email protected]> | 2020-01-16 21:56:04 +0800 |
| commit | a9c789ed964dbfae59585e3b56c35816afc3d95e (patch) | |
| tree | 0af3718e4788e8f2bb51bc455a946fc3d425aefe /src | |
| parent | Merge #17931: test: Fix p2p_invalid_messages failing in Python 3.8 because of... (diff) | |
| parent | gui: hide HD & encryption icons when no wallet loaded (diff) | |
| download | discoin-a9c789ed964dbfae59585e3b56c35816afc3d95e.tar.xz discoin-a9c789ed964dbfae59585e3b56c35816afc3d95e.zip | |
Merge #17935: gui: hide HD & encryption icons when no wallet loaded
486f51099ff4e68b67c5bb7ea428c56f3ea1bd55 gui: hide HD & encryption icons when no wallet loaded (Harris)
Pull request description:
This PR takes care of removing (hiding) the HD wallet and encryption icons when no wallet is loaded.
Fixes #17927
ACKs for top commit:
Sjors:
ACK 486f51099ff4e68b67c5bb7ea428c56f3ea1bd55
theStack:
ACK https://github.com/bitcoin/bitcoin/commit/486f51099ff4e68b67c5bb7ea428c56f3ea1bd55
fanquake:
ACK 486f51099ff4e68b67c5bb7ea428c56f3ea1bd55 - tested that this fixes #17927. Thanks for following up so quick.
emilengler:
ACK 486f510
Tree-SHA512: 6e3e5305a9eefe1692614097c05393aa0dffd561c89cefb40d501e70a8102eafcadfbc1c86a35c0b256b0f94f41598545d7a043954d6b9669c169d31d95aaf24
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index ef0843965..f22d33bf0 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -659,6 +659,8 @@ void BitcoinGUI::removeWallet(WalletModel* walletModel) rpcConsole->removeWallet(walletModel); walletFrame->removeWallet(walletModel); updateWindowTitle(); + labelWalletHDStatusIcon->hide(); + labelWalletEncryptionIcon->hide(); } void BitcoinGUI::setCurrentWallet(WalletModel* wallet_model) @@ -1209,7 +1211,7 @@ void BitcoinGUI::setHDStatus(bool privkeyDisabled, int hdEnabled) { labelWalletHDStatusIcon->setPixmap(platformStyle->SingleColorIcon(privkeyDisabled ? ":/icons/eye" : hdEnabled ? ":/icons/hd_enabled" : ":/icons/hd_disabled").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE)); labelWalletHDStatusIcon->setToolTip(privkeyDisabled ? tr("Private key <b>disabled</b>") : hdEnabled ? tr("HD key generation is <b>enabled</b>") : tr("HD key generation is <b>disabled</b>")); - + labelWalletHDStatusIcon->show(); // eventually disable the QLabel to set its opacity to 50% labelWalletHDStatusIcon->setEnabled(hdEnabled); } |