Merge branch 'main' into CURA-12833_improve-bridge-lines-direction
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled

This commit is contained in:
Erwan MATHIEU 2025-11-27 11:38:46 +01:00 committed by GitHub
commit 8826b2b68a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 48 additions and 9 deletions

View file

@ -53,17 +53,40 @@ Cura.ExpandableComponent
UM.Label
{
id: schemeTypeLabel
text: layerTypeCombobox.currentText
anchors
{
left: colorSchemeLabel.right
leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right
}
anchors.left: colorSchemeLabel.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width
height: parent.height
elide: Text.ElideRight
font: UM.Theme.getFont("medium")
}
UM.ColorImage
{
id: warningIcon
anchors
{
left: schemeTypeLabel.right
leftMargin: UM.Theme.getSize("narrow_margin").width
verticalCenter: parent.verticalCenter
}
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
source: UM.Theme.getIcon("Warning")
color: UM.Theme.getColor("warning")
visible: {
// Check if any enabled extruder is unchecked
var extrudersModel = CuraApplication.getExtrudersModel();
for (var i = 0; i < extrudersModel.count; i++) {
var extruder = extrudersModel.getItem(i);
if (extruder.enabled && viewSettings.extruder_opacities[i] <= 0.5 && viewSettings.extruder_opacities[i] !== undefined && viewSettings.extruder_opacities[i] !== "") {
return true;
}
}
return false;
}
}
}
contentItem: Column
@ -212,11 +235,27 @@ Cura.ExpandableComponent
{
verticalCenter: parent.verticalCenter
left: extrudersModelCheckBox.left
right: extrudersModelCheckBox.right
right: extruderWarningIcon.visible ? extruderWarningIcon.left : swatch.left
leftMargin: UM.Theme.getSize("checkbox").width + Math.round(UM.Theme.getSize("default_margin").width / 2)
rightMargin: UM.Theme.getSize("default_margin").width * 2
rightMargin: UM.Theme.getSize("narrow_margin").width
}
}
UM.ColorImage
{
id: extruderWarningIcon
anchors
{
verticalCenter: parent.verticalCenter
right: swatch.left
rightMargin: UM.Theme.getSize("narrow_margin").width
}
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
source: UM.Theme.getIcon("Warning")
color: UM.Theme.getColor("warning")
visible: model.enabled && !extrudersModelCheckBox.checked
}
}
}

View file

@ -1,7 +1,7 @@
{
"name": "Simulation View",
"author": "Ultimaker B.V.",
"version": "1.0.1",
"version": "1.0.2",
"description": "Provides the preview of sliced layerdata.",
"api": 8,
"i18n-catalog": "cura"