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 00:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #430

Browse source 
4e2e262 Main.qml: Ringsize equals mixin +1 (xmr-eric)
f1327ac Ringsize equals mixin +1 (xmr-eric)
2d12a3c Main.qml: Changed mixin to ring size (xmr-eric)
16f5889 Transfer.qml: Changed mixin to ring size (xmr-eric)
This commit is contained in:
Riccardo Spagni 2017-02-04 17:44:20 +02:00
commit 488e4e2b86
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.qml
View file

@ -468,7 +468,7 @@ ApplicationWindow {
+ (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId)) + (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId))
+ 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\nRing size: ") + mixinCount + 1
+ qsTr("\n\Number of transactions: ") + transaction.txCount + qsTr("\n\Number of transactions: ") + transaction.txCount
+ (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription)) + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription))
+ translationManager.emptyString + translationManager.emptyString

4
pages/Transfer.qml
View file

@ -74,7 +74,7 @@ Rectangle {
var mixin = scaleValueToMixinCount(fillLevel) var mixin = scaleValueToMixinCount(fillLevel)
print ("PrivacyLevel changed:" + fillLevel) print ("PrivacyLevel changed:" + fillLevel)
print ("mixin count: " + mixin) print ("mixin count: " + mixin)
privacyLabel.text = qsTr("Privacy level (mixin %1)").arg(mixin) + translationManager.emptyString privacyLabel.text = qsTr("Privacy level (ring size %1)").arg(mixin+1) + translationManager.emptyString
} }
function updateFromQrCode(address, payment_id, amount, tx_description, recipient_name) { function updateFromQrCode(address, payment_id, amount, tx_description, recipient_name) {
@ -588,7 +588,7 @@ Rectangle {
+ (transaction.paymentId[i] == "" ? "" : qsTr("\n\payment ID: ") + transaction.paymentId[i]) + (transaction.paymentId[i] == "" ? "" : qsTr("\n\payment ID: ") + transaction.paymentId[i])
+ qsTr("\nAmount: ") + walletManager.displayAmount(transaction.amount(i)) + qsTr("\nAmount: ") + walletManager.displayAmount(transaction.amount(i))
+ qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee(i)) + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee(i))
+ qsTr("\nMixin: ") + transaction.mixin(i) + qsTr("\nRing size: ") + transaction.mixin(i+1)
// TODO: add descriptions to unsigned_tx_set? // TODO: add descriptions to unsigned_tx_set?
// + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription)) // + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription))