diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-08 23:54:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-08 23:54:09 +0200 |
| commit | a37279b05cfc2b229675e34af3eee73115ddebd9 (patch) | |
| tree | f65b9a199fb6e8c3e07d257ecf6a13d0fe604a5d | |
| parent | 5f8c05c640a1d9e6ef69047cfa94504cd09eb01d (diff) | |
| parent | d982c3da84f9844912123287595522fc64a1f67e (diff) | |
| download | monzero-gui-a37279b05cfc2b229675e34af3eee73115ddebd9.tar.gz monzero-gui-a37279b05cfc2b229675e34af3eee73115ddebd9.tar.xz monzero-gui-a37279b05cfc2b229675e34af3eee73115ddebd9.zip | |
Merge pull request #208
d982c3d Add fee multiplier info to priority levels (moneromooo.monero)
| -rw-r--r-- | components/PrivacyLevelSmall.qml | 6 | ||||
| -rw-r--r-- | components/TickDelegate.qml | 6 | ||||
| -rw-r--r-- | pages/Transfer.qml | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/components/PrivacyLevelSmall.qml b/components/PrivacyLevelSmall.qml index cb1cd36e..8c7f7e60 100644 --- a/components/PrivacyLevelSmall.qml +++ b/components/PrivacyLevelSmall.qml @@ -99,7 +99,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[0] !== undefined ? row.positions[0].currentX - 3 : 0) - width - text: qsTr("LOW") + translationManager.emptyString + text: qsTr("LOW (x1 fee)") + translationManager.emptyString } Text { @@ -110,7 +110,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[4] !== undefined ? row.positions[4].currentX - 3 : 0) - width - text: qsTr("MEDIUM") + translationManager.emptyString + text: qsTr("MEDIUM (x20 fee)") + translationManager.emptyString } Text { @@ -121,7 +121,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[13] !== undefined ? row.positions[13].currentX - 3 : 0) - width - text: qsTr("HIGH") + translationManager.emptyString + text: qsTr("HIGH (x166 fee)") + translationManager.emptyString } MouseArea { diff --git a/components/TickDelegate.qml b/components/TickDelegate.qml index 2163d3e7..c0cd49c0 100644 --- a/components/TickDelegate.qml +++ b/components/TickDelegate.qml @@ -52,9 +52,9 @@ Item { font.pixelSize: 12 color: "#4A4949" text: { - if(currentIndex === 0) return qsTr("LOW") + translationManager.emptyString - if(currentIndex === 3) return qsTr("MEDIUM") + translationManager.emptyString - if(currentIndex === 13) return qsTr("HIGH") + translationManager.emptyString + if(currentIndex === 0) return qsTr("LOW (x1 fee)") + translationManager.emptyString + if(currentIndex === 3) return qsTr("MEDIUM (x20 fee)") + translationManager.emptyString + if(currentIndex === 13) return qsTr("HIGH (x166 fee)") + translationManager.emptyString return "" } } diff --git a/pages/Transfer.qml b/pages/Transfer.qml index d2bfc213..5552902c 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -121,9 +121,9 @@ Rectangle { // code like this wont work: // ListElement { column1: qsTr("LOW") + translationManager.emptyString ; column2: ""; priority: PendingTransaction.Priority_Low } - ListElement { column1: qsTr("LOW") ; column2: ""; priority: PendingTransaction.Priority_Low } - ListElement { column1: qsTr("MEDIUM") ; column2: ""; priority: PendingTransaction.Priority_Medium } - ListElement { column1: qsTr("HIGH") ; column2: ""; priority: PendingTransaction.Priority_High } + ListElement { column1: qsTr("LOW (x1 fee)") ; column2: ""; priority: PendingTransaction.Priority_Low } + ListElement { column1: qsTr("MEDIUM (x20 fee)") ; column2: ""; priority: PendingTransaction.Priority_Medium } + ListElement { column1: qsTr("HIGH (x166 fee)") ; column2: ""; priority: PendingTransaction.Priority_High } } StandardDropdown { |