Merge branch 'master' into python_type_hinting

cura/Settings/ExtruderManager.py

@@ -155,6 +155,18 @@ class ExtruderManager(QObject):
         if changed:
             self.extrudersChanged.emit(machine_id)
 
+    def registerExtruder(self, extruder_train, machine_id):
+        changed = False
+
+        if machine_id not in self._extruder_trains:
+            self._extruder_trains[machine_id] = {}
+            changed = True
+        if extruder_train:
+            self._extruder_trains[machine_id][extruder_train.getMetaDataEntry("position")] = extruder_train
+            changed = True
+        if changed:
+            self.extrudersChanged.emit(machine_id)
+
     ##  Creates a container stack for an extruder train.
     #
     #   The container stack has an extruder definition at the bottom, which is

cura/Settings/ExtrudersModel.py

@@ -141,8 +141,6 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
             for extruder in manager.getMachineExtruders(global_container_stack.getId()):
                 extruder_name = extruder.getName()
                 material = extruder.findContainer({ "type": "material" })
-                if material and not self._simple_names:
-                    extruder_name = "%s (%s)" % (material.getName(), extruder_name)
                 position = extruder.getMetaDataEntry("position", default = "0")  # Get the position
                 try:
                     position = int(position)

cura/Settings/MachineManager.py

@@ -13,6 +13,7 @@ from UM.Message import Message
 from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.Settings.ContainerStack import ContainerStack
 from UM.Settings.InstanceContainer import InstanceContainer
+from UM.Settings.SettingDefinition import SettingDefinition
 from UM.Settings.SettingFunction import SettingFunction
 from UM.Settings.Validator import ValidatorState
 
@@ -39,6 +40,10 @@ class MachineManager(QObject):
         self.globalContainerChanged.connect(self.activeQualityChanged)
 
         self._stacks_have_errors = None
+        self._empty_variant_container = ContainerRegistry.getInstance().findInstanceContainers(id="empty_variant")[0]
+        self._empty_material_container = ContainerRegistry.getInstance().findInstanceContainers(id="empty_material")[0]
+        self._empty_quality_container = ContainerRegistry.getInstance().findInstanceContainers(id="empty_quality")[0]
+        self._empty_quality_changes_container = ContainerRegistry.getInstance().findInstanceContainers(id="empty_quality_changes")[0]
         self._onGlobalContainerChanged()
 
         ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderStackChanged)
@@ -53,11 +58,6 @@ class MachineManager(QObject):
         ExtruderManager.getInstance().activeExtruderChanged.connect(self.activeStackChanged)
         self.activeStackChanged.connect(self.activeStackValueChanged)
 
-        self._empty_variant_container = ContainerRegistry.getInstance().findInstanceContainers(id = "empty_variant")[0]
-        self._empty_material_container = ContainerRegistry.getInstance().findInstanceContainers(id = "empty_material")[0]
-        self._empty_quality_container = ContainerRegistry.getInstance().findInstanceContainers(id = "empty_quality")[0]
-        self._empty_quality_changes_container = ContainerRegistry.getInstance().findInstanceContainers(id = "empty_quality_changes")[0]
-
         Preferences.getInstance().addPreference("cura/active_machine", "")
 
         self._global_event_keys = set()
@@ -114,7 +114,11 @@ class MachineManager(QObject):
     def printerOutputDevices(self):
         return self._printer_output_devices
 
-    def _onHotendIdChanged(self, index: Union[str,int], hotend_id: str) -> None:
+    @pyqtProperty(int, constant=True)
+    def totalNumberOfSettings(self):
+        return len(ContainerRegistry.getInstance().findDefinitionContainers(id="fdmprinter")[0].getAllKeys())
+
+    def _onHotendIdChanged(self, index: Union[str, int], hotend_id: str) -> None:
         if not self._global_container_stack:
             return
 
@@ -251,6 +255,7 @@ class MachineManager(QObject):
                 quality = self._global_container_stack.findContainer({"type": "quality"})
                 quality.nameChanged.connect(self._onQualityNameChanged)
 
+        self._updateStacksHaveErrors()
 
     ##  Update self._stacks_valid according to _checkStacksForErrors and emit if change.
     def _updateStacksHaveErrors(self):
@@ -282,7 +287,7 @@ class MachineManager(QObject):
 
     def _onInstanceContainersChanged(self, container):
         container_type = container.getMetaDataEntry("type")
-
+        
         if container_type == "material":
             self.activeMaterialChanged.emit()
         elif container_type == "variant":
@@ -290,6 +295,8 @@ class MachineManager(QObject):
         elif container_type == "quality":
             self.activeQualityChanged.emit()
 
+        self._updateStacksHaveErrors()
+
     def _onPropertyChanged(self, key, property_name):
         if property_name == "value":
             # Notify UI items, such as the "changed" star in profile pull down menu.
