4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-04 23:51:10 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge cf64a6005e into 0a9d61986c

Browse Source
This commit is contained in:
rating89us 2024-11-25 23:26:18 +00:00 committed by GitHub
commit 56033f1414
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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 tooltipLeft: tooltip.tooltipLeft
property alias tooltipPopup: tooltip.tooltipPopup
property alias maximumTooltipWidth: tooltip.maximumTooltipWidth
signal clicked()
height: small ? 30 : 36

7
components/Tooltip.qml
View File

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

5
pages/Receive.qml
View File

@ -494,7 +494,10 @@ Rectangle {
small: true
text: qsTr("Show on device") + translationManager.emptyString
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: {
appWindow.currentWallet.deviceShowAddressAsync(
appWindow.currentWallet.currentSubaddressAccount,