3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Merge branch 'CURA-7038_remove_labels_if_no_packages' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2020-01-09 13:25:39 +01:00
commit f15e0c5477
No known key found for this signature in database
GPG key ID: 3710727397403C91
3 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml
View file

@ -48,6 +48,7 @@ UM.Dialog{
{
font: UM.Theme.getFont("default")
text: catalog.i18nc("@label", "The following packages will be added:")
visible: toolbox.has_compatible_packages
color: UM.Theme.getColor("text")
height: contentHeight + UM.Theme.getSize("default_margin").height
}
@ -59,8 +60,8 @@ UM.Dialog{
Item
{
width: parent.width
property var lineHeight: 60
visible: model.is_compatible == "True" ? true : false
property int lineHeight: 60
visible: model.is_compatible
height: visible ? (lineHeight + UM.Theme.getSize("default_margin").height) : 0 // We only show the compatible packages here
Image
{
@ -90,6 +91,7 @@ UM.Dialog{
{
font: UM.Theme.getFont("default")
text: catalog.i18nc("@label", "The following packages can not be installed because of incompatible Cura version:")
visible: toolbox.has_incompatible_packages
color: UM.Theme.getColor("text")
height: contentHeight + UM.Theme.getSize("default_margin").height
}
@ -101,8 +103,8 @@ UM.Dialog{
Item
{
width: parent.width
property var lineHeight: 60
visible: model.is_compatible == "True" ? false : true
property int lineHeight: 60
visible: !model.is_compatible
height: visible ? (lineHeight + UM.Theme.getSize("default_margin").height) : 0 // We only show the incompatible packages here
Image
{