3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'main' into fix_postprocessing_script_folders

Browse source
This commit is contained in:
fieldOfView 2023-04-15 17:47:36 +02:00
commit 378e5fedea
848 changed files with 114251 additions and 99019 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/PostProcessingPlugin/PostProcessingPlugin.qml
View file

@ -232,7 +232,7 @@ UM.Dialog
}
onObjectAdded: function(index, object) { scriptsMenu.insertItem(index, object)}
onObjectRemoved: function(object) { scriptsMenu.removeItem(object) }
onObjectRemoved: function(index, object) { scriptsMenu.removeItem(object) }
}
}
@ -245,7 +245,7 @@ UM.Dialog
height: parent.height
id: settingsPanel
Label
UM.Label
{
id: scriptSpecsHeader
text: manager.selectedScriptIndex == -1 ? catalog.i18nc("@label", "Settings") : base.activeScriptName
@ -262,7 +262,6 @@ UM.Dialog
elide: Text.ElideRight
height: 20 * screenScaleFactor
font: UM.Theme.getFont("large_bold")
color: UM.Theme.getColor("text")
}
ListView
@ -475,7 +474,7 @@ UM.Dialog
}
toolTipContentAlignment: UM.Enums.ContentAlignment.AlignLeft
onClicked: dialog.show()
// iconSource: "Script.svg"
iconSource: Qt.resolvedUrl("Script.svg")
fixedWidthMode: false
}

2
plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
View file

@ -330,7 +330,7 @@ class PauseAtHeight(Script):
current_height = current_z - layer_0_z
if current_height < pause_height:
continue # Scan the enitre layer, z-changes are not always on the same/first line.
continue # Scan the entire layer, z-changes are not always on the same/first line.
# Pause at layer
else: