monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 08:17:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3637

Browse source 
22291b1 NetworkStatusItem: add tooltip to switch node button; adjust colors of lightning icon, switch node button and network status (rating89us)
This commit is contained in:
luigi1111 2021-07-26 15:36:20 -04:00
commit e74ef368df
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/NetworkStatusItem.qml
View file

@ -80,7 +80,7 @@ Rectangle {
if(item.connected == Wallet.ConnectionStatus_Connected){ if(item.connected == Wallet.ConnectionStatus_Connected){
return 1 return 1
} else { } else {
return 0.5 MoneroComponents.Style.blackTheme ? 0.5 : 0.3
} }
} }
@ -92,7 +92,7 @@ Rectangle {
source: { source: {
if(appWindow.isMining) { if(appWindow.isMining) {
return "qrc:///images/miningxmr.png" return "qrc:///images/miningxmr.png"
} else if(item.connected == Wallet.ConnectionStatus_Connected) { } else if(item.connected == Wallet.ConnectionStatus_Connected || !MoneroComponents.Style.blackTheme) {
return "qrc:///images/lightning.png" return "qrc:///images/lightning.png"
} else { } else {
return "qrc:///images/lightning-white.png" return "qrc:///images/lightning-white.png"
@ -126,8 +126,8 @@ Rectangle {
font.family: MoneroComponents.Style.fontMedium.name font.family: MoneroComponents.Style.fontMedium.name
font.bold: true font.bold: true
font.pixelSize: 13 font.pixelSize: 13
color: MoneroComponents.Style.dimmedFontColor color: MoneroComponents.Style.blackTheme ? MoneroComponents.Style.dimmedFontColor : MoneroComponents.Style.defaultFontColor
opacity: MoneroComponents.Style.blackTheme ? 0.65 : 0.5 opacity: MoneroComponents.Style.blackTheme ? 0.65 : 0.75
text: qsTr("Network status") + translationManager.emptyString text: qsTr("Network status") + translationManager.emptyString
themeTransition: false themeTransition: false
} }
@ -159,16 +159,18 @@ Rectangle {
} }
} }
Text { MoneroComponents.TextPlain {
anchors.left: statusTextVal.right anchors.left: statusTextVal.right
anchors.leftMargin: 16 anchors.leftMargin: 16
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: refreshMouseArea.containsMouse ? MoneroComponents.Style.dimmedFontColor : MoneroComponents.Style.defaultFontColor color: refreshMouseArea.containsMouse ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
font.family: FontAwesome.fontFamilySolid font.family: FontAwesome.fontFamilySolid
font.pixelSize: 24 font.pixelSize: 24
font.styleName: "Solid" font.styleName: "Solid"
opacity: iconItem.opacity * (refreshMouseArea.visible ? 1 : 0.5) opacity: 0.85
text: FontAwesome.random text: FontAwesome.random
themeTransition: false
tooltip: qsTr("Switch to another public remote node") + translationManager.emptyString;
visible: ( visible: (
!appWindow.disconnected && !appWindow.disconnected &&
!persistentSettings.useRemoteNode && !persistentSettings.useRemoteNode &&
@ -181,6 +183,8 @@ Rectangle {
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
visible: true visible: true
onEntered: parent.tooltipPopup.open()
onExited: parent.tooltipPopup.close()
onClicked: { onClicked: {
const callback = function(result) { const callback = function(result) {
refreshMouseArea.visible = true; refreshMouseArea.visible = true;