From 16f5889a15316b775eeb7498011cc92fea0933da Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 23 Jan 2017 13:19:31 -0500 Subject: [PATCH 1/4] Transfer.qml: Changed mixin to ring size --- pages/Transfer.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 78dfde5e..f7f05e97 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -74,7 +74,7 @@ Rectangle { var mixin = scaleValueToMixinCount(fillLevel) print ("PrivacyLevel changed:" + fillLevel) 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) + translationManager.emptyString } // Information dialog @@ -560,7 +560,7 @@ Rectangle { + (transaction.paymentId[i] == "" ? "" : qsTr("\n\payment ID: ") + transaction.paymentId[i]) + qsTr("\nAmount: ") + walletManager.displayAmount(transaction.amount(i)) + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee(i)) - + qsTr("\nMixin: ") + transaction.mixin(i) + + qsTr("\nRing size: ") + transaction.mixin(i) // TODO: add descriptions to unsigned_tx_set? // + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription)) From 2d12a3cf3d492a0461ab34bd2691efc229a07e82 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 23 Jan 2017 13:20:15 -0500 Subject: [PATCH 2/4] Main.qml: Changed mixin to ring size --- main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.qml b/main.qml index e0f48142..7947dfa6 100644 --- a/main.qml +++ b/main.qml @@ -464,7 +464,7 @@ ApplicationWindow { + (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId)) + qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount) + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee) - + qsTr("\n\nMixin: ") + mixinCount + + qsTr("\n\nRing size: ") + mixinCount + qsTr("\n\Number of transactions: ") + transaction.txCount + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription)) + translationManager.emptyString From f1327ace32571d5d37e8827e66af961aa69c6956 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 30 Jan 2017 18:27:55 -0500 Subject: [PATCH 3/4] Ringsize equals mixin +1 --- pages/Transfer.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/Transfer.qml b/pages/Transfer.qml index f7f05e97..aa5be272 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -74,7 +74,7 @@ Rectangle { var mixin = scaleValueToMixinCount(fillLevel) print ("PrivacyLevel changed:" + fillLevel) print ("mixin count: " + mixin) - privacyLabel.text = qsTr("Privacy level (ring size %1)").arg(mixin) + translationManager.emptyString + privacyLabel.text = qsTr("Privacy level (ring size %1)").arg(mixin+1) + translationManager.emptyString } // Information dialog @@ -560,7 +560,7 @@ Rectangle { + (transaction.paymentId[i] == "" ? "" : qsTr("\n\payment ID: ") + transaction.paymentId[i]) + qsTr("\nAmount: ") + walletManager.displayAmount(transaction.amount(i)) + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee(i)) - + qsTr("\nRing size: ") + transaction.mixin(i) + + qsTr("\nRing size: ") + transaction.mixin(i+1) // TODO: add descriptions to unsigned_tx_set? // + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription)) From 4e2e262f6a1e5a8b34eef234ca888f7cef3ac110 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 30 Jan 2017 18:28:56 -0500 Subject: [PATCH 4/4] Main.qml: Ringsize equals mixin +1 --- main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.qml b/main.qml index 7947dfa6..353485a6 100644 --- a/main.qml +++ b/main.qml @@ -464,7 +464,7 @@ ApplicationWindow { + (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId)) + qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount) + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee) - + qsTr("\n\nRing size: ") + mixinCount + + qsTr("\n\nRing size: ") + mixinCount + 1 + qsTr("\n\Number of transactions: ") + transaction.txCount + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription)) + translationManager.emptyString