diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-25 17:39:07 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-25 17:39:07 +0200 |
| commit | b3877868a31d42789dd480936bf89847a1cd979f (patch) | |
| tree | c3364fc94e41652b6df52d58b3eeecf78db02945 /pages | |
| parent | 716106c23e22e7e4075024319a5bd3d6f5dfb832 (diff) | |
| parent | 9c4c34d502e7179964061c6af72470e37f9257af (diff) | |
| download | monzero-gui-b3877868a31d42789dd480936bf89847a1cd979f.tar.gz monzero-gui-b3877868a31d42789dd480936bf89847a1cd979f.tar.xz monzero-gui-b3877868a31d42789dd480936bf89847a1cd979f.zip | |
Merge pull request #597
9c4c34d Use new fee multipliers after v5 fork requires #1915 (Jaquee)
f05f0b7 add WalletManager::useForkRules() (Jaquee)
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/Transfer.qml | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/pages/Transfer.qml b/pages/Transfer.qml index ef3a1f3b..d84f26d5 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -195,6 +195,17 @@ Rectangle { ListElement { column1: qsTr("High (x166 fee)") ; column2: ""; priority: PendingTransaction.Priority_High } } + // Priorites after v5 + ListModel { + id: priorityModelV5 + + ListElement { column1: qsTr("Low (x1 fee)") ; column2: ""; priority: 1} + ListElement { column1: qsTr("Default (x4 fee)") ; column2: ""; priority: 2 } + ListElement { column1: qsTr("Medium (x20 fee)") ; column2: ""; priority: 3 } + ListElement { column1: qsTr("High (x166 fee)") ; column2: ""; priority: 4 } + + } + StandardDropdown { id: priorityDropdown anchors.top: transactionPriority.bottom @@ -206,7 +217,6 @@ Rectangle { shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" pressedColor: "#FF4304" - dataModel: priorityModel z: 1 } @@ -700,6 +710,19 @@ Rectangle { console.log("transfer page loaded") updateStatus(); updateMixin(); + updatePriorityDropdown() + } + + function updatePriorityDropdown() { + // Use new fee multipliers after v5 fork + if (typeof currentWallet != "undefined" && currentWallet.useForkRules(5)) { + priorityDropdown.dataModel = priorityModelV5; + priorityDropdown.currentIndex = 1 + } else { + priorityDropdown.dataModel = priorityModel; + priorityDropdown.currentIndex = 0 + } + } //TODO: Add daemon sync status |