sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[qt] WalletModel: Expose disablewallet

Browse Source
This commit is contained in:
MarcoFalke 2016-09-21 12:37:00 +02:00
parent fa58edbffe
commit 6666ca6379
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/bitcoingui.cpp
View File

@ -77,6 +77,7 @@ const QString BitcoinGUI::DEFAULT_WALLET = "~Default";
BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent) : BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
enableWallet(false),
clientModel(0), clientModel(0),
walletFrame(0), walletFrame(0),
unitDisplayControl(0), unitDisplayControl(0),
@ -122,10 +123,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
QString windowTitle = tr(PACKAGE_NAME) + " - "; QString windowTitle = tr(PACKAGE_NAME) + " - ";
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
/* if compiled with wallet support, -disablewallet can still disable the wallet */ enableWallet = WalletModel::isWalletEnabled();
enableWallet = !GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
#else
enableWallet = false;
#endif // ENABLE_WALLET #endif // ENABLE_WALLET
if(enableWallet) if(enableWallet)
{ {

5
src/qt/walletmodel.cpp
View File

@ -684,6 +684,11 @@ bool WalletModel::abandonTransaction(uint256 hash) const
return wallet->AbandonTransaction(hash); return wallet->AbandonTransaction(hash);
} }
bool WalletModel::isWalletEnabled()
{
return !GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
}
bool WalletModel::hdEnabled() const bool WalletModel::hdEnabled() const
{ {
return wallet->IsHDEnabled(); return wallet->IsHDEnabled();

2
src/qt/walletmodel.h
View File

@ -203,6 +203,8 @@ public:
bool transactionCanBeAbandoned(uint256 hash) const; bool transactionCanBeAbandoned(uint256 hash) const;
bool abandonTransaction(uint256 hash) const; bool abandonTransaction(uint256 hash) const;
static bool isWalletEnabled();
bool hdEnabled() const; bool hdEnabled() const;
private: private: