monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-24 04:29:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Transfer: display number of split tx in transaction confirmation popup

Browse source
This commit is contained in:
Ilya Kitaev 2016-11-12 16:28:13 +03:00
parent b8b2d148f1
commit 01add29a74
3 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main.qml
View file

@ -398,7 +398,8 @@ ApplicationWindow {
+ qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount) + qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount)
+ qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee) + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee)
+ qsTr("\n\nMixin: ") + mixinCount + qsTr("\n\nMixin: ") + mixinCount
+ qsTr("\n\nDescription: ") + transactionDescription; + qsTr("\n\Number of transactions: ") + transaction.txCount
+ qsTr("\n\nDescription: ") + transactionDescription
+ translationManager.emptyString + translationManager.emptyString
transactionConfirmationPopup.icon = StandardIcon.Question transactionConfirmationPopup.icon = StandardIcon.Question
transactionConfirmationPopup.open() transactionConfirmationPopup.open()

11
src/libwalletqt/PendingTransaction.cpp
View file

@ -31,15 +31,22 @@ quint64 PendingTransaction::fee() const
return m_pimpl->fee(); return m_pimpl->fee();
} }
QList<QString> PendingTransaction::txid() const
QStringList PendingTransaction::txid() const
{ {
QList<QString> list; QStringList list;
std::vector<std::string> txid = m_pimpl->txid(); std::vector<std::string> txid = m_pimpl->txid();
for (const auto &t: txid) for (const auto &t: txid)
list.append(QString::fromStdString(t)); list.append(QString::fromStdString(t));
return list; return list;
} }
quint64 PendingTransaction::txCount() const
{
return m_pimpl->txCount();
}
PendingTransaction::PendingTransaction(Bitmonero::PendingTransaction *pt, QObject *parent) PendingTransaction::PendingTransaction(Bitmonero::PendingTransaction *pt, QObject *parent)
: QObject(parent), m_pimpl(pt) : QObject(parent), m_pimpl(pt)
{ {

7
src/libwalletqt/PendingTransaction.h
View file

@ -17,7 +17,8 @@ class PendingTransaction : public QObject
Q_PROPERTY(quint64 amount READ amount) Q_PROPERTY(quint64 amount READ amount)
Q_PROPERTY(quint64 dust READ dust) Q_PROPERTY(quint64 dust READ dust)
Q_PROPERTY(quint64 fee READ fee) Q_PROPERTY(quint64 fee READ fee)
Q_PROPERTY(QList<QString> txid READ txid) Q_PROPERTY(QStringList txid READ txid)
Q_PROPERTY(quint64 txCount READ txCount)
public: public:
enum Status { enum Status {
@ -40,7 +41,9 @@ public:
quint64 amount() const; quint64 amount() const;
quint64 dust() const; quint64 dust() const;
quint64 fee() const; quint64 fee() const;
QList<QString> txid() const; QStringList txid() const;
quint64 txCount() const;
private: private:
explicit PendingTransaction(Bitmonero::PendingTransaction * pt, QObject *parent = 0); explicit PendingTransaction(Bitmonero::PendingTransaction * pt, QObject *parent = 0);