From fa317a9e140b144cb36c2eb4e97b84782921687b Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 1 Nov 2022 16:31:24 +0100 Subject: [PATCH] Use unique id for WorkspaceDialog CURA-9424 --- plugins/3MFReader/WorkspaceDialog.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 4f7d5737e6..d56ffef7dd 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -11,7 +11,7 @@ import Cura 1.1 as Cura UM.Dialog { - id: base + id: workspaceDialog title: catalog.i18nc("@title:window", "Open Project") minimumWidth: UM.Theme.getSize("modal_window_minimum").width @@ -107,7 +107,7 @@ UM.Dialog anchors.right: parent.right width: (parent.width / 3) | 0 height: visible ? comboboxHeight : 0 - visible: base.visible && machineResolveComboBox.model.count > 1 + visible: workspaceDialog.visible && machineResolveComboBox.model.count > 1 text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?") Cura.ComboBox { @@ -461,14 +461,14 @@ UM.Dialog color: warning ? UM.Theme.getColor("warning") : "transparent" anchors.bottom: parent.bottom width: parent.width - height: childrenRect.height + 2 * base.margin + height: childrenRect.height + 2 * workspaceDialog.margin Column { height: childrenRect.height - spacing: base.margin + spacing: workspaceDialog.margin - anchors.margins: base.margin + anchors.margins: workspaceDialog.margin anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top @@ -478,7 +478,7 @@ UM.Dialog id: warningRow height: childrenRect.height visible: warning - spacing: base.margin + spacing: workspaceDialog.margin UM.ColorImage { width: UM.Theme.getSize("extruder_icon").width