aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrating89us <45968869+rating89us@users.noreply.github.com>2020-01-11 20:36:30 -0300
committerrating89us <45968869+rating89us@users.noreply.github.com>2020-01-19 17:29:49 -0300
commit50f3e67e8165c6f459c1066fdb16ace74bdb15ba (patch)
treef8a904d7c93fa6f73fb68ec56119ee6d49ac8563
parentef2b0cfa4a7327d8e6fd086452890cebe55e3b6f (diff)
downloadmonzero-gui-50f3e67e8165c6f459c1066fdb16ace74bdb15ba.tar.gz
monzero-gui-50f3e67e8165c6f459c1066fdb16ace74bdb15ba.tar.xz
monzero-gui-50f3e67e8165c6f459c1066fdb16ace74bdb15ba.zip
Receive: buttons in rows + labels + 3D depth + FontAwesome icons
-rw-r--r--images/download-white.pngbin214 -> 0 bytes
-rw-r--r--images/download-white@2x.pngbin255 -> 0 bytes
-rw-r--r--images/external-link-white.pngbin246 -> 0 bytes
-rw-r--r--images/external-link-white@2x.pngbin323 -> 0 bytes
-rw-r--r--pages/Receive.qml55
-rw-r--r--qml.qrc4
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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>