diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-04-19 11:37:02 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-04-19 11:37:02 -0500 |
| commit | d72e9873d1d1daf99d8095504848f71836f15ef9 (patch) | |
| tree | de8831c05c5e8ec296cee3dfa03512920d6b5798 | |
| parent | 46dc634a5c8750b76b33a1f3f9b87546686dd741 (diff) | |
| parent | f04a9e07e13d0140c0a82799d428c0cd7e287105 (diff) | |
| download | monzero-gui-d72e9873d1d1daf99d8095504848f71836f15ef9.tar.gz monzero-gui-d72e9873d1d1daf99d8095504848f71836f15ef9.tar.xz monzero-gui-d72e9873d1d1daf99d8095504848f71836f15ef9.zip | |
Merge pull request #1320
f04a9e0 single colour privacy level
| -rw-r--r-- | components/PrivacyLevel.qml | 6 | ||||
| -rw-r--r-- | components/PrivacyLevelSmall.qml | 6 | ||||
| -rw-r--r-- | pages/Transfer.qml | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/components/PrivacyLevel.qml b/components/PrivacyLevel.qml index 448eb123..9cfe09d1 100644 --- a/components/PrivacyLevel.qml +++ b/components/PrivacyLevel.qml @@ -62,11 +62,7 @@ Item { //radius: 2 width: row.x - color: { - if(item.fillLevel < 3) return "#FF6C3C" - if(item.fillLevel < 13) return "#AAFFBB" - return "#36B25C" - } + color: "#FF6C3C" Timer { interval: 500 diff --git a/components/PrivacyLevelSmall.qml b/components/PrivacyLevelSmall.qml index c380d6a7..7b869044 100644 --- a/components/PrivacyLevelSmall.qml +++ b/components/PrivacyLevelSmall.qml @@ -71,11 +71,7 @@ Item { //radius: 2 width: row.x - color: { - if(item.fillLevel < 5) return "#FF6C3C" - if(item.fillLevel < 13) return "#AAFFBB" - return "#36B25C" - } + color: "#FF6C3C" Timer { interval: 500 diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 0a339f98..43578e34 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -79,7 +79,7 @@ Rectangle { var mixin = scaleValueToMixinCount(fillLevel) console.log("PrivacyLevel changed:" + fillLevel) console.log("mixin count: " + mixin) - privacyLabel.text = qsTr("Privacy level (ringsize %1)").arg(mixin+1) + translationManager.emptyString + privacyLabel.text = qsTr("Ring size: %1").arg(mixin+1) + translationManager.emptyString } function updateFromQrCode(address, payment_id, amount, tx_description, recipient_name) { |