aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2017-12-17 12:28:57 -0600
committerluigi1111 <luigi1111w@gmail.com>2017-12-17 12:28:57 -0600
commitf9447fa4a1ef17a9145fce13e911a7e910ec02b3 (patch)
tree6b9f9d0f5ab2ff11c3213fd4361679f8be2aee5f
parentfbd508781e7104800a36e73998a98029093bac4d (diff)
parentbdffc7d12b8519b6e4658f45335a4d6cd089c106 (diff)
downloadmonzero-gui-f9447fa4a1ef17a9145fce13e911a7e910ec02b3.tar.gz
monzero-gui-f9447fa4a1ef17a9145fce13e911a7e910ec02b3.tar.xz
monzero-gui-f9447fa4a1ef17a9145fce13e911a7e910ec02b3.zip
Merge pull request #989
bdffc7d Transfer: remove pre-v5 priority list (followup for #824)
-rw-r--r--pages/Transfer.qml13
1 files changed, 2 insertions, 11 deletions
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 29ca46ed..d4564f4f 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -184,15 +184,6 @@ Rectangle {
// For translations to work, the strings need to be listed in
// the file components/StandardDropdown.qml too.
- // Priorities before v5
- ListModel {
- id: priorityModel
-
- 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 }
- }
-
// Priorites after v5
ListModel {
id: priorityModelV5
@@ -335,7 +326,7 @@ Rectangle {
enabled : !appWindow.viewOnly && pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet)
onClicked: {
console.log("Transfer: paymentClicked")
- var priority = priorityModel.get(priorityDropdown.currentIndex).priority
+ var priority = priorityModelV5.get(priorityDropdown.currentIndex).priority
console.log("priority: " + priority)
console.log("amount: " + amountLine.text)
addressLine.text = addressLine.text.trim()
@@ -478,7 +469,7 @@ Rectangle {
enabled: pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet)
onClicked: {
console.log("Transfer: saveTx Clicked")
- var priority = priorityModel.get(priorityDropdown.currentIndex).priority
+ var priority = priorityModelV5.get(priorityDropdown.currentIndex).priority
console.log("priority: " + priority)
console.log("amount: " + amountLine.text)
addressLine.text = addressLine.text.trim()