From 50f3e67e8165c6f459c1066fdb16ace74bdb15ba Mon Sep 17 00:00:00 2001 From: rating89us <45968869+rating89us@users.noreply.github.com> Date: Sat, 11 Jan 2020 20:36:30 -0300 Subject: [PATCH] Receive: buttons in rows + labels + 3D depth + FontAwesome icons --- images/download-white.png | Bin 214 -> 0 bytes images/download-white@2x.png | Bin 255 -> 0 bytes images/external-link-white.png | Bin 246 -> 0 bytes images/external-link-white@2x.png | Bin 323 -> 0 bytes pages/Receive.qml | 55 ++++++++++++++++-------------- qml.qrc | 4 --- 6 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 images/download-white.png delete mode 100644 images/download-white@2x.png delete mode 100644 images/external-link-white.png delete mode 100644 images/external-link-white@2x.png diff --git a/images/download-white.png b/images/download-white.png deleted file mode 100644 index a86213523105d4f2dbf9c2be3118cda87bafca13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z$hLzpWB=2SsX#%=64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1ToJzX3_ zEPCHg+Q@f6frGX7-|NhU5sV=PN(VW1PysVC_9=d-!69X~G7K3lb&7D~on+ zH57Vq`s9h-Hl0tNC~Q)j?ZN&_y;Ay9-o8Wc{r50-SGbL4AK;9(7Xy)^dJ+2dmO>uv;^SqBk{bS|t`|KCpXXN`f#dGTZecr-AcQAOm`njxgN@xNAPXS%F diff --git a/images/external-link-white.png b/images/external-link-white.png deleted file mode 100644 index e771b8d1693edc290193014c62ab53c8e5db7209..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z$hLzpWB=2SsX#%=64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1TwJzX3_ zEPB@lS@Ja)@OTS&$KTnQ`s8Zb!k~^Kk*?)lb}8YC8WWfrR+;kGicM$@NSVWV(`d27 z$4Qsj7=AtHY}zopr0KnK*TmS$7 diff --git a/images/external-link-white@2x.png b/images/external-link-white@2x.png deleted file mode 100644 index b0a72f96d4f82d8ef5bff6a88585e2fb4e38d57a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq ztocBg@yxb`%|JoP64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1SJc)B=- zM6|xWx|^@rfQL0edgGIBYo_G=w_>|mK5bclH?32h?Srk~A_pT4sVNfen)-&teKLzZCBRU9p_%4_d{UO)cHGKYHwgTYWv~+tbI(}9~k#dU3W7oWU&^| OFAScpelF{r5}E)JGI!bl 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 { + 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/download-white.png" - onClicked: qrFileDialog.open() + 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 { - 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 { - 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 @@ main.qml LeftPanel.qml MiddlePanel.qml - images/download-white.png - images/download-white@2x.png - images/external-link-white.png - images/external-link-white@2x.png components/Label.qml components/SettingsListItem.qml images/whatIsIcon.png