Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCasper Lamboo <c.lamboo@ultimaker.com>2022-10-12 16:31:36 +0300
committerGitHub <noreply@github.com>2022-10-12 16:31:36 +0300
commitc625d35f335a3cf26940f4ac425f0ef9c36b6114 (patch)
tree9b2ce0ad10532b6febaf26c1475764a06173398e
parent7e2062feecc17edbb7afc30a9437e91de0b9c2ef (diff)
parente25048d88a76bf184de6fee76a84aaf54b1d8cbb (diff)
Merge pull request #13546 from Ultimaker/CURA-9746_recommened_intent_tooltips
[CURA-9746] Re-add tooltips for intent profile selection in recommended.
-rw-r--r--resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml2
-rw-r--r--resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelectorButton.qml9
2 files changed, 10 insertions, 1 deletions
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
index bc5826fe7c..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 ? 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..4e912edfe0 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,14 @@ Rectangle
onClicked: base.clicked()
}
+ UM.ToolTip
+ {
+ 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
{
width: intentIcon.width