3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 5.7

Browse source
This commit is contained in:
Saumya Jain 2024-04-26 15:53:03 +02:00
commit fb965b8d0c
118 changed files with 15656 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -311,10 +311,11 @@ Item
{
id: warnings
height: visible ? childrenRect.height : 0
visible: buildplateCompatibilityError || buildplateCompatibilityWarning
visible: buildplateCompatibilityError || buildplateCompatibilityWarning || coreCompatibilityWarning
property bool buildplateCompatibilityError: !Cura.MachineManager.variantBuildplateCompatible && !Cura.MachineManager.variantBuildplateUsable
property bool buildplateCompatibilityWarning: Cura.MachineManager.variantBuildplateUsable
property bool coreCompatibilityWarning: !Cura.MachineManager.variantCoreUsableForFactor4
// This is a space holder aligning the warning messages.
UM.Label
@ -336,7 +337,7 @@ Item
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
color: UM.Theme.getColor("material_compatibility_warning")
visible: !Cura.MachineManager.isCurrentSetupSupported || warnings.buildplateCompatibilityError || warnings.buildplateCompatibilityWarning
visible: !Cura.MachineManager.isCurrentSetupSupported || warnings.buildplateCompatibilityError || warnings.buildplateCompatibilityWarning || warnings.coreCompatibilityWarning
}
UM.Label
@ -349,6 +350,17 @@ Item
visible: CuraSDKVersion == "dev" ? false : warnings.buildplateCompatibilityError || warnings.buildplateCompatibilityWarning
wrapMode: Text.WordWrap
}
UM.Label
{
id: coreCompatibilityLabel
anchors.left: warningImage.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width
width: selectors.controlWidth - warningImage.width - UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@label", "Combination not recommended. Load BB core to slot 1 (left) for better reliability.")
visible: warnings.coreCompatibilityWarning
wrapMode: Text.WordWrap
}
}
}
}