From ff24def63c9dc997b79ff90fdf414e0fb1e58326 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Sat, 15 Oct 2016 17:05:55 +0200 Subject: [PATCH] Use globalProfileId to check if we need to show changed settings CURA-2690 --- cura/Settings/MachineManager.py | 11 +++++++++++ resources/qml/Preferences/ProfileTab.qml | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 0487f75de9..16d748f8d2 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -514,6 +514,17 @@ class MachineManager(QObject): return quality.getId() return "" + @pyqtProperty(str, notify=activeQualityChanged) + def globalQualityId(self): + if self._global_container_stack: + quality = self._global_container_stack.findContainer({"type": "quality_changes"}) + if quality and quality != self._empty_quality_changes_container: + return quality.getId() + quality = self._global_container_stack.findContainer({"type": "quality"}) + if quality: + return quality.getId() + return "" + @pyqtProperty(str, notify = activeQualityChanged) def activeQualityType(self): if self._active_container_stack: diff --git a/resources/qml/Preferences/ProfileTab.qml b/resources/qml/Preferences/ProfileTab.qml index 3fd4ca6a5a..2c3bb0a2eb 100644 --- a/resources/qml/Preferences/ProfileTab.qml +++ b/resources/qml/Preferences/ProfileTab.qml @@ -38,8 +38,8 @@ Tab anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.right: parent.right text: styleData.value - font.strikeout: styleData.column == 1 && quality == Cura.MachineManager.activeQualityId && setting.user_value != "" - font.italic: setting.profile_value_source == "quality_changes" || (quality == Cura.MachineManager.activeQualityId && setting.user_value != "") + font.strikeout: styleData.column == 1 && quality == Cura.MachineManager.globalQualityId && setting.user_value != "" + font.italic: setting.profile_value_source == "quality_changes" || (quality == Cura.MachineManager.globalQualityId && setting.user_value != "") opacity: font.strikeout ? 0.5 : 1 color: styleData.textColor elide: Text.ElideRight @@ -65,7 +65,7 @@ Tab { role: "user_value" title: catalog.i18nc("@title:column", "Current"); - visible: quality == Cura.MachineManager.activeQualityId + visible: quality == Cura.MachineManager.globalQualityId width: parent.width * 0.18 delegate: itemDelegate }