diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-06-24 13:55:08 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-06-24 13:55:08 -0500 |
| commit | b58bff39a04df3eefa016e283af6be73f58a9e18 (patch) | |
| tree | 616e00acbef5a425d719159743c152254ee0c840 /components | |
| parent | bea763d7f81a2a7c0a4d8f174d0b718a19893c88 (diff) | |
| parent | 614a7a086a636f6d6d1a67425fb147d71df39bac (diff) | |
| download | monzero-gui-b58bff39a04df3eefa016e283af6be73f58a9e18.tar.gz monzero-gui-b58bff39a04df3eefa016e283af6be73f58a9e18.tar.xz monzero-gui-b58bff39a04df3eefa016e283af6be73f58a9e18.zip | |
Merge pull request #3586
614a7a0 RemoteNodeList: display shield icon if trusted daemon (rating89us)
Diffstat (limited to 'components')
| -rw-r--r-- | components/Label.qml | 7 | ||||
| -rw-r--r-- | components/RemoteNodeList.qml | 20 |
2 files changed, 25 insertions, 2 deletions
diff --git a/components/Label.qml b/components/Label.qml index 261c02a5..c4a967ec 100644 --- a/components/Label.qml +++ b/components/Label.qml @@ -37,6 +37,7 @@ Item { property alias tooltip: label.tooltip property alias tooltipIconVisible: label.tooltipIconVisible property alias color: label.color + property alias labelMouseArea: labelMouseArea property int textFormat: Text.PlainText property string tipText: "" property int fontSize: 16 @@ -72,9 +73,13 @@ Item { onLinkActivated: item.linkActivated() textFormat: parent.textFormat MouseArea { + id: labelMouseArea anchors.fill: parent + hoverEnabled: true acceptedButtons: Qt.NoButton - cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor + cursorShape: parent.hoveredLink || (tooltip && !tooltipIconVisible) ? Qt.PointingHandCursor : Qt.ArrowCursor + onEntered: tooltip && !tooltipIconVisible ? parent.tooltipPopup.open() : undefined + onExited: tooltip && !tooltipIconVisible ? parent.tooltipPopup.close() : undefined } } } diff --git a/components/RemoteNodeList.qml b/components/RemoteNodeList.qml index 2e9c36f4..96e252c4 100644 --- a/components/RemoteNodeList.qml +++ b/components/RemoteNodeList.qml @@ -59,7 +59,7 @@ ColumnLayout { Rectangle { height: 30 Layout.fillWidth: true - color: itemMouseArea.containsMouse || index === remoteNodesModel.selected ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: itemMouseArea.containsMouse || trustedDaemonCheckMark.labelMouseArea.containsMouse || index === remoteNodesModel.selected ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" Rectangle { color: MoneroComponents.Style.appWindowBorderColor @@ -80,8 +80,10 @@ ColumnLayout { anchors.fill: parent anchors.rightMargin: 80 color: "transparent" + property var trusted: remoteNodesModel.get(index).trusted MoneroComponents.TextPlain { + id: addressText color: index === remoteNodesModel.selected ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left @@ -91,6 +93,22 @@ ColumnLayout { themeTransition: false } + MoneroComponents.Label { + id: trustedDaemonCheckMark + anchors.left: addressText.right + anchors.leftMargin: 6 + anchors.verticalCenter: parent.verticalCenter + z: itemMouseArea.z + 1 + fontSize: 16 + fontFamily: FontAwesome.fontFamilySolid + fontColor: index === remoteNodesModel.selected ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor + styleName: "Solid" + visible: trusted + text: FontAwesome.shieldAlt + tooltip: qsTr("Trusted daemon") + translationManager.emptyString + themeTransition: false + } + MouseArea { id: itemMouseArea cursorShape: Qt.PointingHandCursor |