mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge e9472e6828 into merged_master (Bitcoin PR bitcoin-core/gui#393)
This commit is contained in:
commit
014ce00cbd
1 changed files with 2 additions and 2 deletions
|
|
@ -677,8 +677,6 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
|
|||
m_wallet_selector_label_action->setVisible(true);
|
||||
m_wallet_selector_action->setVisible(true);
|
||||
}
|
||||
const QString display_name = walletModel->getDisplayName();
|
||||
m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
|
||||
|
||||
connect(wallet_view, &WalletView::outOfSyncWarningClicked, this, &BitcoinGUI::showModalOverlay);
|
||||
connect(wallet_view, &WalletView::transactionClicked, this, &BitcoinGUI::gotoHistoryPage);
|
||||
|
|
@ -691,6 +689,8 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
|
|||
connect(wallet_view, &WalletView::hdEnabledStatusChanged, this, &BitcoinGUI::updateWalletStatus);
|
||||
connect(this, &BitcoinGUI::setPrivacy, wallet_view, &WalletView::setPrivacy);
|
||||
wallet_view->setPrivacy(isPrivacyModeActivated());
|
||||
const QString display_name = walletModel->getDisplayName();
|
||||
m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
|
||||
}
|
||||
|
||||
void BitcoinGUI::removeWallet(WalletModel* walletModel)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue