gui: hide HD & encryption icons when no wallet loaded #17935

pull brakmic wants to merge 1 commits into bitcoin:master from brakmic:hdwallet-icon-handling changing 1 files +3 −1

brakmic commented at 8:26 PM on January 15, 2020: contributor

This PR takes care of removing (hiding) the HD wallet and encryption icons when no wallet is loaded.

Fixes #17927
DrahtBot added the label GUI on Jan 15, 2020

in src/qt/bitcoingui.cpp:405 in 032a56d131 outdated

 401 | @@ -402,6 +402,7 @@ void BitcoinGUI::createActions()
 402 |          });
 403 |          connect(m_close_wallet_action, &QAction::triggered, [this] {
 404 |              m_wallet_controller->closeWallet(walletFrame->currentWalletModel(), this);
 405 | +            labelWalletHDStatusIcon->hide();

promag commented at 8:47 PM on January 15, 2020:

This in the wrong place, should be in BitcoinGUI::removeWallet - then it will also work if you open the console and call unloadwallet.

brakmic commented at 8:48 PM on January 15, 2020:

Ooops, many thanks! Will update.

promag commented at 8:47 PM on January 15, 2020: member

Concept ACK.
brakmic renamed this:
~~gui: hide HD icon when no wallet loaded~~
gui: hide HD & encryption icon when no wallet loaded
on Jan 15, 2020
brakmic renamed this:
~~gui: hide HD & encryption icon when no wallet loaded~~
gui: hide HD & encryption icons when no wallet loaded
on Jan 15, 2020
gui: hide HD & encryption icons when no wallet loaded 486f51099f

in src/qt/bitcoingui.cpp:1214 in 8279b0265a outdated

1212 | @@ -1211,6 +1213,7 @@ void BitcoinGUI::setHDStatus(bool privkeyDisabled, int hdEnabled)
1213 |      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>"));
1214 |  
1215 |      // eventually disable the QLabel to set its opacity to 50%
1216 | +    labelWalletHDStatusIcon->show();

yahiheb commented at 10:10 PM on January 15, 2020:

Just a nit: shouldn't this line be above the comment?

brakmic commented at 10:12 PM on January 15, 2020:

Indeed. Many thanks!

fanquake approved
fanquake commented at 12:36 AM on January 16, 2020: member

ACK 486f51099ff4e68b67c5bb7ea428c56f3ea1bd55 - tested that this fixes #17927. Thanks for following up so quick.
Sjors commented at 1:34 PM on January 16, 2020: member

ACK 486f51099ff4e68b67c5bb7ea428c56f3ea1bd55
emilengler commented at 1:42 PM on January 16, 2020: contributor

ACK 486f510
theStack commented at 1:43 PM on January 16, 2020: member

ACK https://github.com/bitcoin/bitcoin/commit/486f51099ff4e68b67c5bb7ea428c56f3ea1bd55 Tested with Ubuntu 16.04 + Qt 5.5.1
fanquake referenced this in commit a9c789ed96 on Jan 16, 2020
fanquake merged this on Jan 16, 2020
fanquake closed this on Jan 16, 2020
MarkLTZ referenced this in commit 2ae3e95ab9 on Jan 21, 2020

in src/qt/bitcoingui.cpp:663 in 486f51099f

 658 | @@ -659,6 +659,8 @@ void BitcoinGUI::removeWallet(WalletModel* walletModel)
 659 |      rpcConsole->removeWallet(walletModel);
 660 |      walletFrame->removeWallet(walletModel);
 661 |      updateWindowTitle();
 662 | +    labelWalletHDStatusIcon->hide();
 663 | +    labelWalletEncryptionIcon->hide();

luke-jr commented at 10:56 PM on January 26, 2020:

This seems obviously broken... See PR #18007

jasonbcox referenced this in commit 65c02eebfa on Sep 23, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

Labels

Linked (view graph)

#17927 gui: HD icon is displayed when no wallet is loaded