GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 12:49:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0'

Browse Source
This commit is contained in:
Ghostkeeper 2019-01-30 12:59:39 +01:00
commit a6688b9609
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View File

@ -291,6 +291,7 @@ Item
Row Row
{ {
id: warnings
height: UM.Theme.getSize("print_setup_big_item").height height: UM.Theme.getSize("print_setup_big_item").height
visible: buildplateCompatibilityError || buildplateCompatibilityWarning visible: buildplateCompatibilityError || buildplateCompatibilityWarning
@ -320,7 +321,7 @@ Item
sourceSize.width: width sourceSize.width: width
sourceSize.height: height sourceSize.height: height
color: UM.Theme.getColor("material_compatibility_warning") color: UM.Theme.getColor("material_compatibility_warning")
visible: !Cura.MachineManager.isCurrentSetupSupported || buildplateCompatibilityError || buildplateCompatibilityWarning visible: !Cura.MachineManager.isCurrentSetupSupported || warnings.buildplateCompatibilityError || warnings.buildplateCompatibilityWarning
} }
Label Label
@ -333,7 +334,7 @@ Item
text: catalog.i18nc("@label", "Use glue for better adhesion with this material combination.") text: catalog.i18nc("@label", "Use glue for better adhesion with this material combination.")
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("very_small")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
visible: CuraSDKVersion == "dev" ? false : buildplateCompatibilityError || buildplateCompatibilityWarning visible: CuraSDKVersion == "dev" ? false : warnings.buildplateCompatibilityError || warnings.buildplateCompatibilityWarning
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }