3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add adhesion warning message back

Browse source 
CURA-6070
This commit is contained in:
Lipu Fei 2019-01-28 14:41:54 +01:00
parent 72b98285b1
commit e2e856a5cd
2 changed files with 52 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -288,6 +288,57 @@ Item
menu: Cura.NozzleMenu { extruderIndex: Cura.ExtruderManager.activeExtruderIndex } menu: Cura.NozzleMenu { extruderIndex: Cura.ExtruderManager.activeExtruderIndex }
} }
} }
Row
{
height: UM.Theme.getSize("print_setup_big_item").height
visible: buildplateCompatibilityError || buildplateCompatibilityWarning
property bool buildplateCompatibilityError: !Cura.MachineManager.variantBuildplateCompatible && !Cura.MachineManager.variantBuildplateUsable
property bool buildplateCompatibilityWarning: Cura.MachineManager.variantBuildplateUsable
// This is a space holder aligning the warning messages.
Label
{
text: ""
width: selectors.textWidth
renderType: Text.NativeRendering
}
Item
{
width: selectors.controlWidth
height: parent.height
UM.RecolorImage
{
id: warningImage
anchors.left: parent.left
source: UM.Theme.getIcon("warning")
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
sourceSize.width: width
sourceSize.height: height
color: UM.Theme.getColor("material_compatibility_warning")
visible: !Cura.MachineManager.isCurrentSetupSupported || buildplateCompatibilityError || buildplateCompatibilityWarning
}
Label
{
id: materialCompatibilityLabel
anchors.left: warningImage.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width
verticalAlignment: Text.AlignVCenter
width: selectors.controlWidth - warningImage.width - UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@label", "Use glue for better adhesion with this material combination.")
font: UM.Theme.getFont("very_small")
color: UM.Theme.getColor("text")
visible: CuraSDKVersion == "dev" ? false : buildplateCompatibilityError || buildplateCompatibilityWarning
wrapMode: Text.WordWrap
renderType: Text.NativeRendering
}
}
}
} }
} }
} }

2
resources/themes/cura-light/theme.json
View file

@ -294,7 +294,7 @@
"setting_validation_ok": [255, 255, 255, 255], "setting_validation_ok": [255, 255, 255, 255],
"setting_filter_field" : [153, 153, 153, 255], "setting_filter_field" : [153, 153, 153, 255],
"material_compatibility_warning": [0, 0, 0, 255], "material_compatibility_warning": [243, 166, 59, 255],
"progressbar_background": [245, 245, 245, 255], "progressbar_background": [245, 245, 245, 255],
"progressbar_control": [50, 130, 255, 255], "progressbar_control": [50, 130, 255, 255],