Merge pull request #2714

50f3e67 Receive: buttons in rows + labels + 3D depth + FontAwesome icons (rating89us)

6 files changed, 30 insertions, 29 deletions

diff --git a/images/download-white.png b/images/download-white.png
deleted file mode 100644
index a8621352..00000000
--- a/images/download-white.png
+++ /dev/null
diff --git a/images/download-white@2x.png b/images/download-white@2x.png
deleted file mode 100644
index c91be23b..00000000
--- a/images/download-white@2x.png
+++ /dev/null
diff --git a/images/external-link-white.png b/images/external-link-white.png
deleted file mode 100644
index e771b8d1..00000000
--- a/images/external-link-white.png
+++ /dev/null
diff --git a/images/external-link-white@2x.png b/images/external-link-white@2x.png
deleted file mode 100644
index b0a72f96..00000000
--- a/images/external-link-white@2x.png
+++ /dev/null
diff --git a/pages/Receive.qml b/pages/Receive.qml
index 04e7676e..3ed70b0f 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -290,34 +290,39 @@ Rectangle {
                 }
             }
 
-            RowLayout {
-                spacing: parent.spacing
-
-                MoneroComponents.StandardButton {
-                    rightIcon: "qrc:///images/download-white.png"
-                    onClicked: qrFileDialog.open()
-                }
+            MoneroComponents.StandardButton {
+                Layout.preferredWidth: 220
+                small: true
+                text: FontAwesome.save + "  %1".arg(qsTr("Save as image")) + translationManager.emptyString
+                label.font.family: FontAwesome.fontFamily
+                fontSize: 13
+                onClicked: qrFileDialog.open()
+            }
 
-                MoneroComponents.StandardButton {
-                    rightIcon: "qrc:///images/external-link-white.png"
-                    onClicked: {
-                        clipboard.setText(TxUtils.makeQRCodeString(appWindow.current_address));
-                        appWindow.showStatusMessage(qsTr("Copied to clipboard") + translationManager.emptyString, 3);
-                    }
+            MoneroComponents.StandardButton {
+                Layout.preferredWidth: 220
+                small: true
+                text: FontAwesome.clipboard + "  %1".arg(qsTr("Copy to clipboard")) + translationManager.emptyString
+                label.font.family: FontAwesome.fontFamily
+                fontSize: 13
+                onClicked: {
+                    clipboard.setText(TxUtils.makeQRCodeString(appWindow.current_address));
+                    appWindow.showStatusMessage(qsTr("Copied to clipboard") + translationManager.emptyString, 3);
                 }
+            }
 
-                MoneroComponents.StandardButton {
-                    text: FontAwesome.eye
-                    label.font.family: FontAwesome.fontFamily
-                    fontSize: 24
-                    width: 36
-                    visible: appWindow.currentWallet ? appWindow.currentWallet.isHwBacked() : false
-                    onClicked: {
-                        appWindow.currentWallet.deviceShowAddressAsync(
-                            appWindow.currentWallet.currentSubaddressAccount,
-                            appWindow.current_subaddress_table_index,
-                            '');
-                    }
+            MoneroComponents.StandardButton {
+                Layout.preferredWidth: 220
+                small: true
+                text: FontAwesome.eye + "  %1".arg(qsTr("Show on device")) + translationManager.emptyString
+                label.font.family: FontAwesome.fontFamily
+                fontSize: 13
+                visible: appWindow.currentWallet ? appWindow.currentWallet.isHwBacked() : false
+                onClicked: {
+                    appWindow.currentWallet.deviceShowAddressAsync(
+                        appWindow.currentWallet.currentSubaddressAccount,
+                        appWindow.current_subaddress_table_index,
+                        '');
                 }
             }
         }
diff --git a/qml.qrc b/qml.qrc
index c731d599..c6a4218d 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -3,10 +3,6 @@
         <file>main.qml</file>
         <file>LeftPanel.qml</file>
         <file>MiddlePanel.qml</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>components/Label.qml</file>
         <file>components/SettingsListItem.qml</file>
         <file>images/whatIsIcon.png</file>