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 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Receive: "Show on device" button hidden on payment request tab + add tooltip

Browse source
This commit is contained in:
rating89us 2021-11-28 01:20:25 +01:00
parent c72729fa5d
commit cf64a6005e
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/StandardButton.qml
View file

@ -51,6 +51,7 @@ Item {
property alias tooltip: tooltip.text property alias tooltip: tooltip.text
property alias tooltipLeft: tooltip.tooltipLeft property alias tooltipLeft: tooltip.tooltipLeft
property alias tooltipPopup: tooltip.tooltipPopup property alias tooltipPopup: tooltip.tooltipPopup
property alias maximumTooltipWidth: tooltip.maximumTooltipWidth
signal clicked() signal clicked()
height: small ? 30 : 36 height: small ? 30 : 36

7
components/Tooltip.qml
View file

@ -34,11 +34,14 @@ import FontAwesome 1.0
import "." as MoneroComponents import "." as MoneroComponents
Rectangle { Rectangle {
id: root
property alias text: tooltip.text property alias text: tooltip.text
property alias tooltipPopup: popup property alias tooltipPopup: popup
property alias maximumTooltipWidth: root.maximumTooltipWidth
property bool tooltipIconVisible: false property bool tooltipIconVisible: false
property bool tooltipLeft: false property bool tooltipLeft: false
property bool tooltipBottom: tooltipIconVisible ? false : true property bool tooltipBottom: tooltipIconVisible ? false : true
property int maximumTooltipWidth: 370
color: "transparent" color: "transparent"
height: tooltipIconVisible ? icon.height : parent.height height: tooltipIconVisible ? icon.height : parent.height
@ -95,12 +98,12 @@ Rectangle {
delay: 200 delay: 200
RowLayout { RowLayout {
Layout.maximumWidth: 370 Layout.maximumWidth: maximumTooltipWidth
Text { Text {
id: tooltip id: tooltip
width: contentWidth width: contentWidth
Layout.maximumWidth: 370 Layout.maximumWidth: maximumTooltipWidth
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
font.family: MoneroComponents.Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 12 font.pixelSize: 12

5
pages/Receive.qml
View file

@ -494,7 +494,10 @@ Rectangle {
small: true small: true
text: qsTr("Show on device") + translationManager.emptyString text: qsTr("Show on device") + translationManager.emptyString
fontSize: 14 fontSize: 14
visible: appWindow.currentWallet ? appWindow.currentWallet.isHwBacked() : false visible: appWindow.currentWallet ? appWindow.currentWallet.isHwBacked() && pageReceive.state == "Address" : false
tooltip: qsTr("Display this receiving address in your hardware wallet, to confirm if it was indeed generated by your device") + translationManager.emptyString
tooltipLeft: false
maximumTooltipWidth: 200
onClicked: { onClicked: {
appWindow.currentWallet.deviceShowAddressAsync( appWindow.currentWallet.deviceShowAddressAsync(
appWindow.currentWallet.currentSubaddressAccount, appWindow.currentWallet.currentSubaddressAccount,