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

Merge branch 'Ultimaker:main' into master

Browse source
This commit is contained in:
Duarte Bragadesto 2023-01-06 18:28:39 +00:00 • committed by GitHub
commit 63a1994e75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 695 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

15
resources/definitions/fdmprinter.def.json
View file

@ -4418,6 +4418,18 @@
"default_value": false,
"settable_per_mesh": false,
"settable_per_extruder": true
},
"cool_min_temperature":
{
"label": "Small Layer Printing Temperature",
"description": "When reducing print speeds because of the minimum layer time, the printing temperature is gradually reduced to this temperature.",
"unit": "\u00b0C",
"type": "float",
"value": "material_print_temperature",
"minimum_value": "material_final_print_temperature",
"maximum_value": "material_print_temperature",
"settable_per_mesh": false,
"settable_per_extruder": true
}
}
},
@ -5675,6 +5687,7 @@
"unit": "mm",
"type": "float",
"default_value": 3,
"minimum_value": "0",
"minimum_value_warning": "max(extruderValues('machine_nozzle_size'))",
"maximum_value_warning": "10",
"enabled": "resolveOrValue('adhesion_type') == 'skirt'",
@ -5735,7 +5748,7 @@
"unit": "mm",
"type": "float",
"default_value": 0,
"minimum_value": "0",
"minimum_value": "-skirt_brim_line_width / 2",
"maximum_value_warning": "skirt_brim_line_width",
"enabled": "resolveOrValue('adhesion_type') == 'brim'",
"limit_to_extruder": "skirt_brim_extruder_nr",

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

@ -107,7 +107,7 @@ UM.Dialog
[
Cura.ComboBox
{
visible: buttonState == DiscardOrKeepProfileChangesDialog.ButtonsType.DiscardOrKeep
visible: buttonState === DiscardOrKeepProfileChangesDialog.ButtonsType.DiscardOrKeep
implicitHeight: UM.Theme.getSize("combobox").height
implicitWidth: UM.Theme.getSize("combobox").width
@ -128,20 +128,22 @@ UM.Dialog
onActivated:
{
var code = model.get(index).code;
const code = model.get(index).code;
UM.Preferences.setValue("cura/choice_on_profile_override", code);
if (code == "always_keep") {
keepButton.enabled = true;
discardButton.enabled = false;
}
else if (code == "always_discard") {
keepButton.enabled = false;
discardButton.enabled = true;
}
else {
keepButton.enabled = true;
discardButton.enabled = true;
switch (code) {
case "always_keep":
keepButton.enabled = true;
discardButton.enabled = false;
break;
case "always_discard":
keepButton.enabled = false;
discardButton.enabled = true;
break;
default:
keepButton.enabled = true;
discardButton.enabled = true;
break;
}
}
}

3
resources/qml/Menus/MaterialBrandMenu.qml
View file

@ -14,6 +14,7 @@ Instead we'll use a pop-up which doesn't seem to have that problem. */
Cura.MenuItem
{
id: materialBrandMenu
height: UM.Theme.getSize("menu").height + UM.Theme.getSize("narrow_margin").height
overrideShowArrow: true
property var materialTypesModel
@ -215,6 +216,8 @@ Cura.MenuItem
MaterialBrandSubMenu
{
id: colorPopup
implicitX: parent.width
property int itemHovered: 0
Column

12
resources/qml/Menus/MaterialBrandSubMenu.qml
View file

@ -12,14 +12,16 @@ Popup
{
id: materialBrandSubMenu
bottomPadding: UM.Theme.getSize("thin_margin").height
// There is a bug where hovering the bottom half of the last element causes the popup to close.
// Undo this commit if you find a fix.
bottomPadding: -UM.Theme.getSize("thin_margin").height
topPadding: UM.Theme.getSize("thin_margin").height
implicitWidth: scrollViewContent.width + scrollbar.width + leftPadding + rightPadding
implicitHeight: scrollViewContent.height + bottomPadding + topPadding
implicitHeight: scrollViewContent.height + bottomPadding + topPadding + (2 * UM.Theme.getSize("thin_margin").height)
// offset position relative to the parent
property int implicitX: parent.width
property int implicitX: parent.width - UM.Theme.getSize("default_lining").width
property int implicitY: -UM.Theme.getSize("thin_margin").height
default property alias contents: scrollViewContent.children
@ -67,6 +69,10 @@ Popup
}
}
// Changing the height causes implicitWidth to change because of the scrollbar appearing/disappearing
// Reassign it here to update the value
materialBrandSubMenu.width = implicitWidth;
if (globalPosition.x > mainWindow.width - materialBrandSubMenu.width)
{
if (mainWindow.width > materialBrandSubMenu.width)