Merge pull request #263

a0fb4cc Remove fee multiplier info from low/high slider (moneromooo.monero)
This commit is contained in:
Riccardo Spagni 2016-12-14 23:35:19 +02:00
commit 82d87914cd
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 6 additions and 6 deletions

View file

@ -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 (x1 fee)") + translationManager.emptyString
text: qsTr("LOW") + 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 (x20 fee)") + translationManager.emptyString
text: qsTr("MEDIUM") + 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 (x166 fee)") + translationManager.emptyString
text: qsTr("HIGH") + translationManager.emptyString
}
MouseArea {

View file

@ -52,9 +52,9 @@ Item {
font.pixelSize: 12
color: "#4A4949"
text: {
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
if(currentIndex === 0) return qsTr("LOW") + translationManager.emptyString
if(currentIndex === 3) return qsTr("MEDIUM") + translationManager.emptyString
if(currentIndex === 13) return qsTr("HIGH") + translationManager.emptyString
return ""
}
}