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

Merge pull request #147

Browse Source 
6914656 Fix sum of selected transactions being slighty off (moneromooo.monero)
This commit is contained in:
Riccardo Spagni
2016-11-11 12:47:04 +02:00
parent a2d2455837 69146567bf
commit 29220fa09e
6 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libwalletqt/TransactionInfo.cpp
View File

@@ -25,6 +25,11 @@ double TransactionInfo::amount() const
return WalletManager::instance()->displayAmount(m_pimpl->amount()).toDouble();
}
quint64 TransactionInfo::atomicAmount() const
{
return m_pimpl->amount();
}
QString TransactionInfo::displayAmount() const
{
return WalletManager::instance()->displayAmount(m_pimpl->amount());

2
src/libwalletqt/TransactionInfo.h
View File

@@ -12,6 +12,7 @@ class TransactionInfo : public QObject
Q_PROPERTY(bool isPending READ isPending)
Q_PROPERTY(bool isFailed READ isFailed)
Q_PROPERTY(double amount READ amount)
Q_PROPERTY(quint64 atomicAmount READ atomicAmount)
Q_PROPERTY(QString displayAmount READ displayAmount)
Q_PROPERTY(QString fee READ fee)
Q_PROPERTY(quint64 blockHeight READ blockHeight)
@@ -42,6 +43,7 @@ public:
bool isPending() const;
bool isFailed() const;
double amount() const;
quint64 atomicAmount() const;
QString displayAmount() const;
QString fee() const;
quint64 blockHeight() const;

5
src/libwalletqt/WalletManager.h
View File

@@ -101,6 +101,11 @@ public:
void setLogLevel(int logLevel);
Q_INVOKABLE quint64 add(quint64 x, quint64 y) const { return x + y; }
Q_INVOKABLE quint64 sub(quint64 x, quint64 y) const { return x - y; }
Q_INVOKABLE qint64 addi(qint64 x, qint64 y) const { return x + y; }
Q_INVOKABLE qint64 subi(qint64 x, qint64 y) const { return x - y; }
signals:
void walletOpened(Wallet * wallet);