Merge branch 'master' into CURA-5483_add_s5_to_firmware_checker

cura/Settings/CuraContainerRegistry.py

@@ -685,7 +685,7 @@ class CuraContainerRegistry(ContainerRegistry):
             if not os.path.isfile(file_path):
                 continue
 
-            parser = configparser.ConfigParser(interpolation=None)
+            parser = configparser.ConfigParser(interpolation = None)
             try:
                 parser.read([file_path])
             except:

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -1012,7 +1012,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
 
     ##  Get the list of ID's of all containers in a container stack by partially parsing it's serialized data.
     def _getContainerIdListFromSerialized(self, serialized):
-        parser = ConfigParser(interpolation=None, empty_lines_in_values=False)
+        parser = ConfigParser(interpolation = None, empty_lines_in_values = False)
         parser.read_string(serialized)
 
         container_ids = []
@@ -1033,7 +1033,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         return container_ids
 
     def _getMachineNameFromSerializedStack(self, serialized):
-        parser = ConfigParser(interpolation=None, empty_lines_in_values=False)
+        parser = ConfigParser(interpolation = None, empty_lines_in_values = False)
         parser.read_string(serialized)
         return parser["general"].get("name", "")
 

plugins/CuraProfileReader/CuraProfileReader.py

@@ -50,7 +50,7 @@ class CuraProfileReader(ProfileReader):
     #   \param profile_id \type{str} The name of the profile.
     #   \return \type{List[Tuple[str,str]]} List of serialized profile strings and matching profile names.
     def _upgradeProfile(self, serialized, profile_id):
-        parser = configparser.ConfigParser(interpolation=None)
+        parser = configparser.ConfigParser(interpolation = None)
         parser.read_string(serialized)
 
         if "general" not in parser:

plugins/LegacyProfileReader/LegacyProfileReader.py

@@ -152,7 +152,7 @@ class LegacyProfileReader(ProfileReader):
         profile.setDirty(True)
 
         #Serialise and deserialise in order to perform the version upgrade.
-        parser = configparser.ConfigParser(interpolation=None)
+        parser = configparser.ConfigParser(interpolation = None)
         data = profile.serialize()
         parser.read_string(data)
         parser["general"]["version"] = "1"

plugins/PostProcessingPlugin/PostProcessingPlugin.qml

@@ -62,6 +62,7 @@ UM.Dialog
                 anchors.right: parent.right
                 anchors.rightMargin: base.textMargin
                 font: UM.Theme.getFont("large")
+                elide: Text.ElideRight
             }
             ListView
             {
@@ -115,6 +116,7 @@ UM.Dialog
                             {
                                 wrapMode: Text.Wrap
                                 text: control.text
+                                elide: Text.ElideRight
                                 color: activeScriptButton.checked ? palette.highlightedText : palette.text
                             }
                         }
@@ -275,6 +277,7 @@ UM.Dialog
                 anchors.leftMargin: base.textMargin
                 anchors.right: parent.right
                 anchors.rightMargin: base.textMargin
+                elide: Text.ElideRight
                 height: 20 * screenScaleFactor
                 font: UM.Theme.getFont("large")
                 color: UM.Theme.getColor("text")

plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py

@@ -73,7 +73,7 @@ class VersionUpgrade22to24(VersionUpgrade):
 
     def __convertVariant(self, variant_path):
         # Copy the variant to the machine_instances/*_settings.inst.cfg
-        variant_config = configparser.ConfigParser(interpolation=None)
+        variant_config = configparser.ConfigParser(interpolation = None)
         with open(variant_path, "r", encoding = "utf-8") as fhandle:
             variant_config.read_file(fhandle)
 

plugins/VersionUpgrade/VersionUpgrade25to26/VersionUpgrade25to26.py

@@ -117,7 +117,7 @@ class VersionUpgrade25to26(VersionUpgrade):
     #   \param serialised The serialised form of a quality profile.
     #   \param filename The name of the file to upgrade.
     def upgradeMachineStack(self, serialised, filename):
-        parser = configparser.ConfigParser(interpolation=None)
+        parser = configparser.ConfigParser(interpolation = None)
         parser.read_string(serialised)
 
         # NOTE: This is for Custom FDM printers

plugins/VersionUpgrade/VersionUpgrade30to31/VersionUpgrade30to31.py

@@ -84,7 +84,7 @@ class VersionUpgrade30to31(VersionUpgrade):
     #   \param serialised The serialised form of a preferences file.
     #   \param filename The name of the file to upgrade.
     def upgradePreferences(self, serialised, filename):
-        parser = configparser.ConfigParser(interpolation=None)
+        parser = configparser.ConfigParser(interpolation = None)
         parser.read_string(serialised)
 
         # Update version numbers
@@ -105,7 +105,7 @@ class VersionUpgrade30to31(VersionUpgrade):
     #   \param serialised The serialised form of the container file.
     #   \param filename The name of the file to upgrade.
     def upgradeInstanceContainer(self, serialised, filename):
-        parser = configparser.ConfigParser(interpolation=None)
+        parser = configparser.ConfigParser(interpolation = None)
         parser.read_string(serialised)
 
         for each_section in ("general", "metadata"):
@@ -130,7 +130,7 @@ class VersionUpgrade30to31(VersionUpgrade):
     #   \param serialised The serialised form of a container stack.
     #   \param filename The name of the file to upgrade.
     def upgradeStack(self, serialised, filename):
-        parser = configparser.ConfigParser(interpolation=None)
+        parser = configparser.ConfigParser(interpolation = None)
         parser.read_string(serialised)
 
         for each_section in ("general", "metadata"):

resources/definitions/ultimaker_s5.def.json

@@ -63,7 +63,7 @@
         "machine_end_gcode": { "default_value": "" },
         "prime_tower_position_x": { "default_value": 345 },
         "prime_tower_position_y": { "default_value": 222.5 },
-        "prime_blob_enable": { "enabled": false },
+        "prime_blob_enable": { "enabled": true, "default_value": false },
 
         "speed_travel":
         {