@@ -302,6 +309,16 @@ class MachineManager(QObject):
                     changed_validation_state = self._active_container_stack.getProperty(key, property_name)
                 else:
                     changed_validation_state = self._global_container_stack.getProperty(key, property_name)
+
+                if changed_validation_state is None:
+                    # Setting is not validated. This can happen if there is only a setting definition.
+                    # We do need to validate it, because a setting defintions value can be set by a function, which could
+                    # be an invalid setting.
+                    definition = self._active_container_stack.getSettingDefinition(key)
+                    validator_type = SettingDefinition.getValidatorForType(definition.type)
+                    if validator_type:
+                        validator = validator_type(key)
+                        changed_validation_state = validator(self._active_container_stack)
                 if changed_validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError):
                     self._stacks_have_errors = True
                     self.stacksValidationChanged.emit()
@@ -311,6 +328,7 @@ class MachineManager(QObject):
 
     @pyqtSlot(str)
     def setActiveMachine(self, stack_id: str) -> None:
+        self.blurSettings.emit()  # Ensure no-one has focus.
         containers = ContainerRegistry.getInstance().findContainerStacks(id = stack_id)
         if containers:
             Application.getInstance().setGlobalContainerStack(containers[0])
@@ -476,6 +494,16 @@ class MachineManager(QObject):
 
         return ""
 
+    @pyqtProperty("QVariantList", notify = activeMaterialChanged)
+    def activeMaterialNames(self):
+        result = []
+        if ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks() is not None:
+            for stack in ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks():
+                material_container = stack.findContainer(type="material")
+                if material_container and material_container != self._empty_material_container:
+                    result.append(material_container.getName())
+        return result
+
     @pyqtProperty(str, notify=activeMaterialChanged)
     def activeMaterialId(self) -> str:
         if self._active_container_stack:
@@ -867,7 +895,8 @@ class MachineManager(QObject):
         if old_container:
             old_container.nameChanged.disconnect(self._onQualityNameChanged)
         else:
-            Logger.log("w", "Could not find old "+  container.getMetaDataEntry("type") + " while changing active " + container.getMetaDataEntry("type") + ".")
+            Logger.log("e", "Could not find container of type %s in stack %s while replacing quality (changes) with container %s", container.getMetaDataEntry("type"), stack.getId(), container.getId())
+            return
 
         # Swap in the new container into the stack.
         stack.replaceContainer(stack.getContainerIndex(old_container), container, postpone_emit = postpone_emit)
@@ -878,7 +907,7 @@ class MachineManager(QObject):
     def _askUserToKeepOrClearCurrentSettings(self):
         # Ask the user if the user profile should be cleared or not (discarding the current settings)
         # In Simple Mode we assume the user always wants to keep the (limited) current settings
-        details_text = catalog.i18nc("@label", "You made changes to the following setting(s):")
+        details_text = catalog.i18nc("@label", "You made changes to the following setting(s)/override(s):")
 
         # user changes in global stack
         details_list = [setting.definition.label for setting in self._global_container_stack.getTop().findInstances(**{})]
@@ -893,14 +922,19 @@ class MachineManager(QObject):
         # Format to output string
         details = "\n    ".join([details_text, ] + details_list)
 
-        Application.getInstance().messageBox(catalog.i18nc("@window:title", "Switched profiles"),
-                                             catalog.i18nc("@label",
-                                                           "Do you want to transfer your changed settings to this profile?"),
-                                             catalog.i18nc("@label",
-                                                           "If you transfer your settings they will override settings in the profile."),
-                                             details,
-                                             buttons=QMessageBox.Yes + QMessageBox.No, icon=QMessageBox.Question,
-                                             callback=self._keepUserSettingsDialogCallback)
+        num_changed_settings = len(details_list)
+        Application.getInstance().messageBox(
+            catalog.i18nc("@window:title", "Switched profiles"),
+            catalog.i18nc(
+                "@label",
+                "Do you want to transfer your %d changed setting(s)/override(s) to this profile?") % num_changed_settings,
+            catalog.i18nc(
+                "@label",
+                "If you transfer your settings they will override settings in the profile. If you don't transfer these settings, they will be lost."),
+            details,
+            buttons=QMessageBox.Yes + QMessageBox.No,
+            icon=QMessageBox.Question,
+            callback=self._keepUserSettingsDialogCallback)
 
     def _keepUserSettingsDialogCallback(self, button):
         if button == QMessageBox.Yes:
@@ -1170,8 +1204,9 @@ class MachineManager(QObject):
             else:
                 material_search_criteria["definition"] = "fdmprinter"
             material_containers = container_registry.findInstanceContainers(**material_search_criteria)
-            if material_containers:
-                search_criteria["material"] = material_containers[0].getId()
+            # Try all materials to see if there is a quality profile available.
+            for material_container in material_containers:
+                search_criteria["material"] = material_container.getId()
 
                 containers = container_registry.findInstanceContainers(**search_criteria)
                 if containers:

