monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-24 12:39:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #567

Browse source 
51074a8 Add a clear payment ID button (Michael Campagnaro)
43a33e7 Don't set a default payment ID on receive page (Michael Campagnaro)
This commit is contained in:
Riccardo Spagni 2017-03-19 23:49:50 +02:00
commit 1fe0600e1e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
pages/Receive.qml
View file

@ -51,16 +51,23 @@ Rectangle {
function updatePaymentId(payment_id) { function updatePaymentId(payment_id) {
if (typeof appWindow.currentWallet === 'undefined' || appWindow.currentWallet == null) if (typeof appWindow.currentWallet === 'undefined' || appWindow.currentWallet == null)
return return
// generate a new one if not given as argument // generate a new one if not given as argument
if (typeof payment_id === 'undefined') { if (typeof payment_id === 'undefined') {
payment_id = appWindow.currentWallet.generatePaymentId() payment_id = appWindow.currentWallet.generatePaymentId()
appWindow.persistentSettings.payment_id = payment_id
paymentIdLine.text = payment_id paymentIdLine.text = payment_id
} }
addressLine.text = appWindow.currentWallet.address
integratedAddressLine.text = appWindow.currentWallet.integratedAddress(payment_id) if (payment_id.length > 0) {
if (integratedAddressLine.text === "") integratedAddressLine.text = appWindow.currentWallet.integratedAddress(payment_id)
integratedAddressLine.text = qsTr("Invalid payment ID") if (integratedAddressLine.text === "")
integratedAddressLine.text = qsTr("Invalid payment ID")
}
else {
paymentIdLine.text = ""
integratedAddressLine.text = ""
}
update() update()
} }
@ -242,14 +249,22 @@ Rectangle {
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
pressedColor: "#FF4304" pressedColor: "#FF4304"
text: qsTr("Generate") + translationManager.emptyString; text: qsTr("Generate") + translationManager.emptyString;
anchors.right: parent.right onClicked: updatePaymentId()
onClicked: { }
appWindow.persistentSettings.payment_id = appWindow.currentWallet.generatePaymentId();
updatePaymentId() StandardButton {
} id: clearPaymentId
enabled: !!paymentIdLine.text
width: 80
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Clear") + translationManager.emptyString;
onClicked: updatePaymentId("")
} }
} }
RowLayout { RowLayout {
id: integratedAddressRow id: integratedAddressRow
Label { Label {
@ -414,12 +429,14 @@ Rectangle {
function onPageCompleted() { function onPageCompleted() {
console.log("Receive page loaded"); console.log("Receive page loaded");
if(addressLine.text.length === 0 || addressLine.text !== appWindow.currentWallet.address) { if (appWindow.currentWallet) {
updatePaymentId() if (addressLine.text.length === 0 || addressLine.text !== appWindow.currentWallet.address) {
addressLine.text = appWindow.currentWallet.address
}
} }
update() update()
timer.running = true timer.running = true
} }
function onPageClosed() { function onPageClosed() {