3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup

Browse source
This commit is contained in:
casper 2022-02-21 12:02:36 +01:00
commit 16325229af
4 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View file

@ -21,6 +21,8 @@ UM.Dialog
width: minimumWidth
height: minimumHeight
margin: UM.Theme.getSize("thick_margin").width
property var changesModel: Cura.UserChangesModel { id: userChangesModel }
onVisibilityChanged:

3
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -278,6 +278,7 @@ Item
width: selectors.controlWidth
height: parent.height
anchors.verticalCenter: parent.verticalCenter
focusPolicy: Qt.ClickFocus
@ -289,6 +290,7 @@ Item
}
onClicked: materialsMenu.popup()
}
Item
{
width: instructionButton.width + 2 * UM.Theme.getSize("narrow_margin").width
@ -331,6 +333,7 @@ Item
tooltip: text
height: parent.height
width: selectors.controlWidth
anchors.verticalCenter: parent.verticalCenter
focusPolicy: Qt.ClickFocus
enabled: enabledCheckbox.checked