GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 16:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use unique id for WorkspaceDialog

Browse Source 
CURA-9424
This commit is contained in:
Joey de l'Arago 2022-11-01 16:31:24 +01:00
parent afd3d92c5e
commit fa317a9e14
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/3MFReader/WorkspaceDialog.qml
View File

@ -11,7 +11,7 @@ import Cura 1.1 as Cura
UM.Dialog UM.Dialog
{ {
id: base id: workspaceDialog
title: catalog.i18nc("@title:window", "Open Project") title: catalog.i18nc("@title:window", "Open Project")
minimumWidth: UM.Theme.getSize("modal_window_minimum").width minimumWidth: UM.Theme.getSize("modal_window_minimum").width
@ -107,7 +107,7 @@ UM.Dialog
anchors.right: parent.right anchors.right: parent.right
width: (parent.width / 3) | 0 width: (parent.width / 3) | 0
height: visible ? comboboxHeight : 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?") text: catalog.i18nc("@info:tooltip", "How should the conflict in the machine be resolved?")
Cura.ComboBox Cura.ComboBox
{ {
@ -461,14 +461,14 @@ UM.Dialog
color: warning ? UM.Theme.getColor("warning") : "transparent" color: warning ? UM.Theme.getColor("warning") : "transparent"
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: parent.width width: parent.width
height: childrenRect.height + 2 * base.margin height: childrenRect.height + 2 * workspaceDialog.margin
Column Column
{ {
height: childrenRect.height height: childrenRect.height
spacing: base.margin spacing: workspaceDialog.margin
anchors.margins: base.margin anchors.margins: workspaceDialog.margin
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
@ -478,7 +478,7 @@ UM.Dialog
id: warningRow id: warningRow
height: childrenRect.height height: childrenRect.height
visible: warning visible: warning
spacing: base.margin spacing: workspaceDialog.margin
UM.ColorImage UM.ColorImage
{ {
width: UM.Theme.getSize("extruder_icon").width width: UM.Theme.getSize("extruder_icon").width