diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-11-25 18:33:47 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-11-25 18:33:47 -0600 |
| commit | 0b73229f6c515c2d6b5408aedf2a24ddd03067f2 (patch) | |
| tree | 9cdd6bd9f0a892b39c5beedeb6b0c027f8d8739e | |
| parent | 0e21b3cfda47caa8d48e1636b5f91da7ed9f0ec5 (diff) | |
| parent | 3b36dc997cceda992fbd8c63a3839e8727a48295 (diff) | |
| download | monzero-gui-0b73229f6c515c2d6b5408aedf2a24ddd03067f2.tar.gz monzero-gui-0b73229f6c515c2d6b5408aedf2a24ddd03067f2.tar.xz monzero-gui-0b73229f6c515c2d6b5408aedf2a24ddd03067f2.zip | |
Merge pull request #1706
12a3d68 receive: fix Amount and QR-Code layout (xiphon)
3b36dc9 receive: add Payment URL (xiphon)
| -rw-r--r-- | pages/Receive.qml | 70 |
1 files changed, 40 insertions, 30 deletions
diff --git a/pages/Receive.qml b/pages/Receive.qml index dbfa325c..ea443502 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -443,7 +443,7 @@ Rectangle { Layout.fillWidth: true Layout.minimumWidth: 200 - Layout.maximumWidth: mainLayout.qrCodeSize + spacing: parent.spacing LineEdit { id: amountToReceiveLine @@ -456,45 +456,55 @@ Rectangle { regExp: /(\d{1,8})([.]\d{1,12})?$/ } } - } - Rectangle { - color: "white" - Layout.topMargin: parent.spacing - 4 - Layout.fillWidth: true - Layout.maximumWidth: mainLayout.qrCodeSize - Layout.preferredHeight: width - radius: 4 + Rectangle { + color: "white" - Image { - id: qrCode - anchors.fill: parent - anchors.margins: 1 + Layout.fillWidth: true + Layout.maximumWidth: mainLayout.qrCodeSize + Layout.preferredHeight: width + radius: 4 - smooth: false - fillMode: Image.PreserveAspectFit - source: "image://qrcode/" + makeQRCodeString() - MouseArea { + Image { + id: qrCode anchors.fill: parent - acceptedButtons: Qt.RightButton - onClicked: { - if (mouse.button == Qt.RightButton) - qrMenu.open() + anchors.margins: 1 + + smooth: false + fillMode: Image.PreserveAspectFit + source: "image://qrcode/" + makeQRCodeString() + MouseArea { + anchors.fill: parent + acceptedButtons: Qt.RightButton + onClicked: { + if (mouse.button == Qt.RightButton) + qrMenu.open() + } + onPressAndHold: qrFileDialog.open() } - onPressAndHold: qrFileDialog.open() } - } - Menu { - id: qrMenu - title: "QrCode" - y: parent.height / 2 + Menu { + id: qrMenu + title: "QrCode" + y: parent.height / 2 - MenuItem { - text: qsTr("Save As") + translationManager.emptyString; - onTriggered: qrFileDialog.open() + MenuItem { + text: qsTr("Save As") + translationManager.emptyString; + onTriggered: qrFileDialog.open() + } } } + + LineEdit { + id: paymentUrl + Layout.fillWidth: true + labelText: qsTr("Payment URL") + translationManager.emptyString + text: makeQRCodeString() + onTextUpdated: function() { paymentUrl.cursorPosition = 0; } + readOnly: true + copyButton: true + } } } |