github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-12-25 01:53:43 +01:00
Code Releases Activity

Merge pull request #65

Browse Source 
58cae5b Receive: allow integrated addresses from custom payment ids (moneromooo.monero)
This commit is contained in:
Riccardo Spagni 2016-10-24 10:31:54 +02:00
commit 08c7ff2ca4
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pages/Receive.qml
View File

@ -41,16 +41,19 @@ Rectangle {
property alias paymentIdText : paymentIdLine.text property alias paymentIdText : paymentIdLine.text
property alias integratedAddressText : integratedAddressLine.text property alias integratedAddressText : integratedAddressLine.text
function updatePaymentId() { function updatePaymentId(payment_id) {
var payment_id = appWindow.persistentSettings.payment_id if (typeof appWindow.currentWallet === 'undefined')
if (typeof appWindow.currentWallet !== 'undefined') { return
// generate a new one if not given as argument
if (typeof payment_id === 'undefined') {
payment_id = appWindow.currentWallet.generatePaymentId() payment_id = appWindow.currentWallet.generatePaymentId()
appWindow.persistentSettings.payment_id = payment_id appWindow.persistentSettings.payment_id = payment_id
addressLine.text = appWindow.currentWallet.address paymentIdLine.text = payment_id
integratedAddressLine.text = appWindow.currentWallet.integratedAddress(payment_id)
} }
addressLine.text = appWindow.currentWallet.address
paymentIdLine.text = payment_id integratedAddressLine.text = appWindow.currentWallet.integratedAddress(payment_id)
if (integratedAddressLine.text === "")
integratedAddressLine.text = qsTr("Invalid payment ID")
} }
Clipboard { id: clipboard } Clipboard { id: clipboard }
@ -148,6 +151,7 @@ Rectangle {
fontSize: mainLayout.lineEditFontSize fontSize: mainLayout.lineEditFontSize
placeholderText: qsTr("Payment ID here") + translationManager.emptyString; placeholderText: qsTr("Payment ID here") + translationManager.emptyString;
readOnly: false readOnly: false
onTextChanged: updatePaymentId(paymentIdLine.text)
width: mainLayout.editWidth width: mainLayout.editWidth
Layout.fillWidth: true Layout.fillWidth: true