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

Merge branch '5.1'

Browse source 
# Conflicts:
#	.github/workflows/conan-package.yml
#	.github/workflows/cura-installer.yml
This commit is contained in:
Jelle Spijker 2022-07-14 16:30:52 +02:00
commit 1a0ecfd850
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
44 changed files with 70 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/Preferences/MachinesPage.qml
View file

@ -92,6 +92,7 @@ UM.ManagementPage
minimumHeight: UM.Theme.getSize("modal_window_minimum").height
maximumWidth: minimumWidth * 3
maximumHeight: minimumHeight * 3
backgroundColor: UM.Theme.getColor("main_background")
}
UM.ConfirmRemoveDialog

2
resources/qml/Preferences/RenameDialog.qml
View file

@ -23,7 +23,7 @@ UM.Dialog
property string explanation: catalog.i18nc("@info", "Please provide a new name.")
title: dialogTitle
backgroundColor: UM.Theme.getColor("main_background")
minimumWidth: UM.Theme.getSize("small_popup_dialog").width
minimumHeight: UM.Theme.getSize("small_popup_dialog").height
width: minimumWidth

1
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View file

@ -43,7 +43,6 @@ Item
qualityType = Cura.MachineManager.activeQualityType
} else {
qualityType = Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category)
print(Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category))
}
Cura.IntentManager.selectIntent(model.intent_category, qualityType)
}