Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Merge pull request #2626

Browse Source 
a83adb7 Transfer: improve warning flow (tobtoht)
This commit is contained in:
luigi1111
2019-12-19 19:45:33 -05:00
parent 4aac66a024 a83adb70ad
commit b963028f10
6 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libwalletqt/Wallet.cpp
View File

@@ -289,6 +289,11 @@ bool Wallet::viewOnly() const
return m_walletImpl->watchOnly();
}
quint64 Wallet::balance() const
{
return balance(m_currentSubaddressAccount);
}
quint64 Wallet::balance(quint32 accountIndex) const
{
return m_walletImpl->balance(accountIndex);
@@ -299,6 +304,11 @@ quint64 Wallet::balanceAll() const
return m_walletImpl->balanceAll();
}
quint64 Wallet::unlockedBalance() const
{
return unlockedBalance(m_currentSubaddressAccount);
}
quint64 Wallet::unlockedBalance(quint32 accountIndex) const
{
return m_walletImpl->unlockedBalance(accountIndex);

2
src/libwalletqt/Wallet.h
View File

@@ -160,10 +160,12 @@ public:
Q_INVOKABLE void setTrustedDaemon(bool arg);
//! returns balance
Q_INVOKABLE quint64 balance() const;
Q_INVOKABLE quint64 balance(quint32 accountIndex) const;
Q_INVOKABLE quint64 balanceAll() const;
//! returns unlocked balance
Q_INVOKABLE quint64 unlockedBalance() const;
Q_INVOKABLE quint64 unlockedBalance(quint32 accountIndex) const;
Q_INVOKABLE quint64 unlockedBalanceAll() const;

2
src/libwalletqt/WalletManager.cpp
View File

@@ -260,7 +260,7 @@ quint64 WalletManager::maximumAllowedAmount() const
return Monero::Wallet::maximumAllowedAmount();
}
QString WalletManager::maximumAllowedAmountAsSting() const
QString WalletManager::maximumAllowedAmountAsString() const
{
return WalletManager::displayAmount(WalletManager::maximumAllowedAmount());
}

2
src/libwalletqt/WalletManager.h
View File

@@ -135,7 +135,7 @@ public:
Q_INVOKABLE quint64 maximumAllowedAmount() const;
// QML JS engine doesn't support unsigned integers
Q_INVOKABLE QString maximumAllowedAmountAsSting() const;
Q_INVOKABLE QString maximumAllowedAmountAsString() const;
Q_INVOKABLE bool paymentIdValid(const QString &payment_id) const;
Q_INVOKABLE bool addressValid(const QString &address, NetworkType::Type nettype) const;