cura/Settings/MaterialSettingsVisibilityHandler.py

@@ -8,7 +8,7 @@ class MaterialSettingsVisibilityHandler(SettingVisibilityHandler):
         super().__init__(parent = parent, *args, **kwargs)
 
         material_settings = set([
-            "material_print_temperature",
+            "default_material_print_temperature",
             "material_bed_temperature",
             "material_standby_temperature",
             "cool_fan_speed",

cura/Settings/QualitySettingsModel.py

@@ -9,6 +9,10 @@ import UM.Logger
 import UM.Qt
 from UM.Application import Application
 from UM.Settings.ContainerRegistry import ContainerRegistry
+import os
+
+from UM.i18n import i18nCatalog
+
 
 class QualitySettingsModel(UM.Qt.ListModel.ListModel):
     KeyRole = Qt.UserRole + 1
@@ -28,6 +32,7 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
         self._extruder_definition_id = None
         self._quality_id = None
         self._material_id = None
+        self._i18n_catalog = None
 
         self.addRoleName(self.KeyRole, "key")
         self.addRoleName(self.LabelRole, "label")
@@ -117,6 +122,18 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
 
         quality_type = quality_container.getMetaDataEntry("quality_type")
         definition_id = Application.getInstance().getMachineManager().getQualityDefinitionId(quality_container.getDefinition())
+        definition = quality_container.getDefinition()
+
+        # Check if the definition container has a translation file.
+        definition_suffix = ContainerRegistry.getMimeTypeForContainer(type(definition)).preferredSuffix
+        catalog = i18nCatalog(os.path.basename(definition_id + "." + definition_suffix))
+        if catalog.hasTranslationLoaded():
+            self._i18n_catalog = catalog
+
+        for file_name in quality_container.getDefinition().getInheritedFiles():
+            catalog = i18nCatalog(os.path.basename(file_name))
+            if catalog.hasTranslationLoaded():
+                self._i18n_catalog = catalog
 
         criteria = {"type": "quality", "quality_type": quality_type, "definition": definition_id}
 
@@ -167,6 +184,8 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
         for definition in definition_container.findDefinitions():
             if definition.type == "category":
                 current_category = definition.label
+                if self._i18n_catalog:
+                    current_category = self._i18n_catalog.i18nc(definition.key + " label", definition.label)
                 continue
 
             profile_value = None
@@ -177,6 +196,12 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
                     profile_value_source = container.getMetaDataEntry("type")
                     profile_value = new_value
 
+                # Global tab should use resolve (if there is one)
+                if not self._extruder_id:
+                    resolve_value = global_container_stack.getProperty(definition.key, "resolve")
+                    if resolve_value is not None and profile_value is not None:
+                        profile_value = resolve_value
+
             user_value = None
             if not self._extruder_id:
                 user_value = global_container_stack.getTop().getProperty(definition.key, "value")
@@ -198,9 +223,14 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
                 if self._extruder_id == "" and settable_per_extruder:
                     continue
 
+
+            label = definition.label
+            if self._i18n_catalog:
+                label = self._i18n_catalog.i18nc(definition.key + " label", label)
+
             items.append({
                 "key": definition.key,
-                "label": definition.label,
+                "label": label,
                 "unit": definition.unit,
                 "profile_value": "" if profile_value is None else str(profile_value),  # it is for display only
                 "profile_value_source": profile_value_source,
@@ -208,4 +238,4 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
                 "category": current_category
             })
 
-        self.setItems(items)
+        self.setItems(items)

cura/Settings/SettingInheritanceManager.py

@@ -89,7 +89,7 @@ class SettingInheritanceManager(QObject):
             self._update()  # Ensure that the settings_with_inheritance_warning list is populated.
 
     def _onPropertyChanged(self, key, property_name):
-        if property_name == "value" and self._global_container_stack:
+        if (property_name == "value" or property_name == "enabled") and self._global_container_stack:
             definitions = self._global_container_stack.getBottom().findDefinitions(key = key)
             if not definitions:
                 return
@@ -171,7 +171,16 @@ class SettingInheritanceManager(QObject):
                 continue
             if value is not None:
                 # If a setting doesn't use any keys, it won't change it's value, so treat it as if it's a fixed value
-                has_setting_function = isinstance(value, SettingFunction) and len(value.getUsedSettingKeys()) > 0
+                has_setting_function = isinstance(value, SettingFunction)
+                if has_setting_function:
+                    for setting_key in value.getUsedSettingKeys():
+                        if setting_key in self._active_container_stack.getAllKeys():
+                            break # We found an actual setting. So has_setting_function can remain true
+                    else:
+                        # All of the setting_keys turned out to not be setting keys at all!
+                        # This can happen due enum keys also being marked as settings.
+                        has_setting_function = False
+
                 if has_setting_function is False:
                     has_non_function_value = True
                     continue