mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-13 20:06:34 +02:00
Transfer: display number of split tx in transaction confirmation popup
This commit is contained in:
parent
b8b2d148f1
commit
01add29a74
19
main.qml
19
main.qml
@ -1,21 +1,21 @@
|
|||||||
// Copyright (c) 2014-2015, The Monero Project
|
// Copyright (c) 2014-2015, The Monero Project
|
||||||
//
|
//
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
//
|
//
|
||||||
// Redistribution and use in source and binary forms, with or without modification, are
|
// Redistribution and use in source and binary forms, with or without modification, are
|
||||||
// permitted provided that the following conditions are met:
|
// permitted provided that the following conditions are met:
|
||||||
//
|
//
|
||||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
// conditions and the following disclaimer.
|
// conditions and the following disclaimer.
|
||||||
//
|
//
|
||||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
// of conditions and the following disclaimer in the documentation and/or other
|
// of conditions and the following disclaimer in the documentation and/or other
|
||||||
// materials provided with the distribution.
|
// materials provided with the distribution.
|
||||||
//
|
//
|
||||||
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
// used to endorse or promote products derived from this software without specific
|
// used to endorse or promote products derived from this software without specific
|
||||||
// prior written permission.
|
// prior written permission.
|
||||||
//
|
//
|
||||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
@ -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()
|
||||||
@ -417,9 +418,9 @@ ApplicationWindow {
|
|||||||
", description: ", description);
|
", description: ", description);
|
||||||
|
|
||||||
showProcessingSplash("Creating transaction");
|
showProcessingSplash("Creating transaction");
|
||||||
|
|
||||||
transactionDescription = description;
|
transactionDescription = description;
|
||||||
|
|
||||||
// validate amount;
|
// validate amount;
|
||||||
var amountxmr = walletManager.amountFromString(amount);
|
var amountxmr = walletManager.amountFromString(amount);
|
||||||
console.log("integer amount: ", amountxmr);
|
console.log("integer amount: ", amountxmr);
|
||||||
|
@ -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)
|
||||||
{
|
{
|
||||||
|
@ -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);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user