monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 08:17:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #129

Browse source 
01add29 Transfer: display number of split tx in transaction confirmation popup (Ilya Kitaev)
This commit is contained in:
Riccardo Spagni 2016-11-12 17:53:35 +02:00
commit 77b54e0e7e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
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("\nFee: ") + walletManager.displayAmount(transaction.fee)
+ qsTr("\n\nMixin: ") + mixinCount
+ qsTr("\n\nDescription: ") + transactionDescription;
+ qsTr("\n\Number of transactions: ") + transaction.txCount
+ qsTr("\n\nDescription: ") + transactionDescription
+ translationManager.emptyString
transactionConfirmationPopup.icon = StandardIcon.Question
transactionConfirmationPopup.open()

11
src/libwalletqt/PendingTransaction.cpp
View file

@ -31,15 +31,22 @@ quint64 PendingTransaction::fee() const
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();
for (const auto &t: txid)
list.append(QString::fromStdString(t));
return list;
}
quint64 PendingTransaction::txCount() const
{
return m_pimpl->txCount();
}
PendingTransaction::PendingTransaction(Bitmonero::PendingTransaction *pt, QObject *parent)
: 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 dust READ dust)
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:
enum Status {
@ -40,7 +41,9 @@ public:
quint64 amount() const;
quint64 dust() const;
quint64 fee() const;
QList<QString> txid() const;
QStringList txid() const;
quint64 txCount() const;
private:
explicit PendingTransaction(Bitmonero::PendingTransaction * pt, QObject *parent = 0);