3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 17:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix rebase bug regarding package compatibility

Browse source 
CURA-6983
This commit is contained in:
Nino van Hooff 2020-01-15 11:49:46 +01:00
parent 88e5626b59
commit 1a1e8a9525
3 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,7 @@ UM.Dialog{
{
font: UM.Theme.getFont("default")
text: catalog.i18nc("@label", "The following packages will be added:")
visible: toolbox.has_compatible_packages
visible: subscribedPackagesModel.hasCompatiblePackages
color: UM.Theme.getColor("text")
height: contentHeight + UM.Theme.getSize("default_margin").height
}
@ -91,7 +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
visible: subscribedPackagesModel.hasIncompatiblePackages
color: UM.Theme.getColor("text")
height: contentHeight + UM.Theme.getSize("default_margin").height
}