github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2025-01-08 18:26:23 +01:00
Code Releases Activity

Merge pull request #1706

Browse Source 
12a3d68 receive: fix Amount and QR-Code layout (xiphon)
3b36dc9 receive: add Payment URL (xiphon)
This commit is contained in:
luigi1111 2018-11-25 18:33:47 -06:00
commit 0b73229f6c
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pages/Receive.qml
View File

@ -443,7 +443,7 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: 200 Layout.minimumWidth: 200
Layout.maximumWidth: mainLayout.qrCodeSize spacing: parent.spacing
LineEdit { LineEdit {
id: amountToReceiveLine id: amountToReceiveLine
@ -456,11 +456,10 @@ Rectangle {
regExp: /(\d{1,8})([.]\d{1,12})?$/ regExp: /(\d{1,8})([.]\d{1,12})?$/
} }
} }
}
Rectangle { Rectangle {
color: "white" color: "white"
Layout.topMargin: parent.spacing - 4
Layout.fillWidth: true Layout.fillWidth: true
Layout.maximumWidth: mainLayout.qrCodeSize Layout.maximumWidth: mainLayout.qrCodeSize
Layout.preferredHeight: width Layout.preferredHeight: width
@ -496,6 +495,17 @@ Rectangle {
} }
} }
} }
LineEdit {
id: paymentUrl
Layout.fillWidth: true
labelText: qsTr("Payment URL") + translationManager.emptyString
text: makeQRCodeString()
onTextUpdated: function() { paymentUrl.cursorPosition = 0; }
readOnly: true
copyButton: true
}
}
} }
ColumnLayout { ColumnLayout {