mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-13 07:28:59 +01:00
Bitcoin-Qt: tweak Qt walletXXX.cpp/h code
WalletView: - add new signal showNormalIfMinimized() - emit the new signal in handleURI() to fix a bug, preventing the main window to show up when using bitcoin: URIs WalletStack: - connect the showNormalIfMinimized() signal from WalletView with the showNormalIfMinimized() slot in BitcoinGUI - rework setCurrentWallet() to return a bool - add check for valid walletModel in addWallet() - add missing gui attribute initialisation in constructor WalletFrame: - remove unused or unneded class attributes gui and clientModel - add a check for valid clientModel in setClientModel() General: - small code formatting changes
This commit is contained in:
@@ -12,15 +12,13 @@
|
||||
#include <QMessageBox>
|
||||
|
||||
WalletFrame::WalletFrame(BitcoinGUI *_gui) :
|
||||
QFrame(_gui),
|
||||
gui(_gui),
|
||||
clientModel(0)
|
||||
QFrame(_gui)
|
||||
{
|
||||
// Leave HBox hook for adding a list view later
|
||||
QHBoxLayout *walletFrameLayout = new QHBoxLayout(this);
|
||||
setContentsMargins(0,0,0,0);
|
||||
walletStack = new WalletStack(this);
|
||||
walletStack->setBitcoinGUI(gui);
|
||||
walletStack->setBitcoinGUI(_gui);
|
||||
walletFrameLayout->setContentsMargins(0,0,0,0);
|
||||
walletFrameLayout->addWidget(walletStack);
|
||||
}
|
||||
@@ -31,8 +29,8 @@ WalletFrame::~WalletFrame()
|
||||
|
||||
void WalletFrame::setClientModel(ClientModel *clientModel)
|
||||
{
|
||||
this->clientModel = clientModel;
|
||||
walletStack->setClientModel(clientModel);
|
||||
if (clientModel)
|
||||
walletStack->setClientModel(clientModel);
|
||||
}
|
||||
|
||||
bool WalletFrame::addWallet(const QString& name, WalletModel *walletModel)
|
||||
@@ -43,8 +41,7 @@ bool WalletFrame::addWallet(const QString& name, WalletModel *walletModel)
|
||||
bool WalletFrame::setCurrentWallet(const QString& name)
|
||||
{
|
||||
// TODO: Check if valid name
|
||||
walletStack->setCurrentWallet(name);
|
||||
return true;
|
||||
return walletStack->setCurrentWallet(name);
|
||||
}
|
||||
|
||||
void WalletFrame::removeAllWallets()
|
||||
|
||||
Reference in New Issue
Block a user