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

Merge branch 'master' into CURA-8640_PyQt6

Browse source 
# Conflicts:
#	cura/UI/CuraSplashScreen.py
This commit is contained in:
Jelle Spijker 2022-03-28 15:02:18 +02:00
commit 12ee57e4ad
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
17 changed files with 33 additions and 908 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -17,8 +17,7 @@ UM.Dialog
minimumWidth: UM.Theme.getSize("popup_dialog").width
minimumHeight: UM.Theme.getSize("popup_dialog").height
width: minimumWidth
height: Math.max(dialogSummaryItem.height + 2 * buttonsItem.height, minimumHeight) // 2 * button height to also have some extra space around the button relative to the button size
property int comboboxHeight: UM.Theme.getSize("default_margin").height
onClosing: manager.notifyClosed()
@ -67,7 +66,7 @@ UM.Dialog
Column
{
width: parent.width
height: cildrenRect.height
height: childrenRect.height
UM.Label
{
@ -149,7 +148,7 @@ UM.Dialog
Column
{
width: parent.width
height: cildrenRect.height
height: childrenRect.height
UM.Label
{
@ -225,7 +224,7 @@ UM.Dialog
Column
{
width: parent.width
height: cildrenRect.height
height: childrenRect.height
UM.Label
{
@ -341,7 +340,7 @@ UM.Dialog
Column
{
width: parent.width
height: cildrenRect.height
height: childrenRect.height
Row
{
height: childrenRect.height
@ -382,7 +381,7 @@ UM.Dialog
Column
{
width: parent.width
height: cildrenRect.height
height: childrenRect.height
UM.Label
{