diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-05-21 23:10:29 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-05-21 23:10:29 -0500 |
| commit | 5b725a4f20bd692d390e0023944b00ba8fd62563 (patch) | |
| tree | fc27f86c0d1ab331292e21350c68779d3e596ce1 | |
| parent | 82d925a1d84a498b29ddb9c5824acf08073de205 (diff) | |
| parent | d003b255b96671346b741072265212cd8af15ddd (diff) | |
| download | monzero-gui-5b725a4f20bd692d390e0023944b00ba8fd62563.tar.gz monzero-gui-5b725a4f20bd692d390e0023944b00ba8fd62563.tar.xz monzero-gui-5b725a4f20bd692d390e0023944b00ba8fd62563.zip | |
Merge pull request #1393
d003b25 use regex for value input
| -rw-r--r-- | pages/Receive.qml | 10 | ||||
| -rw-r--r-- | pages/Transfer.qml | 8 |
2 files changed, 5 insertions, 13 deletions
diff --git a/pages/Receive.qml b/pages/Receive.qml index 515c7e81..79b3e22b 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -57,7 +57,7 @@ Rectangle { var nfields = 0 s += current_address; var amount = amountToReceiveLine.text.trim() - if (amount !== "") { + if (amount !== "" && amount.slice(-1) !== ".") { s += (nfields++ ? "&" : "?") s += "tx_amount=" + amount } @@ -456,12 +456,8 @@ Rectangle { placeholderText: qsTr("Amount to receive") + translationManager.emptyString fontBold: true inlineIcon: true - validator: DoubleValidator { - bottom: 0.0 - top: 18446744.073709551615 - decimals: 12 - notation: DoubleValidator.StandardNotation - locale: "C" + validator: RegExpValidator { + regExp: /(\d{1,8})([.]\d{1,12})?$/ } } } diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 8a029deb..38100a5b 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -193,12 +193,8 @@ Rectangle { inlineButtonText: qsTr("All") + translationManager.emptyString inlineButton.onClicked: amountLine.text = "(all)" - validator: DoubleValidator { - bottom: 0.0 - top: 18446744.073709551615 - decimals: 12 - notation: DoubleValidator.StandardNotation - locale: "C" + validator: RegExpValidator { + regExp: /(\d{1,8})([.]\d{1,12})?$/ } } } |