From 8db3f02a4f27f3ed90213d5680935297000e4f96 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 12 Oct 2022 14:43:55 +0200 Subject: [PATCH 1/3] Re-add tooltips for intent profile selection in recommended. They where skipped over when transferring the radio bar to the current large button based setup. CURA-9746 --- .../Recommended/RecommendedQualityProfileSelector.qml | 2 +- .../RecommendedQualityProfileSelectorButton.qml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index bc5826fe7c..89644d887f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -32,7 +32,7 @@ Item { profileName: model.name icon: model.icon - + tooltipText: (model.description != undefined) ? model.description : "" selected: Cura.MachineManager.activeIntentCategory == model.intent_category diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml index 6804e7e5ba..2a63345b48 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml @@ -19,6 +19,7 @@ Rectangle property bool selected: false property string profileName: "" property string icon: "" + property alias tooltipText: tooltip.text signal clicked() @@ -30,6 +31,13 @@ Rectangle onClicked: base.clicked() } + UM.ToolTip + { + id: tooltip + visible: mouseArea.containsMouse + targetPoint: Qt.point(base.x + (base.width / 2), base.y + (base.height / 2)) + } + Item { width: intentIcon.width From e9b268bc06ceb4850bf68b6947ba30239d97acce Mon Sep 17 00:00:00 2001 From: Remco Burema <41987080+rburema@users.noreply.github.com> Date: Wed, 12 Oct 2022 14:54:33 +0200 Subject: [PATCH 2/3] Review suggestion; best practices; javascript. done as part of CURA-9746 Co-authored-by: Casper Lamboo --- .../Recommended/RecommendedQualityProfileSelector.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 89644d887f..b9fbf04f9c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -32,7 +32,7 @@ Item { profileName: model.name icon: model.icon - tooltipText: (model.description != undefined) ? model.description : "" + tooltipText: model.description ? model.description : "" selected: Cura.MachineManager.activeIntentCategory == model.intent_category From e25048d88a76bf184de6fee76a84aaf54b1d8cbb Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 12 Oct 2022 15:29:08 +0200 Subject: [PATCH 3/3] Add width to intent tool tips CURA-9746 --- .../Recommended/RecommendedQualityProfileSelectorButton.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml index 2a63345b48..4e912edfe0 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml @@ -36,6 +36,7 @@ Rectangle id: tooltip visible: mouseArea.containsMouse targetPoint: Qt.point(base.x + (base.width / 2), base.y + (base.height / 2)) + width: UM.Theme.getSize("tooltip").width } Item