GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 15:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Lipu Fei 2018-08-14 12:02:23 +02:00
commit 746644e6ed
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/qml/SidebarHeader.qml
View File

@ -533,6 +533,7 @@ Column
rightMargin: UM.Theme.getSize("sidebar_margin").width rightMargin: UM.Theme.getSize("sidebar_margin").width
} }
// TODO This was added to replace the buildplate selector. Remove this component when the feature is ready
Label Label
{ {
id: materialCompatibilityLabel id: materialCompatibilityLabel
@ -542,7 +543,7 @@ Column
text: catalog.i18nc("@label", "Use glue with this material combination") text: catalog.i18nc("@label", "Use glue 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: buildplateCompatibilityError || buildplateCompatibilityWarning visible: CuraSDKVersion == "dev" ? false : buildplateCompatibilityError || buildplateCompatibilityWarning
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
opacity: 0.5 opacity: 0.5
} }