From 660cc12382785d80d18f02f704065263acd90089 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 24 Aug 2021 17:58:50 +0200 Subject: [PATCH] Use UM.StatusIcon instead of our own --- .../ConfigurationMenu/ConfigurationMenu.qml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index b1f3f72918..5787ee97b2 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -6,7 +6,7 @@ import QtQuick.Controls 2.3 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.3 -import UM 1.2 as UM +import UM 1.4 as UM import Cura 1.0 as Cura @@ -60,7 +60,7 @@ Cura.ExpandablePopup } // Warning icon that indicates if no qualities are available for the variant/material combination for this extruder - UM.RecolorImage + UM.StatusIcon { id: configurationWarning @@ -74,10 +74,21 @@ Cura.ExpandablePopup anchors.leftMargin: visible ? UM.Theme.getSize("thin_margin").width : 0 anchors.verticalCenter: parent.verticalCenter - source: valueError ? UM.Theme.getIcon("Cancel") : UM.Theme.getIcon("Warning") - color: valueError ? UM.Theme.getColor("setting_validation_error_background") : UM.Theme.getColor("setting_validation_warning_background") width: visible ? UM.Theme.getSize("section_icon").width : 0 height: width + + status: + { + if (valueError) + { + return UM.StatusIcon.Status.ERROR + } + if (valueWarning) + { + return UM.StatusIcon.Status.WARNING + } + return UM.StatusIcon.Status.NEUTRAL + } } ColumnLayout