monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 00:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1393

Browse source 
d003b25 use regex for value input
This commit is contained in:
luigi1111 2018-05-21 23:10:29 -05:00
commit 5b725a4f20
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pages/Receive.qml
View file

@ -57,7 +57,7 @@ Rectangle {
var nfields = 0 var nfields = 0
s += current_address; s += current_address;
var amount = amountToReceiveLine.text.trim() var amount = amountToReceiveLine.text.trim()
if (amount !== "") { if (amount !== "" && amount.slice(-1) !== ".") {
s += (nfields++ ? "&" : "?") s += (nfields++ ? "&" : "?")
s += "tx_amount=" + amount s += "tx_amount=" + amount
} }
@ -456,12 +456,8 @@ Rectangle {
placeholderText: qsTr("Amount to receive") + translationManager.emptyString placeholderText: qsTr("Amount to receive") + translationManager.emptyString
fontBold: true fontBold: true
inlineIcon: true inlineIcon: true
validator: DoubleValidator { validator: RegExpValidator {
bottom: 0.0 regExp: /(\d{1,8})([.]\d{1,12})?$/
top: 18446744.073709551615
decimals: 12
notation: DoubleValidator.StandardNotation
locale: "C"
} }
} }
} }

8
pages/Transfer.qml
View file

@ -193,12 +193,8 @@ Rectangle {
inlineButtonText: qsTr("All") + translationManager.emptyString inlineButtonText: qsTr("All") + translationManager.emptyString
inlineButton.onClicked: amountLine.text = "(all)" inlineButton.onClicked: amountLine.text = "(all)"
validator: DoubleValidator { validator: RegExpValidator {
bottom: 0.0 regExp: /(\d{1,8})([.]\d{1,12})?$/
top: 18446744.073709551615
decimals: 12
notation: DoubleValidator.StandardNotation
locale: "C"
} }
} }
} }