Merge branch 'Ultimaker:main' into master

plugins/PostProcessingPlugin/PostProcessingPlugin.qml

@@ -19,7 +19,7 @@ UM.Dialog
     height: 500 * screenScaleFactor
     minimumWidth: 400 * screenScaleFactor
     minimumHeight: 250 * screenScaleFactor
-
+    backgroundColor: UM.Theme.getColor("main_background")
     onVisibleChanged:
     {
         // Whenever the window is closed (either via the "Close" button or the X on the window frame), we want to update it in the stack.
@@ -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
@@ -287,6 +286,7 @@ UM.Dialog
                 {
                     id: definitionsModel
                     containerId: manager.selectedScriptDefinitionId
+                    onContainerIdChanged: definitionsModel.setAllVisible(true)
                     showAll: true
                 }
 
@@ -475,7 +475,7 @@ UM.Dialog
             }
             toolTipContentAlignment: UM.Enums.ContentAlignment.AlignLeft
             onClicked: dialog.show()
-//            iconSource: "Script.svg"
+            iconSource: Qt.resolvedUrl("Script.svg")
             fixedWidthMode: false
         }
 

plugins/PostProcessingPlugin/plugin.json

@@ -2,7 +2,7 @@
     "name": "Post Processing",
     "author": "Ultimaker",
     "version": "2.2.1",
-    "api": 7,
+    "api": 8,
     "description": "Extension that allows for user created scripts for post processing",
     "catalog": "cura"
 }

plugins/PostProcessingPlugin/scripts/PauseAtHeight.py

@@ -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: