Browse Source

Merge pull request #5234 from Ultimaker/CURA-6070_add_adhesion_warning

CURA-6070 Add adhesion warning message back
Remco Burema 6 years ago
parent
commit
dbec607d36

+ 51 - 0
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml

@@ -288,6 +288,57 @@ Item
                     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
+                    }
+                }
+            }
         }
     }
 }

+ 1 - 1
resources/themes/cura-light/theme.json

@@ -294,7 +294,7 @@
         "setting_validation_ok": [255, 255, 255, 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_control": [50, 130, 255, 255],