mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-04-28 13:20:55 +02:00
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 486f51099f
fanquake:
ACK 486f51099ff4e68b67c5bb7ea428c56f3ea1bd55 - tested that this fixes #17927. Thanks for following up so quick.
emilengler:
ACK 486f510
Tree-SHA512: 6e3e5305a9eefe1692614097c05393aa0dffd561c89cefb40d501e70a8102eafcadfbc1c86a35c0b256b0f94f41598545d7a043954d6b9669c169d31d95aaf24
This commit is contained in:
commit
a9c789ed96
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user