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 #117

Browse source 
142e348 Transfer: use the new error LineEdit property to highlight bad fields (moneromooo.monero)
b97d0a9 LineEdit: add an error property (moneromooo.monero)
5fb4e89 Transfer: remove spammy debug traces (moneromooo.monero)
This commit is contained in:
Riccardo Spagni 2016-11-09 20:43:33 +02:00
commit 1e249c1624
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/LineEdit.qml
View file

@ -35,10 +35,18 @@ Item {
property alias readOnly : input.readOnly
property alias cursorPosition: input.cursorPosition
property int fontSize: 18
property bool error: false
height: 37
function getColor(error) {
if (error)
return "#FFDDDD"
else
return "#FFFFFF"
}
Rectangle {
anchors.fill: parent
anchors.bottomMargin: 1
@ -49,7 +57,7 @@ Item {
Rectangle {
anchors.fill: parent
anchors.topMargin: 1
color: "#FFFFFF"
color: getColor(error)
//radius: 4
}

24
pages/Transfer.qml
View file

@ -244,18 +244,32 @@ Rectangle {
}
function checkAddressAndPaymentID(address, payment_id, testnet) {
print ("testing")
if (!walletManager.addressValid(address, testnet))
return false
print ("address is valid")
var ipid = walletManager.paymentIdFromAddress(address, testnet)
print ("ipid: [" + ipid + "]")
if (ipid.length > 0)
return payment_id === ""
print ("payment_id: [" + payment_id + "]")
return payment_id === "" || walletManager.paymentIdValid(payment_id)
}
function checkInformation(amount, address, payment_id, testnet) {
address = address.trim()
payment_id = payment_id.trim()
var amount_ok = amount.length > 0
var address_ok = walletManager.addressValid(address, testnet)
var payment_id_ok = payment_id.length == 0 || walletManager.paymentIdValid(payment_id)
var ipid = walletManager.paymentIdFromAddress(address, testnet)
if (ipid.length > 0 && payment_id.length > 0)
payment_id_ok = false
addressLine.error = !address_ok
amountLine.error = !amount_ok
paymentIdLine.error = !payment_id_ok
return amount_ok && address_ok && payment_id_ok
}
StandardButton {
id: sendButton
anchors.left: parent.left
@ -268,7 +282,7 @@ Rectangle {
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
enabled : amountLine.text.length > 0 && checkAddressAndPaymentID(addressLine.text.trim(), paymentIdLine.text.trim(), appWindow.persistentSettings.testnet)
enabled : checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet)
onClicked: {
console.log("Transfer: paymentClicked")
var priority = priorityModel.get(priorityDropdown.currentIndex).priority