Merge pull request #1836

ba2815b receive: add 'Download QR-Code image' and 'Copy Payment URL' buttons (xiphon)

6 files changed, 38 insertions, 68 deletions

diff --git a/images/download-white.png b/images/download-white.png
new file mode 100644
index 00000000..a8621352
--- /dev/null
+++ b/images/download-white.png
diff --git a/images/download-white@2x.png b/images/download-white@2x.png
new file mode 100644
index 00000000..c91be23b
--- /dev/null
+++ b/images/download-white@2x.png
diff --git a/images/external-link-white.png b/images/external-link-white.png
new file mode 100644
index 00000000..e771b8d1
--- /dev/null
+++ b/images/external-link-white.png
diff --git a/images/external-link-white@2x.png b/images/external-link-white@2x.png
new file mode 100644
index 00000000..b0a72f96
--- /dev/null
+++ b/images/external-link-white@2x.png
diff --git a/pages/Receive.qml b/pages/Receive.qml
index 2c840ab4..ee0a2554 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -270,83 +270,49 @@ Rectangle {
             }
         }
 
-        RowLayout {
-            Layout.topMargin: 22 * scaleRatio
-            MoneroComponents.CheckBox2 {
-                id: showAdvancedCheckbox
-                checked: persistentSettings.receiveShowAdvanced
-                onClicked: {
-                    persistentSettings.receiveShowAdvanced = !persistentSettings.receiveShowAdvanced
-                }
-                text: qsTr("Advanced options") + translationManager.emptyString
-            }
-        }
-
-        RowLayout {
-            Layout.topMargin: 6 * scaleRatio
-            visible: persistentSettings.receiveShowAdvanced
-            Layout.fillWidth: true
+        ColumnLayout {
+            Layout.alignment: Qt.AlignHCenter
+            spacing: 11 * scaleRatio
+            property int qrSize: 220 * scaleRatio
 
-            MoneroComponents.LineEditMulti {
-                id: paymentUrl
+            Rectangle {
+                id: qrContainer
+                color: "white"
                 Layout.fillWidth: true
+                Layout.maximumWidth: parent.qrSize
+                Layout.preferredHeight: width
+                radius: 4 * scaleRatio
 
-                labelText: qsTr("Payment URL") + translationManager.emptyString
-                text: TxUtils.makeQRCodeString(appWindow.current_address)
-                readOnly: true
-                copyButton: true
-                wrapMode: Text.WrapAnywhere
-            }
-        }
-
-        GridLayout{
-            visible: persistentSettings.receiveShowAdvanced
-            Layout.topMargin: 10 * scaleRatio
-            columns: 2
-            columnSpacing: 30 * scaleRatio
-
-            RowLayout {
-                property int qrSize: 220 * scaleRatio
-                Layout.fillWidth: true
+                Image {
+                    id: qrCode
+                    anchors.fill: parent
+                    anchors.margins: 1 * scaleRatio
 
-                Rectangle {
-                    id: qrContainer
-                    radius: 4 * scaleRatio
-                    color: "white"
-                    Layout.preferredWidth: parent.qrSize
-                    Layout.preferredHeight: parent.qrSize
+                    smooth: false
+                    fillMode: Image.PreserveAspectFit
+                    source: "image://qrcode/" + TxUtils.makeQRCodeString(appWindow.current_address)
 
-                    Image {
-                        id: qrCode
+                    MouseArea {
                         anchors.fill: parent
-                        anchors.margins: 1 * scaleRatio
-
-                        smooth: false
-                        fillMode: Image.PreserveAspectFit
-                        source: "image://qrcode/" + TxUtils.makeQRCodeString(appWindow.current_address)
-
-                        MouseArea {
-                            anchors.fill: parent
-                            acceptedButtons: Qt.RightButton
-                            onClicked: {
-                                if (mouse.button == Qt.RightButton){
-                                    qrMenu.x = this.mouseX;
-                                    qrMenu.y = this.mouseY;
-                                    qrMenu.open()
-                                }
-                            }
-                            onPressAndHold: qrFileDialog.open()
-                        }
+                        acceptedButtons: Qt.RightButton
+                        onPressAndHold: qrFileDialog.open()
                     }
+                }
+            }
+
+            RowLayout {
+                spacing: parent.spacing
 
-                    Menu {
-                        id: qrMenu
-                        title: "QrCode"
+                MoneroComponents.StandardButton {
+                    rightIcon: "../images/download-white.png"
+                    onClicked: qrFileDialog.open()
+                }
 
-                        MenuItem {
-                            text: qsTr("Save As") + translationManager.emptyString;
-                            onTriggered: qrFileDialog.open()
-                        }
+                MoneroComponents.StandardButton {
+                    rightIcon: "../images/external-link-white.png"
+                    onClicked: {
+                        clipboard.setText(TxUtils.makeQRCodeString(appWindow.current_address));
+                        appWindow.showStatusMessage(qsTr("Copied to clipboard"), 3);
                     }
                 }
             }
diff --git a/qml.qrc b/qml.qrc
index f2c1cf4f..d6d37619 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -5,6 +5,10 @@
         <file>RightPanel.qml</file>
         <file>MiddlePanel.qml</file>
         <file>images/closeIcon.png</file>
+        <file>images/download-white.png</file>
+        <file>images/download-white@2x.png</file>
+        <file>images/external-link-white.png</file>
+        <file>images/external-link-white@2x.png</file>
         <file>images/helpIcon.png</file>
         <file>images/maximizeIcon.png</file>
         <file>images/minimizeIcon.png</file>