monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2714

Browse source 
50f3e67 Receive: buttons in rows + labels + 3D depth + FontAwesome icons (rating89us)
This commit is contained in:
luigi1111 2020-01-23 10:06:51 -05:00
commit a807dcd5df
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
6 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
images/download-white.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 214 B

BIN
images/download-white@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 255 B

BIN
images/external-link-white.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 246 B

BIN
images/external-link-white@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 323 B

55
pages/Receive.qml
View file

@ -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,
'');
}
}
}

4
qml.qrc
View file

@ -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>