mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-15 10:47:49 -06:00
fix visibility check
CURA-9424
This commit is contained in:
parent
25ecb0e621
commit
1764c338a0
2 changed files with 5 additions and 2 deletions
|
@ -125,6 +125,7 @@ UM.Dialog
|
||||||
|
|
||||||
comboboxTitle: catalog.i18nc("@action:label", "Open With")
|
comboboxTitle: catalog.i18nc("@action:label", "Open With")
|
||||||
comboboxTooltipText: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
|
comboboxTooltipText: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
|
||||||
|
comboboxVisible: workspaceDialog.visible && manager.updatableMachinesModel.count > 1
|
||||||
combobox: Cura.ComboBox
|
combobox: Cura.ComboBox
|
||||||
{
|
{
|
||||||
id: machineResolveComboBox
|
id: machineResolveComboBox
|
||||||
|
@ -261,6 +262,7 @@ UM.Dialog
|
||||||
|
|
||||||
comboboxTitle: catalog.i18nc("@action:label", "Open With")
|
comboboxTitle: catalog.i18nc("@action:label", "Open With")
|
||||||
comboboxTooltipText: catalog.i18nc("@info:tooltip", "How should the conflict in the profile be resolved?")
|
comboboxTooltipText: catalog.i18nc("@info:tooltip", "How should the conflict in the profile be resolved?")
|
||||||
|
comboboxVisible: manager.qualityChangesConflict
|
||||||
combobox: Cura.ComboBox
|
combobox: Cura.ComboBox
|
||||||
{
|
{
|
||||||
id: qualityChangesResolveComboBox
|
id: qualityChangesResolveComboBox
|
||||||
|
@ -315,6 +317,7 @@ UM.Dialog
|
||||||
|
|
||||||
comboboxTitle: catalog.i18nc("@action:label", "Open With")
|
comboboxTitle: catalog.i18nc("@action:label", "Open With")
|
||||||
comboboxTooltipText: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
|
comboboxTooltipText: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
|
||||||
|
comboboxVisible: manager.materialConflict
|
||||||
|
|
||||||
combobox: Cura.ComboBox
|
combobox: Cura.ComboBox
|
||||||
{
|
{
|
||||||
|
|
|
@ -30,7 +30,7 @@ Item
|
||||||
height: visible ? UM.Theme.getSize("default_margin").height : 0
|
height: visible ? UM.Theme.getSize("default_margin").height : 0
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
visible: combobox.visible
|
visible: comboboxVisible
|
||||||
text: comboboxTooltipText
|
text: comboboxTooltipText
|
||||||
|
|
||||||
UM.Label
|
UM.Label
|
||||||
|
@ -39,7 +39,7 @@ Item
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
|
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
|
||||||
visible: combobox.visible
|
visible: comboboxVisible
|
||||||
text: ""
|
text: ""
|
||||||
font: UM.Theme.getFont("default_bold")
|
font: UM.Theme.getFont("default_bold")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue