Skip to content

Commit b9b58f8

Browse files
committed
Merge #15084: gui: don't disable the sync overlay when wallet is disabled
b3b6b6f gui: don't disable the sync overlay when wallet is disabled (Ben Carman) Pull request description: Continuation of #13848. When running with `-disablewallet` the sync modal is now available by clicking on the progress bar or `syncing` icon. [Current Image of what the window looks like](https://imgur.com/6LsoT2l) Fixes #13828. ACKs for top commit: jonasschnelli: Tested ACK b3b6b6f Tree-SHA512: 325bc22a0b692bfb8fcc9d84e02dfc506146028b97b3609e23c2c45288c79b8aead1ad2e9b8d692f5f6771b4d2aee63fbe71bfaeaf17d260865da32ab3631e07
2 parents 4daadce + b3b6b6f commit b9b58f8

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

src/qt/bitcoingui.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,12 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
199199
openOptionsDialogWithTab(OptionsDialog::TAB_NETWORK);
200200
});
201201

202-
modalOverlay = new ModalOverlay(this->centralWidget());
202+
modalOverlay = new ModalOverlay(enableWallet, this->centralWidget());
203+
connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay);
204+
connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay);
203205
#ifdef ENABLE_WALLET
204206
if(enableWallet) {
205207
connect(walletFrame, &WalletFrame::requestedSyncWarningInfo, this, &BitcoinGUI::showModalOverlay);
206-
connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay);
207-
connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay);
208208
}
209209
#endif
210210

src/qt/modaloverlay.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <QResizeEvent>
1313
#include <QPropertyAnimation>
1414

15-
ModalOverlay::ModalOverlay(QWidget *parent) :
15+
ModalOverlay::ModalOverlay(bool enable_wallet, QWidget *parent) :
1616
QWidget(parent),
1717
ui(new Ui::ModalOverlay),
1818
bestHeaderHeight(0),
@@ -29,6 +29,10 @@ userClosed(false)
2929

3030
blockProcessTime.clear();
3131
setVisible(false);
32+
if (!enable_wallet) {
33+
ui->infoText->setVisible(false);
34+
ui->infoTextStrong->setText(tr("Bitcoin Core is currently syncing. It will download headers and blocks from peers and validate them until reaching the tip of the block chain."));
35+
}
3236
}
3337

3438
ModalOverlay::~ModalOverlay()

src/qt/modaloverlay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ModalOverlay : public QWidget
2121
Q_OBJECT
2222

2323
public:
24-
explicit ModalOverlay(QWidget *parent);
24+
explicit ModalOverlay(bool enable_wallet, QWidget *parent);
2525
~ModalOverlay();
2626

2727
public Q_SLOTS:

0 commit comments

Comments
 (0)