Просмотр исходного кода

Use globalProfileId to check if we need to show changed settings

CURA-2690
Jaime van Kessel 8 лет назад
Родитель
Сommit
ff24def63c
2 измененных файлов с 14 добавлено и 3 удалено
  1. 11 0
      cura/Settings/MachineManager.py
  2. 3 3
      resources/qml/Preferences/ProfileTab.qml

+ 11 - 0
cura/Settings/MachineManager.py

@@ -514,6 +514,17 @@ class MachineManager(QObject):
                 return quality.getId()
                 return quality.getId()
         return ""
         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)
     @pyqtProperty(str, notify = activeQualityChanged)
     def activeQualityType(self):
     def activeQualityType(self):
         if self._active_container_stack:
         if self._active_container_stack:

+ 3 - 3
resources/qml/Preferences/ProfileTab.qml

@@ -38,8 +38,8 @@ Tab
                     anchors.leftMargin: UM.Theme.getSize("default_margin").width
                     anchors.leftMargin: UM.Theme.getSize("default_margin").width
                     anchors.right: parent.right
                     anchors.right: parent.right
                     text: styleData.value
                     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
                     opacity: font.strikeout ? 0.5 : 1
                     color: styleData.textColor
                     color: styleData.textColor
                     elide: Text.ElideRight
                     elide: Text.ElideRight
@@ -65,7 +65,7 @@ Tab
         {
         {
             role: "user_value"
             role: "user_value"
             title: catalog.i18nc("@title:column", "Current");
             title: catalog.i18nc("@title:column", "Current");
-            visible: quality == Cura.MachineManager.activeQualityId
+            visible: quality == Cura.MachineManager.globalQualityId
             width: parent.width * 0.18
             width: parent.width * 0.18
             delegate: itemDelegate
             delegate: itemDelegate
         }
         }