gui: don't disable the sync overlay when wallet is disabled

This commit is contained in:
Ben Carman 2019-10-13 10:31:25 -05:00
parent 1d73636fdf
commit b3b6b6f62f
No known key found for this signature in database
GPG key ID: D7CC770B81FD22A8
3 changed files with 9 additions and 5 deletions

View file

@ -201,12 +201,12 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
openOptionsDialogWithTab(OptionsDialog::TAB_NETWORK); openOptionsDialogWithTab(OptionsDialog::TAB_NETWORK);
}); });
modalOverlay = new ModalOverlay(this->centralWidget()); modalOverlay = new ModalOverlay(enableWallet, this->centralWidget());
connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay);
connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay);
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
if(enableWallet) { if(enableWallet) {
connect(walletFrame, &WalletFrame::requestedSyncWarningInfo, this, &BitcoinGUI::showModalOverlay); connect(walletFrame, &WalletFrame::requestedSyncWarningInfo, this, &BitcoinGUI::showModalOverlay);
connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay);
connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay);
} }
#endif #endif

View file

@ -12,7 +12,7 @@
#include <QResizeEvent> #include <QResizeEvent>
#include <QPropertyAnimation> #include <QPropertyAnimation>
ModalOverlay::ModalOverlay(QWidget *parent) : ModalOverlay::ModalOverlay(bool enable_wallet, QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::ModalOverlay), ui(new Ui::ModalOverlay),
bestHeaderHeight(0), bestHeaderHeight(0),
@ -29,6 +29,10 @@ userClosed(false)
blockProcessTime.clear(); blockProcessTime.clear();
setVisible(false); setVisible(false);
if (!enable_wallet) {
ui->infoText->setVisible(false);
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."));
}
} }
ModalOverlay::~ModalOverlay() ModalOverlay::~ModalOverlay()

View file

@ -21,7 +21,7 @@ class ModalOverlay : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit ModalOverlay(QWidget *parent); explicit ModalOverlay(bool enable_wallet, QWidget *parent);
~ModalOverlay(); ~ModalOverlay();
public Q_SLOTS: public Q_SLOTS: