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

Adjust margins on dialog to match designs

Browse source 
CURA-9424
This commit is contained in:
Joey de l'Arago 2022-11-02 15:33:47 +01:00
parent dbba1c4110
commit 7171249d3f
2 changed files with 309 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -20,7 +20,6 @@ UM.Dialog
height: minimumHeight height: minimumHeight
backgroundColor: UM.Theme.getColor("main_background") backgroundColor: UM.Theme.getColor("main_background")
margin: UM.Theme.getSize("default_margin").width
Flickable Flickable
{ {
@ -60,22 +59,22 @@ UM.Dialog
{ {
width: parent.width width: parent.width
height: childrenRect.height height: childrenRect.height
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("wide_margin").height
UM.Label
{
id: titleLabel
text: catalog.i18nc("@action:title", "Summary - Cura Project")
font: UM.Theme.getFont("large")
}
Column Column
{ {
width: parent.width width: parent.width
height: childrenRect.height height: childrenRect.height
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
leftPadding: UM.Theme.getSize("default_margin").width
UM.Label rightPadding: UM.Theme.getSize("default_margin").width
{
id: titleLabel
anchors.margins: UM.Theme.getSize("default_margin").height
text: catalog.i18nc("@action:title", "Summary - Cura Project")
font: UM.Theme.getFont("large")
}
}
WorkspaceSection WorkspaceSection
{ {
@ -260,7 +259,6 @@ UM.Dialog
} }
} }
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 comboboxVisible: manager.qualityChangesConflict
combobox: Cura.ComboBox combobox: Cura.ComboBox
@ -315,7 +313,6 @@ UM.Dialog
} }
} }
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 comboboxVisible: manager.materialConflict
@ -405,6 +402,7 @@ UM.Dialog
} }
} }
} }
}
property bool warning: manager.missingPackages.length > 0 property bool warning: manager.missingPackages.length > 0

4
plugins/3MFReader/WorkspaceSection.qml
View file

@ -38,8 +38,7 @@ Item
id: comboboxLabel id: comboboxLabel
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.bottomMargin: UM.Theme.getSize("default_margin").height visible: comboboxVisible && text != ""
visible: comboboxVisible
text: "" text: ""
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default_bold")
} }
@ -50,6 +49,7 @@ Item
width: parent.width width: parent.width
height: UM.Theme.getSize("button").height height: UM.Theme.getSize("button").height
anchors.top: comboboxLabel.bottom anchors.top: comboboxLabel.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.left: parent.left anchors.left: parent.left
sourceComponent: combobox sourceComponent: combobox
} }