diff --git a/src/pygui/ISC/Tabs/SettingsTab.qml b/src/pygui/ISC/Tabs/SettingsTab.qml index 0ad7858..29ed8ea 100644 --- a/src/pygui/ISC/Tabs/SettingsTab.qml +++ b/src/pygui/ISC/Tabs/SettingsTab.qml @@ -4,6 +4,7 @@ import QtQuick.Controls.impl import QtQuick.Layouts import QtQuick.Dialogs import ISC +import ISC.Tabs.components Item { id: root diff --git a/src/pygui/ISC/Tabs/WaferMapTab.qml b/src/pygui/ISC/Tabs/WaferMapTab.qml index ba30d09..330c331 100644 --- a/src/pygui/ISC/Tabs/WaferMapTab.qml +++ b/src/pygui/ISC/Tabs/WaferMapTab.qml @@ -98,9 +98,11 @@ Item { implicitHeight: 34 // Disabled controls swallow no events at all, so hover for the // "why is this greyed out" tooltip needs its own MouseArea. - ToolTip.visible: disabledHover.containsMouse && !enabled - ToolTip.text: "Connect a wafer to enable Live mode" - ToolTip.delay: 300 + AppToolTip { + visible: disabledHover.containsMouse && !liveTab.enabled + text: "Connect a wafer to enable Live mode" + delay: 300 + } MouseArea { id: disabledHover anchors.fill: parent diff --git a/src/pygui/ISC/Tabs/components/ReadoutPanel.qml b/src/pygui/ISC/Tabs/components/ReadoutPanel.qml index d5015d8..4fef1af 100644 --- a/src/pygui/ISC/Tabs/components/ReadoutPanel.qml +++ b/src/pygui/ISC/Tabs/components/ReadoutPanel.qml @@ -481,8 +481,11 @@ ColumnLayout { to: 1 value: 0 Layout.fillWidth: true - ToolTip.visible: hovered - ToolTip.text: Math.round(value * 100) + "%" + + AppToolTip { + visible: heatmapSlider.hovered + text: Math.round(heatmapSlider.value * 100) + "%" + } handle: Rectangle { x: heatmapSlider.leftPadding + heatmapSlider.visualPosition * (heatmapSlider.availableWidth - width) diff --git a/src/pygui/ISC/Tabs/components/SourcePanel.qml b/src/pygui/ISC/Tabs/components/SourcePanel.qml index 3e4dbec..2a059db 100644 --- a/src/pygui/ISC/Tabs/components/SourcePanel.qml +++ b/src/pygui/ISC/Tabs/components/SourcePanel.qml @@ -46,24 +46,9 @@ ColumnLayout { csvEditorDialog.open(); } - ToolTip { - id: editTooltip + AppToolTip { visible: editBtn.hovered text: "Edit" - delay: 400 - font.pixelSize: Theme.fontXs - font.family: Theme.uiFontFamily - contentItem: Text { - text: editTooltip.text - color: Theme.headingColor - font: editTooltip.font - } - background: Rectangle { - color: Theme.cardBackground - border.color: Theme.sideBorder - border.width: 1 - radius: Theme.radiusXs - } } } @@ -84,24 +69,9 @@ ColumnLayout { } onClicked: file_browser.refreshFiles() - ToolTip { - id: refreshTooltip + AppToolTip { visible: refreshBtn.hovered text: "Refresh" - delay: 400 - font.pixelSize: Theme.fontXs - font.family: Theme.uiFontFamily - contentItem: Text { - text: refreshTooltip.text - color: Theme.headingColor - font: refreshTooltip.font - } - background: Rectangle { - color: Theme.cardBackground - border.color: Theme.sideBorder - border.width: 1 - radius: Theme.radiusXs - } } } }