highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-21 01:11:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt: Connect WalletView signal to BitcoinGUI slot directly

Browse Source 
This change removes redundant intermediate WalletFrame connections.

This commit does not change behavior.
This commit is contained in:
Hennadii Stepanov 2021-05-16 00:13:58 +03:00
parent bd50ff9290
commit f507681baa
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qt/bitcoingui.cpp
View File

@ -211,11 +211,6 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay); connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay);
connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay); connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay);
#ifdef ENABLE_WALLET
if(enableWallet) {
connect(walletFrame, &WalletFrame::requestedSyncWarningInfo, this, &BitcoinGUI::showModalOverlay);
}
#endif
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
m_app_nap_inhibitor = new CAppNapInhibitor; m_app_nap_inhibitor = new CAppNapInhibitor;
@ -690,7 +685,7 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
const QString display_name = walletModel->getDisplayName(); const QString display_name = walletModel->getDisplayName();
m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel)); m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
connect(wallet_view, &WalletView::outOfSyncWarningClicked, walletFrame, &WalletFrame::outOfSyncWarningClicked); connect(wallet_view, &WalletView::outOfSyncWarningClicked, this, &BitcoinGUI::showModalOverlay);
connect(wallet_view, &WalletView::transactionClicked, this, &BitcoinGUI::gotoHistoryPage); connect(wallet_view, &WalletView::transactionClicked, this, &BitcoinGUI::gotoHistoryPage);
connect(wallet_view, &WalletView::coinsSent, this, &BitcoinGUI::gotoHistoryPage); connect(wallet_view, &WalletView::coinsSent, this, &BitcoinGUI::gotoHistoryPage);
connect(wallet_view, &WalletView::message, [this](const QString& title, const QString& message, unsigned int style) { connect(wallet_view, &WalletView::message, [this](const QString& title, const QString& message, unsigned int style) {

5
src/qt/walletframe.cpp
View File

@ -242,8 +242,3 @@ WalletModel* WalletFrame::currentWalletModel() const
WalletView* wallet_view = currentWalletView(); WalletView* wallet_view = currentWalletView();
return wallet_view ? wallet_view->getWalletModel() : nullptr; return wallet_view ? wallet_view->getWalletModel() : nullptr;
} }
void WalletFrame::outOfSyncWarningClicked()
{
Q_EMIT requestedSyncWarningInfo();
}

5
src/qt/walletframe.h
View File

@ -47,9 +47,6 @@ public:
QSize sizeHint() const override { return m_size_hint; } QSize sizeHint() const override { return m_size_hint; }
Q_SIGNALS: Q_SIGNALS:
/** Notify that the user has requested more information about the out-of-sync warning */
void requestedSyncWarningInfo();
void createWalletButtonClicked(); void createWalletButtonClicked();
private: private:
@ -98,8 +95,6 @@ public Q_SLOTS:
void usedSendingAddresses(); void usedSendingAddresses();
/** Show used receiving addresses */ /** Show used receiving addresses */
void usedReceivingAddresses(); void usedReceivingAddresses();
/** Pass on signal over requested out-of-sync-warning information */
void outOfSyncWarningClicked();
}; };
#endif // BITCOIN_QT_WALLETFRAME_H #endif // BITCOIN_QT_WALLETFRAME_H