Skip to content

Commit a9c789e

Browse files
committed
Merge #17935: gui: hide HD & encryption icons when no wallet loaded
486f510 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 486f510 theStack: ACK bitcoin/bitcoin@486f510 fanquake: ACK 486f510 - tested that this fixes #17927. Thanks for following up so quick. emilengler: ACK 486f510 Tree-SHA512: 6e3e5305a9eefe1692614097c05393aa0dffd561c89cefb40d501e70a8102eafcadfbc1c86a35c0b256b0f94f41598545d7a043954d6b9669c169d31d95aaf24
2 parents 4e8b564 + 486f510 commit a9c789e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/qt/bitcoingui.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,8 @@ void BitcoinGUI::removeWallet(WalletModel* walletModel)
659659
rpcConsole->removeWallet(walletModel);
660660
walletFrame->removeWallet(walletModel);
661661
updateWindowTitle();
662+
labelWalletHDStatusIcon->hide();
663+
labelWalletEncryptionIcon->hide();
662664
}
663665

664666
void BitcoinGUI::setCurrentWallet(WalletModel* wallet_model)
@@ -1209,7 +1211,7 @@ void BitcoinGUI::setHDStatus(bool privkeyDisabled, int hdEnabled)
12091211
{
12101212
labelWalletHDStatusIcon->setPixmap(platformStyle->SingleColorIcon(privkeyDisabled ? ":/icons/eye" : hdEnabled ? ":/icons/hd_enabled" : ":/icons/hd_disabled").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
12111213
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>"));
1212-
1214+
labelWalletHDStatusIcon->show();
12131215
// eventually disable the QLabel to set its opacity to 50%
12141216
labelWalletHDStatusIcon->setEnabled(hdEnabled);
12151217
}

0 commit comments

Comments
 (0)