LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Packages Projects Releases 32 Wiki Activity

qt: Use WalletModel* instead of wallet name in main window

Browse source
This commit is contained in:
João Barbosa 2018-11-22 11:36:07 +00:00
parent d2a1adffeb
commit b2ce86c3ad
5 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/qt/bitcoin.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2011-2018 The Bitcoin Core developers // Copyright (c) 2011-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -431,7 +431,7 @@ void BitcoinApplication::addWallet(WalletModel* walletModel)
window->addWallet(walletModel); window->addWallet(walletModel);
if (m_wallet_models.empty()) { if (m_wallet_models.empty()) {
window->setCurrentWallet(walletModel->getWalletName()); window->setCurrentWallet(walletModel);
} }
#ifdef ENABLE_BIP70 #ifdef ENABLE_BIP70

18
src/qt/bitcoingui.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2011-2018 The Bitcoin Core developers // Copyright (c) 2011-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -569,10 +569,9 @@ bool BitcoinGUI::addWallet(WalletModel *walletModel)
{ {
if(!walletFrame) if(!walletFrame)
return false; return false;
const QString name = walletModel->getWalletName();
const QString display_name = walletModel->getDisplayName(); const QString display_name = walletModel->getDisplayName();
setWalletActionsEnabled(true); setWalletActionsEnabled(true);
m_wallet_selector->addItem(display_name, name); m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
if (m_wallet_selector->count() == 2) { if (m_wallet_selector->count() == 2) {
m_wallet_selector_label_action->setVisible(true); m_wallet_selector_label_action->setVisible(true);
m_wallet_selector_action->setVisible(true); m_wallet_selector_action->setVisible(true);
@ -584,8 +583,7 @@ bool BitcoinGUI::addWallet(WalletModel *walletModel)
bool BitcoinGUI::removeWallet(WalletModel* walletModel) bool BitcoinGUI::removeWallet(WalletModel* walletModel)
{ {
if (!walletFrame) return false; if (!walletFrame) return false;
QString name = walletModel->getWalletName(); int index = m_wallet_selector->findData(QVariant::fromValue(walletModel));
int index = m_wallet_selector->findData(name);
m_wallet_selector->removeItem(index); m_wallet_selector->removeItem(index);
if (m_wallet_selector->count() == 0) { if (m_wallet_selector->count() == 0) {
setWalletActionsEnabled(false); setWalletActionsEnabled(false);
@ -594,20 +592,20 @@ bool BitcoinGUI::removeWallet(WalletModel* walletModel)
m_wallet_selector_action->setVisible(false); m_wallet_selector_action->setVisible(false);
} }
rpcConsole->removeWallet(walletModel); rpcConsole->removeWallet(walletModel);
return walletFrame->removeWallet(name); return walletFrame->removeWallet(walletModel);
} }
bool BitcoinGUI::setCurrentWallet(const QString& name) bool BitcoinGUI::setCurrentWallet(WalletModel* wallet_model)
{ {
if(!walletFrame) if(!walletFrame)
return false; return false;
return walletFrame->setCurrentWallet(name); return walletFrame->setCurrentWallet(wallet_model);
} }
bool BitcoinGUI::setCurrentWalletBySelectorIndex(int index) bool BitcoinGUI::setCurrentWalletBySelectorIndex(int index)
{ {
QString internal_name = m_wallet_selector->itemData(index).toString(); WalletModel* wallet_model = m_wallet_selector->itemData(index).value<WalletModel*>();
return setCurrentWallet(internal_name); return setCurrentWallet(wallet_model);
} }
void BitcoinGUI::removeAllWallets() void BitcoinGUI::removeAllWallets()

4
src/qt/bitcoingui.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2011-2018 The Bitcoin Core developers // Copyright (c) 2011-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -206,7 +206,7 @@ public Q_SLOTS:
void message(const QString &title, const QString &message, unsigned int style, bool *ret = nullptr); void message(const QString &title, const QString &message, unsigned int style, bool *ret = nullptr);
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
bool setCurrentWallet(const QString& name); bool setCurrentWallet(WalletModel* wallet_model);
bool setCurrentWalletBySelectorIndex(int index); bool setCurrentWalletBySelectorIndex(int index);
/** Set the UI status indicators based on the currently selected wallet. /** Set the UI status indicators based on the currently selected wallet.
*/ */

31
src/qt/walletframe.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2011-2018 The Bitcoin Core developers // Copyright (c) 2011-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -46,8 +46,7 @@ bool WalletFrame::addWallet(WalletModel *walletModel)
return false; return false;
} }
const QString name = walletModel->getWalletName(); if (mapWalletViews.count(walletModel) > 0) {
if (mapWalletViews.count(name) > 0) {
return false; return false;
} }
@ -65,7 +64,7 @@ bool WalletFrame::addWallet(WalletModel *walletModel)
} }
walletStack->addWidget(walletView); walletStack->addWidget(walletView);
mapWalletViews[name] = walletView; mapWalletViews[walletModel] = walletView;
// Ensure a walletView is able to show the main window // Ensure a walletView is able to show the main window
connect(walletView, &WalletView::showNormalIfMinimized, [this]{ connect(walletView, &WalletView::showNormalIfMinimized, [this]{
@ -77,24 +76,24 @@ bool WalletFrame::addWallet(WalletModel *walletModel)
return true; return true;
} }
bool WalletFrame::setCurrentWallet(const QString& name) bool WalletFrame::setCurrentWallet(WalletModel* wallet_model)
{ {
if (mapWalletViews.count(name) == 0) if (mapWalletViews.count(wallet_model) == 0)
return false; return false;
WalletView *walletView = mapWalletViews.value(name); WalletView *walletView = mapWalletViews.value(wallet_model);
walletStack->setCurrentWidget(walletView); walletStack->setCurrentWidget(walletView);
assert(walletView); assert(walletView);
walletView->updateEncryptionStatus(); walletView->updateEncryptionStatus();
return true; return true;
} }
bool WalletFrame::removeWallet(const QString &name) bool WalletFrame::removeWallet(WalletModel* wallet_model)
{ {
if (mapWalletViews.count(name) == 0) if (mapWalletViews.count(wallet_model) == 0)
return false; return false;
WalletView *walletView = mapWalletViews.take(name); WalletView *walletView = mapWalletViews.take(wallet_model);
walletStack->removeWidget(walletView); walletStack->removeWidget(walletView);
delete walletView; delete walletView;
return true; return true;
@ -102,7 +101,7 @@ bool WalletFrame::removeWallet(const QString &name)
void WalletFrame::removeAllWallets() void WalletFrame::removeAllWallets()
{ {
QMap<QString, WalletView*>::const_iterator i; QMap<WalletModel*, WalletView*>::const_iterator i;
for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
walletStack->removeWidget(i.value()); walletStack->removeWidget(i.value());
mapWalletViews.clear(); mapWalletViews.clear();
@ -120,35 +119,35 @@ bool WalletFrame::handlePaymentRequest(const SendCoinsRecipient &recipient)
void WalletFrame::showOutOfSyncWarning(bool fShow) void WalletFrame::showOutOfSyncWarning(bool fShow)
{ {
bOutOfSync = fShow; bOutOfSync = fShow;
QMap<QString, WalletView*>::const_iterator i; QMap<WalletModel*, WalletView*>::const_iterator i;
for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
i.value()->showOutOfSyncWarning(fShow); i.value()->showOutOfSyncWarning(fShow);
} }
void WalletFrame::gotoOverviewPage() void WalletFrame::gotoOverviewPage()
{ {
QMap<QString, WalletView*>::const_iterator i; QMap<WalletModel*, WalletView*>::const_iterator i;
for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
i.value()->gotoOverviewPage(); i.value()->gotoOverviewPage();
} }
void WalletFrame::gotoHistoryPage() void WalletFrame::gotoHistoryPage()
{ {
QMap<QString, WalletView*>::const_iterator i; QMap<WalletModel*, WalletView*>::const_iterator i;
for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
i.value()->gotoHistoryPage(); i.value()->gotoHistoryPage();
} }
void WalletFrame::gotoReceiveCoinsPage() void WalletFrame::gotoReceiveCoinsPage()
{ {
QMap<QString, WalletView*>::const_iterator i; QMap<WalletModel*, WalletView*>::const_iterator i;
for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
i.value()->gotoReceiveCoinsPage(); i.value()->gotoReceiveCoinsPage();
} }
void WalletFrame::gotoSendCoinsPage(QString addr) void WalletFrame::gotoSendCoinsPage(QString addr)
{ {
QMap<QString, WalletView*>::const_iterator i; QMap<WalletModel*, WalletView*>::const_iterator i;
for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
i.value()->gotoSendCoinsPage(addr); i.value()->gotoSendCoinsPage(addr);
} }

8
src/qt/walletframe.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2011-2018 The Bitcoin Core developers // Copyright (c) 2011-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -37,8 +37,8 @@ public:
void setClientModel(ClientModel *clientModel); void setClientModel(ClientModel *clientModel);
bool addWallet(WalletModel *walletModel); bool addWallet(WalletModel *walletModel);
bool setCurrentWallet(const QString& name); bool setCurrentWallet(WalletModel* wallet_model);
bool removeWallet(const QString &name); bool removeWallet(WalletModel* wallet_model);
void removeAllWallets(); void removeAllWallets();
bool handlePaymentRequest(const SendCoinsRecipient& recipient); bool handlePaymentRequest(const SendCoinsRecipient& recipient);
@ -53,7 +53,7 @@ private:
QStackedWidget *walletStack; QStackedWidget *walletStack;
BitcoinGUI *gui; BitcoinGUI *gui;
ClientModel *clientModel; ClientModel *clientModel;
QMap<QString, WalletView*> mapWalletViews; QMap<WalletModel*, WalletView*> mapWalletViews;
bool bOutOfSync; bool bOutOfSync;