diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-11 12:47:04 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-11 12:47:04 +0200 |
| commit | 29220fa09ecb381970923572668e30d30cd7018e (patch) | |
| tree | 84213a4f10bab088b60437db26d3ae4c40a3cc20 /src/libwalletqt | |
| parent | a2d24558371d8ffce050b90980259a12846abf09 (diff) | |
| parent | 69146567bff3b2a580f56162f4a3635355df902a (diff) | |
| download | monzero-gui-29220fa09ecb381970923572668e30d30cd7018e.tar.gz monzero-gui-29220fa09ecb381970923572668e30d30cd7018e.tar.xz monzero-gui-29220fa09ecb381970923572668e30d30cd7018e.zip | |
Merge pull request #147
6914656 Fix sum of selected transactions being slighty off (moneromooo.monero)
Diffstat (limited to 'src/libwalletqt')
| -rw-r--r-- | src/libwalletqt/TransactionInfo.cpp | 5 | ||||
| -rw-r--r-- | src/libwalletqt/TransactionInfo.h | 2 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.h | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/libwalletqt/TransactionInfo.cpp b/src/libwalletqt/TransactionInfo.cpp index 248fd73e..fb096a14 100644 --- a/src/libwalletqt/TransactionInfo.cpp +++ b/src/libwalletqt/TransactionInfo.cpp @@ -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()); diff --git a/src/libwalletqt/TransactionInfo.h b/src/libwalletqt/TransactionInfo.h index f30f42fa..7e9396a1 100644 --- a/src/libwalletqt/TransactionInfo.h +++ b/src/libwalletqt/TransactionInfo.h @@ -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; diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index 7f8a583c..8e63050a 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -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); |