diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-08 17:00:19 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-08 17:00:19 -0800 |
| commit | a8e90069d62adb684fe20b6fdc3d3dc28f8b40c9 (patch) | |
| tree | 18699f323787396d6b5178bad0a18c72dab24c9b | |
| parent | e286bd1422d3684d4637ab1efb495fe494eeac3f (diff) | |
| parent | dad9c8216687fa382b27cf3fd6a170fb52ca78c1 (diff) | |
| download | monzero-gui-a8e90069d62adb684fe20b6fdc3d3dc28f8b40c9.tar.gz monzero-gui-a8e90069d62adb684fe20b6fdc3d3dc28f8b40c9.tar.xz monzero-gui-a8e90069d62adb684fe20b6fdc3d3dc28f8b40c9.zip | |
Merge pull request #388
dad9c82 Receive.qml: PaymentID above Integrated address (xmr-eric)
| -rw-r--r-- | pages/Receive.qml | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/pages/Receive.qml b/pages/Receive.qml index 3787033e..773d14ed 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -204,39 +204,6 @@ Rectangle { } RowLayout { - id: integratedAddressRow - Label { - id: integratedAddressLabel - fontSize: 14 - text: qsTr("Integrated address") + translationManager.emptyString - width: mainLayout.labelWidth - } - - - LineEdit { - - id: integratedAddressLine - fontSize: mainLayout.lineEditFontSize - placeholderText: qsTr("ReadOnly wallet integrated address displayed here") + translationManager.emptyString - readOnly: true - width: mainLayout.editWidth - Layout.fillWidth: true - - onTextChanged: cursorPosition = 0 - - IconButton { - imageSource: "../images/copyToClipboard.png" - onClicked: { - if (integratedAddressLine.text.length > 0) { - clipboard.setText(integratedAddressLine.text) - } - } - } - - } - } - - RowLayout { id: paymentIdRow Label { id: paymentIdLabel @@ -282,6 +249,39 @@ Rectangle { } } } + + RowLayout { + id: integratedAddressRow + Label { + id: integratedAddressLabel + fontSize: 14 + text: qsTr("Integrated address") + translationManager.emptyString + width: mainLayout.labelWidth + } + + + LineEdit { + + id: integratedAddressLine + fontSize: mainLayout.lineEditFontSize + placeholderText: qsTr("ReadOnly wallet integrated address displayed here") + translationManager.emptyString + readOnly: true + width: mainLayout.editWidth + Layout.fillWidth: true + + onTextChanged: cursorPosition = 0 + + IconButton { + imageSource: "../images/copyToClipboard.png" + onClicked: { + if (integratedAddressLine.text.length > 0) { + clipboard.setText(integratedAddressLine.text) + } + } + } + + } + } RowLayout { id: amountRow |